Changeset 1411 for pjproject/trunk

Timestamp:

Aug 1, 2007 11:38:14 AM (17 years ago)

Author:

bennylp

Message:

Fixed ticket #359: Wrong Via branch generation in proxy causing the same branch value to be generated for RFC 2543 clients (thanks Helmut Wolf)

Location:

pjproject/trunk

Files:

• pjsip-apps/src/samples/proxy.h (modified) (2 diffs)
• pjsip/src/pjsip/sip_util_proxy.c (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/samples/proxy.h

@@ -236 +236 @@
 static pj_status_t init_proxy(void)
 {
-    pj_in_addr addr;
+    pj_in_addr pri_addr;
+    pj_in_addr addr_list[16];
+    unsigned addr_cnt = PJ_ARRAY_SIZE(addr_list);
     unsigned i;
 
@@ -249 +251 @@
      * to be added in Record-Route.
      */
-    if (pj_gethostip(&addr) == PJ_SUCCESS) {
+    if (pj_gethostip(&pri_addr)==PJ_SUCCESS) {
         pj_strdup2(global.pool, &global.name[global.name_cnt].host,
-                   pj_inet_ntoa(addr));
+                   pj_inet_ntoa(pri_addr));
         global.name[global.name_cnt].port = global.port;
         global.name_cnt++;
     }
 
+    /* Get the rest of IP interfaces */
+    if (pj_enum_ip_interface(&addr_cnt, addr_list) == PJ_SUCCESS) {
+        for (i=0; i<addr_cnt; ++i) {
+
+            if (addr_list[i].s_addr == pri_addr.s_addr)
+                continue;
+
+            pj_strdup2(global.pool, &global.name[global.name_cnt].host,
+                       pj_inet_ntoa(addr_list[i]));
+            global.name[global.name_cnt].port = global.port;
+            global.name_cnt++;
+        }
+    }
+
+    /* No need to add this, this should have been added above.
     global.name[global.name_cnt].host = pj_str("127.0.0.1");
     global.name[global.name_cnt].port = global.port;
     global.name_cnt++;
+    */
 
     global.name[global.name_cnt].host = *pj_gethostname();

pjproject/trunk/pjsip/src/pjsip/sip_util_proxy.c

@@ -24 +24 @@
 #include <pj/ctype.h>
 #include <pj/except.h>
+#include <pj/guid.h>
 #include <pj/pool.h>
 #include <pj/string.h>
@@ -43 +44 @@
  * @return          PJ_SUCCESS on success.
  */
+/*
 PJ_DEF(pj_status_t) pjsip_endpt_clone_msg( pjsip_endpoint *endpt,
                                            const pjsip_rx_data *rdata,
@@ -62 +64 @@
     return PJ_SUCCESS;
 }
+*/
 
 
@@ -336 +339 @@
     pj_uint8_t digest[16];
     pj_str_t branch;
+    pj_str_t rfc3261_branch = {PJSIP_RFC3261_BRANCH_ID, 
+                               PJSIP_RFC3261_BRANCH_LEN};
+
+    /* If incoming request does not have RFC 3261 branch value, create
+     * a branch value from GUID .
+     */
+    if (pj_strncmp(&rdata->msg_info.via->branch_param, 
+                   &rfc3261_branch, PJSIP_RFC3261_BRANCH_LEN) != 0 ) 
+    {
+        pj_str_t tmp;
+
+        branch.ptr = (char*)
+                     pj_pool_alloc(rdata->tp_info.pool, PJSIP_MAX_BRANCH_LEN);
+        branch.slen = PJSIP_RFC3261_BRANCH_LEN;
+        pj_memcpy(branch.ptr, PJSIP_RFC3261_BRANCH_ID, 
+                  PJSIP_RFC3261_BRANCH_LEN);
+
+        tmp.ptr = branch.ptr + PJSIP_RFC3261_BRANCH_LEN + 2;
+        *(tmp.ptr-2) = (pj_int8_t)(branch.slen+73); 
+        *(tmp.ptr-1) = (pj_int8_t)(branch.slen+99);
+        pj_generate_unique_string( &tmp );
+
+        branch.slen = PJSIP_MAX_BRANCH_LEN;
+        return branch;
+    }
 
     /* Create branch ID for new request by calculating MD5 hash
@@ -347 +375 @@
     branch.ptr = (char*)
                  pj_pool_alloc(rdata->tp_info.pool, 
-                               32 + PJSIP_RFC3261_BRANCH_LEN);
+                               34 + PJSIP_RFC3261_BRANCH_LEN);
     pj_memcpy(branch.ptr, PJSIP_RFC3261_BRANCH_ID, PJSIP_RFC3261_BRANCH_LEN);
-
-    digest2str(digest, branch.ptr+PJSIP_RFC3261_BRANCH_LEN);
-
-    branch.slen = 32 + PJSIP_RFC3261_BRANCH_LEN;
+    branch.slen = PJSIP_RFC3261_BRANCH_LEN;
+    *(branch.ptr+PJSIP_RFC3261_BRANCH_LEN) = (pj_int8_t)(branch.slen+73);
+    *(branch.ptr+PJSIP_RFC3261_BRANCH_LEN+1) = (pj_int8_t)(branch.slen+99);
+    digest2str(digest, branch.ptr+PJSIP_RFC3261_BRANCH_LEN+2);
+    branch.slen = 34 + PJSIP_RFC3261_BRANCH_LEN;
 
     return branch;