Changeset 3367 for pjproject/trunk

Timestamp:

Nov 16, 2010 6:01:38 AM (14 years ago)

Author:

bennylp

Message:

re #1020 (SIP outbound): remove sip.instance and reg-id parameters from the Contact when re-registering if the server does not support SIP outbound

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c (modified) (6 diffs)

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

@@ -26 +26 @@
 enum
 {
-    OUTBOUND_NONE,
-    OUTBOUND_WANTED,
-    OUTBOUND_ACTIVE
+    OUTBOUND_UNKNOWN,   // status unknown
+    OUTBOUND_WANTED,    // initiated in registration
+    OUTBOUND_ACTIVE,    // got positive response from server
+    OUTBOUND_NA         // not wanted or got negative response from server
 };
 
@@ -1033 +1034 @@
         goto done;
 
+    /* Check if outbound has been requested and rejected */
+    if (acc->rfc5626_status == OUTBOUND_NA)
+        goto done;
+
     if (pj_stristr(&acc->contact, &tcp_param)==NULL &&
         pj_stristr(&acc->contact, &tls_param)==NULL)
@@ -1051 +1056 @@
          */
         acc->reg_contact = acc->contact;
-        acc->rfc5626_status = OUTBOUND_NONE;
+        acc->rfc5626_status = OUTBOUND_NA;
     } else {
         /* Need to use outbound, append the contact with +sip.instance and
@@ -1559 +1564 @@
     unsigned i;
 
-    if (acc->rfc5626_status == OUTBOUND_NONE) {
+    if (acc->rfc5626_status == OUTBOUND_UNKNOWN) {
         goto on_return;
     }
@@ -1565 +1570 @@
     hreq = rdata->msg_info.require;
     if (!hreq) {
-        acc->rfc5626_status = OUTBOUND_NONE;
+        acc->rfc5626_status = OUTBOUND_NA;
         goto on_return;
     }
@@ -1577 +1582 @@
 
     /* Server does not support outbound */
-    acc->rfc5626_status = OUTBOUND_NONE;
+    acc->rfc5626_status = OUTBOUND_NA;
 
 on_return:
+    if (acc->rfc5626_status != OUTBOUND_ACTIVE) {
+        acc->reg_contact = acc->contact;
+    }
     PJ_LOG(4,(THIS_FILE, "SIP outbound status for acc %d is %s",
                          acc->index, (acc->rfc5626_status==OUTBOUND_ACTIVE?