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

Timestamp:

Jun 28, 2006 4:46:49 PM (17 years ago)

Author:

bennylp

Message:

Major improvements in PJSIP to support TCP. The changes fall into these categories: (1) the TCP transport implementation itself (*.[hc]), (2) bug-fix in SIP transaction when using reliable transports, (3) support for TCP transport in PJSUA-LIB/PJSUA, and (4) changes in PJSIP-TEST to support TCP testing.

File:

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

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

@@ -30 +30 @@
     pjsua_logging_config    log_cfg;
     pjsua_media_config      media_cfg;
+    pj_bool_t               no_tcp;
+    pj_bool_t               no_udp;
     pjsua_transport_config  udp_cfg;
     pjsua_transport_config  rtp_cfg;
@@ -96 +98 @@
     puts  ("");
     puts  ("Transport Options:");
-    puts  ("  --local-port=port   Set TCP/UDP port");
+    puts  ("  --local-port=port   Set TCP/UDP port. This implicitly enables both ");
+    puts  ("                      TCP and UDP transports on the specified port, unless");
+    puts  ("                      if TCP or UDP is disabled.");
+    puts  ("  --no-tcp            Disable TCP transport.");
+    puts  ("  --no-udp            Disable UDP transport.");
     puts  ("  --outbound=url      Set the URL of global outbound proxy server");
     puts  ("                      May be specified multiple times");
@@ -240 +246 @@
            OPT_COMPLEXITY, OPT_QUALITY, OPT_PTIME,
            OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 
-           OPT_DURATION,
+           OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP,
     };
     struct pj_getopt_option long_options[] = {
@@ -252 +258 @@
         { "null-audio", 0, 0, OPT_NULL_AUDIO},
         { "local-port", 1, 0, OPT_LOCAL_PORT},
+        { "no-tcp",     0, 0, OPT_NO_TCP},
+        { "no-udp",     0, 0, OPT_NO_UDP},
         { "proxy",      1, 0, OPT_PROXY},
         { "outbound",   1, 0, OPT_OUTBOUND_PROXY},
@@ -385 +393 @@
             break;
 
+        case OPT_NO_UDP: /* no-udp */
+            if (cfg->no_tcp) {
+              PJ_LOG(1,(THIS_FILE,"Error: can not disable both TCP and UDP"));
+              return PJ_EINVAL;
+            }
+
+            cfg->no_udp = PJ_TRUE;
+            break;
+
+        case OPT_NO_TCP: /* no-tcp */
+            if (cfg->no_udp) {
+              PJ_LOG(1,(THIS_FILE,"Error: can not disable both TCP and UDP"));
+              return PJ_EINVAL;
+            }
+
+            cfg->no_tcp = PJ_TRUE;
+            break;
+
         case OPT_PROXY:   /* proxy */
             if (pjsua_verify_sip_url(pj_optarg) != 0) {
@@ -2047 +2073 @@
 pj_status_t app_init(int argc, char *argv[])
 {
-    pjsua_transport_id transport_id;
+    pjsua_transport_id transport_id = -1;
     unsigned i;
     pj_status_t status;
@@ -2097 +2123 @@
     }
 
-    /* Add UDP transport */
-    status = pjsua_transport_create(PJSIP_TRANSPORT_UDP,
-                                    &app_config.udp_cfg, 
-                                    &transport_id);
-    if (status != PJ_SUCCESS)
+
+    /* Add TCP transport unless it's disabled */
+    if (!app_config.no_tcp) {
+        status = pjsua_transport_create(PJSIP_TRANSPORT_TCP,
+                                        &app_config.udp_cfg, 
+                                        &transport_id);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Add local account */
+        pjsua_acc_add_local(transport_id, PJ_TRUE, &current_acc);
+        pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+
+    }
+
+
+    /* Add UDP transport unless it's disabled. */
+    if (!app_config.no_udp) {
+        status = pjsua_transport_create(PJSIP_TRANSPORT_UDP,
+                                        &app_config.udp_cfg, 
+                                        &transport_id);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Add local account */
+        pjsua_acc_add_local(transport_id, PJ_TRUE, &current_acc);
+        pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+    }
+
+    if (transport_id == -1) {
+        PJ_LOG(3,(THIS_FILE, "Error: no transport is configured"));
+        status = -1;
         goto on_error;
-
-    /* Add local account */
-    pjsua_acc_add_local(transport_id, PJ_TRUE, &current_acc);
-    pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+    }