Changeset 1561 for pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c

Timestamp:

Nov 8, 2007 9:24:30 AM (17 years ago)

Author:

bennylp

Message:

• Added option to send empty Authorization header in outgoing requests
• When UAS has sent answer in reliable 1xx, do not put SDP in 2xx
• Handle the case when UPDATE is challenged with 401/407
• Obsolete --service-route option in pjsua

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (8 diffs)

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

@@ -118 +118 @@
     puts  ("");
     puts  ("SIP Account options:");
+    puts  ("  --use-ims           Enable 3GPP/IMS related settings on this account");
     puts  ("  --registrar=url     Set the URL of registrar server");
     puts  ("  --id=url            Set the URL of local ID (used in From header)");
@@ -129 +130 @@
     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  ("");
@@ -373 +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_SERVICE_ROUTE, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
+           OPT_100REL, OPT_USE_IMS, 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,
@@ -410 +410 @@
         { "publish",    0, 0, OPT_PUBLISH},
         { "use-100rel", 0, 0, OPT_100REL},
-        { "service-route", 0, 0, OPT_SERVICE_ROUTE},
+        { "use-ims",    0, 0, OPT_USE_IMS},
         { "id",         1, 0, OPT_ID},
         { "contact",    1, 0, OPT_CONTACT},
@@ -637 +637 @@
             break;
 
-        case OPT_SERVICE_ROUTE: /* Service-Route processing */
-            cur_acc->enable_service_route = PJ_TRUE;
+        case OPT_USE_IMS: /* Activate IMS settings */
+            cur_acc->auth_pref.initial_auth = PJ_TRUE;
             break;
 
@@ -668 +668 @@
         case OPT_USERNAME:   /* Default authentication user */
             cur_acc->cred_info[cur_acc->cred_count].username = pj_str(pj_optarg);
-            cur_acc->cred_info[cur_acc->cred_count].scheme = pj_str("digest");
+            cur_acc->cred_info[cur_acc->cred_count].scheme = pj_str("Digest");
             break;
 
@@ -993 +993 @@
 
     for (i=0; i<cfg->acc_cnt; ++i) {
-        if (cfg->acc_cfg[i].cred_info[cfg->acc_cfg[i].cred_count].username.slen)
+        pjsua_acc_config *acfg = &cfg->acc_cfg[i];
+
+        if (acfg->cred_info[acfg->cred_count].username.slen)
         {
-            cfg->acc_cfg[i].cred_count++;
+            acfg->cred_count++;
+        }
+
+        /* When IMS mode is enabled for the account, verify that settings
+         * are okay.
+         */
+        /* For now we check if IMS mode is activated by looking if
+         * initial_auth is set.
+         */
+        if (acfg->auth_pref.initial_auth && acfg->cred_count) {
+            /* Realm must point to the real domain */
+            if (*acfg->cred_info[0].realm.ptr=='*') {
+                PJ_LOG(1,(THIS_FILE, 
+                          "Error: cannot use '*' as realm with IMS"));
+                return PJ_EINVAL;
+            }
+
+            /* Username for authentication must be in a@b format */
+            if (strchr(acfg->cred_info[0].username.ptr, '@')==0) {
+                PJ_LOG(1,(THIS_FILE, 
+                          "Error: Username for authentication must "
+                          "be in user@domain format with IMS"));
+                return PJ_EINVAL;
+            }
         }
     }
@@ -2686 +2711 @@
                 acc_cfg.reg_uri = pj_str(registrar);
                 acc_cfg.cred_count = 1;
-                acc_cfg.cred_info[0].scheme = pj_str("digest");
+                acc_cfg.cred_info[0].scheme = pj_str("Digest");
                 acc_cfg.cred_info[0].realm = pj_str(realm);
                 acc_cfg.cred_info[0].username = pj_str(uname);