Changeset 1520 for pjproject/trunk

Timestamp:

Oct 25, 2007 2:51:33 AM (17 years ago)

Author:

bennylp

Message:

Continuing ticket #400: Only process Service-Route header if enable_service_route (--service-route option in pjsua) is set

Location:

pjproject/trunk

Files:

• pjsip-apps/src/pjsua/pjsua_app.c (modified) (4 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_acc.c (modified) (1 diff)

pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

@@ -129 +129 @@
     puts  ("  --publish           Send presence PUBLISH for this account");
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
+    puts  ("  --service-route     Enable Service-Route processing");
     puts  ("  --next-cred         Add another credentials");
     puts  ("");
@@ -372 +373 @@
            OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, 
            OPT_REGISTRAR, OPT_REG_TIMEOUT, OPT_PUBLISH, OPT_ID, OPT_CONTACT,
-           OPT_100REL, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
+           OPT_100REL, OPT_SERVICE_ROUTE, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
            OPT_NAMESERVER, OPT_STUN_DOMAIN, OPT_STUN_SRV,
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
@@ -409 +410 @@
         { "publish",    0, 0, OPT_PUBLISH},
         { "use-100rel", 0, 0, OPT_100REL},
+        { "service-route", 0, 0, OPT_SERVICE_ROUTE},
         { "id",         1, 0, OPT_ID},
         { "contact",    1, 0, OPT_CONTACT},
@@ -635 +637 @@
             break;
 
+        case OPT_SERVICE_ROUTE: /* Service-Route processing */
+            cur_acc->enable_service_route = PJ_TRUE;
+            break;
+
         case OPT_ID:   /* id */
             if (pjsua_verify_sip_url(pj_optarg) != 0) {

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -1889 +1889 @@
     pj_str_t        proxy[PJSUA_ACC_MAX_PROXIES];
 
+    /**
+     * Enable Service-Route processing for this account.
+     */
+    pj_bool_t       enable_service_route;
+
     /** 
      * Optional interval for registration, in seconds. If the value is zero, 

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

@@ -541 +541 @@
     pjsip_uri *uri[PJSUA_ACC_MAX_PROXIES];
     unsigned i, uri_cnt = 0, rcnt;
+
+    /* Skip processing is enable_service_route is not set */
+    if (!acc->cfg.enable_service_route)
+        return;
 
     /* Find and parse Service-Route headers */