Changeset 4965 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_acc.c

Timestamp:

Nov 28, 2014 10:17:55 AM (10 years ago)

Author:

nanang

Message:

Misc (re #1782): Fixed bug of missing SIP header "Supported: outbound, path" after a registration failure (thanks Mateusz Olejnik for the report).

File:

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

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

@@ -364 +364 @@
             acc->rfc5626_regprm.slen = len;
         }
+
+        acc->rfc5626_status = OUTBOUND_WANTED;
     }
 
@@ -653 +655 @@
     acc->contact.slen = 0;
     acc->reg_mapped_addr.slen = 0;
+    acc->rfc5626_status = OUTBOUND_UNKNOWN;
     pj_bzero(&acc->via_addr, sizeof(acc->via_addr));
     acc->via_tp = NULL;
@@ -1347 +1350 @@
             acc->contact.slen = 0;
             acc->reg_mapped_addr.slen = 0;
+            acc->rfc5626_status = OUTBOUND_UNKNOWN;
         }
         
@@ -2164 +2168 @@
         acc->contact.slen = 0;
         acc->reg_mapped_addr.slen = 0;
+        acc->rfc5626_status = OUTBOUND_UNKNOWN;
         
         /* Stop keep-alive timer if any. */
@@ -2176 +2181 @@
         acc->contact.slen = 0;
         acc->reg_mapped_addr.slen = 0;
+        acc->rfc5626_status = OUTBOUND_UNKNOWN;
 
         /* Stop keep-alive timer if any. */
@@ -2191 +2197 @@
             acc->contact.slen = 0;
             acc->reg_mapped_addr.slen = 0;
+            acc->rfc5626_status = OUTBOUND_UNKNOWN;
 
             /* Stop keep-alive timer if any. */
@@ -2306 +2313 @@
         acc->contact.slen = 0;
         acc->reg_mapped_addr.slen = 0;
+        acc->rfc5626_status = OUTBOUND_UNKNOWN;
     }
 
@@ -2355 +2363 @@
         acc->contact.slen = 0;
         acc->reg_mapped_addr.slen = 0;
+        acc->rfc5626_status = OUTBOUND_UNKNOWN;
+
         return status;
     }
@@ -2437 +2447 @@
 
     /* If SIP outbound is used, add "Supported: outbound, path header" */
-    if (acc->rfc5626_status == OUTBOUND_WANTED) {
+    if (acc->rfc5626_status == OUTBOUND_WANTED ||
+        acc->rfc5626_status == OUTBOUND_ACTIVE)
+    {
         pjsip_hdr hdr_list;
         pjsip_supported_hdr *hsup;