Changeset 253 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_reg.c

Timestamp:

Mar 1, 2006 7:29:10 PM (18 years ago)

Author:

bennylp

Message:

Moved pjsua to pjsip-apps

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_reg.c (modified) (3 diffs)

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_reg.c

@@ -87 +87 @@
 void pjsua_regc_update(int acc_index, pj_bool_t renew)
 {
-    pj_status_t status;
-    pjsip_tx_data *tdata;
+    pj_status_t status = 0;
+    pjsip_tx_data *tdata = 0;
 
     if (renew) {
@@ -99 +99 @@
             }
         }
-        status = pjsip_regc_register(pjsua.acc[acc_index].regc, 1, &tdata);
+        if (!pjsua.acc[acc_index].regc)
+            return;
+
+        status = pjsip_regc_register(pjsua.acc[acc_index].regc, 1, 
+                                     &tdata);
+
     } else {
         if (pjsua.acc[acc_index].regc == NULL) {
@@ -127 +132 @@
     pj_status_t status;
 
+    if (pjsua.acc[acc_index].reg_uri.slen == 0) {
+        PJ_LOG(3,(THIS_FILE, "Registrar URI is not specified"));
+        return PJ_SUCCESS;
+    }
+
     /* initialize SIP registration if registrar is configured */
-    if (pjsua.acc[acc_index].reg_uri.slen) {
 
-        status = pjsip_regc_create( pjsua.endpt, 
-                                    &pjsua.acc[acc_index], 
-                                    &regc_cb, 
-                                    &pjsua.acc[acc_index].regc);
+    status = pjsip_regc_create( pjsua.endpt, 
+                                &pjsua.acc[acc_index], 
+                                &regc_cb, 
+                                &pjsua.acc[acc_index].regc);
 
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, "Unable to create client registration", 
-                         status);
-            return status;
-        }
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "Unable to create client registration", 
+                     status);
+        return status;
+    }
 
 
-        status = pjsip_regc_init( pjsua.acc[acc_index].regc, 
-                                  &pjsua.acc[acc_index].reg_uri, 
-                                  &pjsua.acc[acc_index].local_uri, 
-                                  &pjsua.acc[acc_index].local_uri,
-                                  1, &pjsua.acc[acc_index].contact_uri, 
-                                  pjsua.acc[acc_index].reg_timeout);
-        if (status != PJ_SUCCESS) {
-            pjsua_perror(THIS_FILE, 
-                         "Client registration initialization error", 
-                         status);
-            return status;
-        }
+    status = pjsip_regc_init( pjsua.acc[acc_index].regc, 
+                              &pjsua.acc[acc_index].reg_uri, 
+                              &pjsua.acc[acc_index].local_uri, 
+                              &pjsua.acc[acc_index].local_uri,
+                              1, &pjsua.acc[acc_index].contact_uri, 
+                              pjsua.acc[acc_index].reg_timeout);
+    if (status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, 
+                     "Client registration initialization error", 
+                     status);
+        return status;
+    }
 
-        pjsip_regc_set_credentials( pjsua.acc[acc_index].regc, 
-                                    pjsua.cred_count, 
-                                    pjsua.cred_info );
+    pjsip_regc_set_credentials( pjsua.acc[acc_index].regc, 
+                                pjsua.cred_count, 
+                                pjsua.cred_info );
 
-        pjsip_regc_set_route_set( pjsua.acc[acc_index].regc, 
-                                  &pjsua.acc[acc_index].route_set );
-    }
+    pjsip_regc_set_route_set( pjsua.acc[acc_index].regc, 
+                              &pjsua.acc[acc_index].route_set );
 
     return PJ_SUCCESS;