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

Timestamp:

Aug 12, 2009 11:03:23 AM (15 years ago)

Author:

bennylp

Message:

Ticket #866: Allow application to specify more than one STUN servers for more robustness, and continue application startup if STUN resolution fails

PJSUA-LIB:

• New fields in pjsua_config to specify more than one STUN servers (the stun_srv_cnt and stun_srv array)
• The existing stun_host and stun_domain fields are deprecated, but backward compatibility is maintained. If stun_srv_cnt is zero, the library will import the entries from stun_host and stun_domain
• The library will now resolve the STUN server entries one by one and test it before using it
• New auxiliary API pjsua_resolve_stun_servers() to perform resolution and test against array of STUN servers

pjsua application:

• The "stun-srv" command line options can now be specified more than once

File:

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

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

@@ -191 +191 @@
     puts  ("  --publish           Send presence PUBLISH for this account");
     puts  ("  --use-100rel        Require reliable provisional response (100rel)");
-    puts  ("  --use-timer         Require session timers");
+    puts  ("  --use-timer         Require SIP session timers");
     puts  ("  --timer-se          Session timers expiration period, in secs (def:1800)");
     puts  ("  --timer-min-se      Session timers minimum expiration period, in secs (def:90)");
@@ -217 +217 @@
     puts  ("  --outbound=url      Set the URL of global outbound proxy server");
     puts  ("                      May be specified multiple times");
-    puts  ("  --stun-srv=name     Set STUN server host or domain");
+    puts  ("  --stun-srv=FORMAT   Set STUN server host or domain. This option may be");
+    puts  ("                      specified more than once. FORMAT is hostdom[:PORT]");
     puts  ("");
     puts  ("TLS Options:");
@@ -478 +479 @@
            OPT_BOUND_ADDR, OPT_CONTACT_PARAMS, OPT_CONTACT_URI_PARAMS,
            OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD,
-           OPT_NAMESERVER, OPT_STUN_DOMAIN, OPT_STUN_SRV,
+           OPT_NAMESERVER, OPT_STUN_SRV,
            OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE,
            OPT_AUTO_ANSWER, OPT_AUTO_PLAY, OPT_AUTO_PLAY_HANGUP, OPT_AUTO_LOOP,
@@ -544 +545 @@
         { "password",   1, 0, OPT_PASSWORD},
         { "nameserver", 1, 0, OPT_NAMESERVER},
-        { "stun-domain",1, 0, OPT_STUN_DOMAIN},
         { "stun-srv",   1, 0, OPT_STUN_SRV},
         { "add-buddy",  1, 0, OPT_ADD_BUDDY},
@@ -960 +960 @@
             break;
 
-        case OPT_STUN_DOMAIN:   /* STUN domain */
-            cfg->cfg.stun_domain = pj_str(pj_optarg);
-            break;
-
         case OPT_STUN_SRV:   /* STUN server */
             cfg->cfg.stun_host = pj_str(pj_optarg);
+            if (cfg->cfg.stun_srv_cnt==PJ_ARRAY_SIZE(cfg->cfg.stun_srv)) {
+                PJ_LOG(1,(THIS_FILE, "Error: too many STUN servers"));
+                return PJ_ETOOMANY;
+            }
+            cfg->cfg.stun_srv[cfg->cfg.stun_srv_cnt++] = pj_str(pj_optarg);
             break;
 
@@ -1616 +1617 @@
 
     /* STUN */
-    if (config->cfg.stun_domain.slen) {
-        pj_ansi_sprintf(line, "--stun-domain %.*s\n",
-                        (int)config->cfg.stun_domain.slen, 
-                        config->cfg.stun_domain.ptr);
-        pj_strcat2(&cfg, line);
-    }
-    if (config->cfg.stun_host.slen) {
+    for (i=0; i<config->cfg.stun_srv_cnt; ++i) {
         pj_ansi_sprintf(line, "--stun-srv %.*s\n",
-                        (int)config->cfg.stun_host.slen, 
-                        config->cfg.stun_host.ptr);
+                        (int)config->cfg.stun_srv[i].slen, 
+                        config->cfg.stun_srv[i].ptr);
         pj_strcat2(&cfg, line);
     }