Changeset 201 for pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

Timestamp:

Feb 19, 2006 3:37:19 PM (18 years ago)

Author:

bennylp

Message:

SIMPLE test with FWD, and added more info in UI

File:

• pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c (modified) (20 diffs)

pjproject/trunk/pjsip/src/pjsip-ua/sip_reg.c

@@ -26 +26 @@
 #include <pjsip/sip_auth_msg.h>
 #include <pjsip/sip_errno.h>
+#include <pj/assert.h>
+#include <pj/guid.h>
+#include <pj/os.h>
 #include <pj/pool.h>
+#include <pj/log.h>
 #include <pj/string.h>
-#include <pj/guid.h>
-#include <pj/log.h>
-#include <pj/assert.h>
 
 
@@ -54 +55 @@
     pjsip_cid_hdr               *cid_hdr;
     pjsip_cseq_hdr              *cseq_hdr;
+    pj_str_t                     from_uri;
     pjsip_from_hdr              *from_hdr;
     pjsip_to_hdr                *to_hdr;
@@ -69 +71 @@
     /* Auto refresh registration. */
     pj_bool_t                    auto_reg;
+    pj_time_val                  last_reg;
+    pj_time_val                  next_reg;
     pj_timer_entry               timer;
 };
@@ -111 +115 @@
 PJ_DEF(pj_status_t) pjsip_regc_destroy(pjsip_regc *regc)
 {
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
+
     if (regc->pending_tsx) {
         regc->_delete_flag = 1;
@@ -116 +122 @@
     } else {
         pjsip_endpt_release_pool(regc->endpt, regc->pool);
+    }
+
+    return PJ_SUCCESS;
+}
+
+
+PJ_DEF(pj_status_t) pjsip_regc_get_info( pjsip_regc *regc,
+                                         pjsip_regc_info *info )
+{
+    PJ_ASSERT_RETURN(regc && info, PJ_EINVAL);
+
+    info->server_uri = regc->str_srv_url;
+    info->client_uri = regc->from_uri;
+    info->is_busy = (regc->pending_tsx != 0);
+    info->auto_reg = regc->auto_reg;
+    info->interval = regc->expires;
+    
+    if (regc->pending_tsx)
+        info->next_reg = 0;
+    else if (regc->auto_reg == 0)
+        info->next_reg = 0;
+    else if (regc->expires < 0)
+        info->next_reg = regc->expires;
+    else {
+        pj_time_val now, next_reg;
+
+        next_reg = regc->next_reg;
+        pj_gettimeofday(&now);
+        PJ_TIME_VAL_SUB(next_reg, now);
+        info->next_reg = next_reg.sec;
     }
 
@@ -195 +231 @@
 
     /* Set "From" header. */
-    pj_strdup_with_null(regc->pool, &tmp, from_url);
+    pj_strdup_with_null(regc->pool, &regc->from_uri, from_url);
+    tmp = regc->from_uri;
     regc->from_hdr = pjsip_from_hdr_create(regc->pool);
     regc->from_hdr->uri = pjsip_parse_uri(regc->pool, tmp.ptr, tmp.slen, 
@@ -326 +363 @@
     pjsip_tx_data *tdata;
 
+    PJ_ASSERT_RETURN(regc && p_tdata, PJ_EINVAL);
+
     status = create_request(regc, &tdata);
     if (status != PJ_SUCCESS)
@@ -356 +395 @@
     pj_status_t status;
 
+    PJ_ASSERT_RETURN(regc && p_tdata, PJ_EINVAL);
+
     if (regc->timer.id != 0) {
         pjsip_endpt_cancel_timer(regc->endpt, &regc->timer);
@@ -378 +419 @@
                                                 const pj_str_t contact[] )
 {
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
     return set_contact( regc, contact_cnt, contact );
 }
@@ -385 +427 @@
                                                 pj_uint32_t expires )
 {
+    PJ_ASSERT_RETURN(regc, PJ_EINVAL);
     set_expires( regc, expires );
     return PJ_SUCCESS;
@@ -390 +433 @@
 
 
-static void call_callback(pjsip_regc *regc, int status, const pj_str_t *reason,
+static void call_callback(pjsip_regc *regc, pj_status_t status, int st_code, 
+                          const pj_str_t *reason,
                           pjsip_rx_data *rdata, pj_int32_t expiration,
                           int contact_cnt, pjsip_contact_hdr *contact[])
@@ -399 +443 @@
     cbparam.regc = regc;
     cbparam.token = regc->token;
-    cbparam.code = status;
+    cbparam.status = status;
+    cbparam.code = st_code;
     cbparam.reason = *reason;
     cbparam.rdata = rdata;
@@ -428 +473 @@
         char errmsg[PJ_ERR_MSG_SIZE];
         pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-        call_callback(regc, -1, &reason, NULL, -1, 0, NULL);
+        call_callback(regc, status, 400, &reason, NULL, -1, 0, NULL);
     }
 }
@@ -438 +483 @@
     pjsip_transaction *tsx = event->body.tsx_state.tsx;
     
+    /* Decrement pending transaction counter. */
+    --regc->pending_tsx;
+
     /* If registration data has been deleted by user then remove registration 
      * data from transaction's callback, and don't call callback.
      */
     if (regc->_delete_flag) {
-        --regc->pending_tsx;
+
+        /* Nothing to do */
+        ;
 
     } else if (tsx->status_code == PJSIP_SC_PROXY_AUTHENTICATION_REQUIRED ||
@@ -456 +506 @@
 
         if (status == PJ_SUCCESS) {
-            --regc->pending_tsx;
             pjsip_regc_send(regc, tdata);
             return;
         } else {
-            call_callback(regc, tsx->status_code, &rdata->msg_info.msg->line.status.reason,
+            call_callback(regc, status, tsx->status_code, 
+                          &rdata->msg_info.msg->line.status.reason,
                           rdata, -1, 0, NULL);
-            --regc->pending_tsx;
         }
     } else {
@@ -513 +562 @@
                 regc->timer.user_data = regc;
                 pjsip_endpt_schedule_timer( regc->endpt, &regc->timer, &delay);
+                pj_gettimeofday(&regc->last_reg);
+                regc->next_reg = regc->last_reg;
+                regc->next_reg.sec += delay.sec;
             }
 
@@ -523 +575 @@
         /* Call callback. */
         if (expiration == 0xFFFF) expiration = -1;
-        call_callback(regc, tsx->status_code, 
+        call_callback(regc, PJ_SUCCESS, tsx->status_code, 
                       (rdata ? &rdata->msg_info.msg->line.status.reason 
                         : pjsip_get_status_text(tsx->status_code)),
@@ -529 +581 @@
                       contact_cnt, contact);
 
-        --regc->pending_tsx;
     }
 
@@ -544 +595 @@
     /* Make sure we don't have pending transaction. */
     if (regc->pending_tsx) {
-        pj_str_t reason = pj_str("Transaction in progress");
-        call_callback(regc, -1, &reason, NULL, -1, 0, NULL);
         pjsip_tx_data_dec_ref( tdata );
-        return PJ_EINVALIDOP;
+        return PJSIP_EBUSY;
     }
 
@@ -560 +609 @@
     if (status==PJ_SUCCESS)
         ++regc->pending_tsx;
-    else {
-        char errmsg[PJ_ERR_MSG_SIZE];
-        pj_str_t reason = pj_strerror(status, errmsg, sizeof(errmsg));
-        call_callback(regc, status, &reason, NULL, -1, 0, NULL);
-    }
 
     return status;