Changeset 4442 for pjproject/trunk

Timestamp:

Mar 19, 2013 7:39:25 AM (12 years ago)

Author:

nanang

Message:

Close #1645: Added run-time setting 'pjsip_cfg()->req_has_via_alias' and compile-time setting 'PJSIP_REQ_HAS_VIA_ALIAS', the default value is PJ_TRUE.

Location:

pjproject/trunk/pjsip

Files:

• include/pjsip/sip_config.h (modified) (2 diffs)
• src/pjsip/sip_config.c (modified) (1 diff)
• src/pjsip/sip_util.c (modified) (1 diff)

pjproject/trunk/pjsip/include/pjsip/sip_config.h

@@ -121 +121 @@
         pj_bool_t follow_early_media_fork;
 
+        /**
+         * Specify whether "alias" param should be added to the Via header
+         * in any outgoing request with connection oriented transport.
+         *
+         * Default is PJSIP_REQ_HAS_VIA_ALIAS.
+         */
+        pj_bool_t req_has_via_alias;
+
     } endpt;
 
@@ -317 +325 @@
 
 /**
+ * Specify whether "alias" param should be added to the Via header
+ * in any outgoing request with connection oriented transport.
+ *
+ * This option can also be controlled at run-time by the
+ * \a req_has_via_alias setting in pjsip_cfg_t.
+ *
+ * Default is PJ_TRUE.
+ */
+#ifndef PJSIP_REQ_HAS_VIA_ALIAS
+#   define PJSIP_REQ_HAS_VIA_ALIAS                  PJ_TRUE
+#endif
+
+
+/**
  * Accept call replace in early state when invite is not initiated
  * by the user agent. RFC 3891 Section 3 disallows this, however,

pjproject/trunk/pjsip/src/pjsip/sip_config.c

@@ -31 +31 @@
        0,
        PJSIP_DONT_SWITCH_TO_TCP,
-       PJSIP_FOLLOW_EARLY_MEDIA_FORK
+       PJSIP_FOLLOW_EARLY_MEDIA_FORK,
+       PJSIP_REQ_HAS_VIA_ALIAS
     },
 

pjproject/trunk/pjsip/src/pjsip/sip_util.c

@@ -1201 +1201 @@
         }
         via->rport_param = pjsip_cfg()->endpt.disable_rport ? -1 : 0;
+
+        /* Add/remove "alias" param to/from Via header on connection 
+         * oriented/less transport, if configured.
+         */
+        if (pjsip_cfg()->endpt.req_has_via_alias &&
+            tdata->msg->type == PJSIP_REQUEST_MSG)
+        {
+            const pj_str_t ALIAS_STR = {"alias", 5};
+            pjsip_param *alias_param;
+            pj_bool_t is_datagram;
+
+            alias_param = pjsip_param_find(&via->other_param, &ALIAS_STR);
+            is_datagram = (stateless_data->cur_transport->flag & 
+                           PJSIP_TRANSPORT_DATAGRAM);
+            if (!is_datagram && !alias_param) {
+                alias_param = PJ_POOL_ZALLOC_T(tdata->pool, pjsip_param);
+                alias_param->name = ALIAS_STR;
+                pj_list_push_back(&via->other_param, alias_param);
+            } else if (is_datagram && alias_param) {
+                pj_list_erase(alias_param);
+            }
+        }
 
         pjsip_tx_data_invalidate_msg(tdata);