Changeset 201 for pjproject/trunk/pjsip/src/pjsua/pjsua_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/pjsua/pjsua_reg.c (modified) (5 diffs)

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

@@ -38 +38 @@
      * Print registration status.
      */
-    if (param->code < 0 || param->code >= 300) {
+    if (param->status!=PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "SIP registration error", 
+                     param->status);
+        pjsua.regc = NULL;
+        
+    } else if (param->code < 0 || param->code >= 300) {
         PJ_LOG(2, (THIS_FILE, "SIP registration failed, status=%d (%s)", 
-                   param->code, pjsip_get_status_text(param->code)->ptr));
+                   param->code, 
+                   pjsip_get_status_text(param->code)->ptr));
         pjsua.regc = NULL;
 
@@ -54 +60 @@
     }
 
+    pjsua.regc_last_err = param->status;
     pjsua.regc_last_code = param->code;
 
@@ -69 +76 @@
 
     if (renew) {
-        PJ_LOG(3,(THIS_FILE, "Performing SIP registration..."));
+        if (pjsua.regc == NULL) {
+            status = pjsua_regc_init();
+            if (status != PJ_SUCCESS) {
+                pjsua_perror(THIS_FILE, "Unable to create registration", 
+                             status);
+                return;
+            }
+        }
         status = pjsip_regc_register(pjsua.regc, 1, &tdata);
     } else {
-        PJ_LOG(3,(THIS_FILE, "Performing SIP unregistration..."));
+        if (pjsua.regc == NULL) {
+            PJ_LOG(3,(THIS_FILE, "Currently not registered"));
+            return;
+        }
         status = pjsip_regc_unregister(pjsua.regc, &tdata);
     }
 
+    if (status == PJ_SUCCESS)
+        status = pjsip_regc_send( pjsua.regc, tdata );
+
     if (status != PJ_SUCCESS) {
-        pjsua_perror("Unable to create REGISTER request", status);
-        return;
+        pjsua_perror(THIS_FILE, "Unable to create/send REGISTER", 
+                     status);
+    } else {
+        PJ_LOG(3,(THIS_FILE, "%s sent",
+                 (renew? "Registration" : "Unregistration")));
     }
-
-    pjsip_regc_send( pjsua.regc, tdata );
 }
 
@@ -97 +118 @@
 
         if (status != PJ_SUCCESS) {
-            pjsua_perror("Unable to create client registration", status);
+            pjsua_perror(THIS_FILE, "Unable to create client registration", 
+                         status);
             return status;
         }
@@ -108 +130 @@
                                   pjsua.reg_timeout);
         if (status != PJ_SUCCESS) {
-            pjsua_perror("Client registration initialization error", status);
+            pjsua_perror(THIS_FILE, 
+                         "Client registration initialization error", 
+                         status);
             return status;
         }