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

Timestamp:

May 29, 2009 1:04:03 PM (14 years ago)

Author:

bennylp

Message:

Integration of Sipit24 branch, many tickets involved:

• #793: AMR encoder should regard 'mode-set' param specified by remote decoder.
• #831: Automatically switch to TCP transport when sending large request
• #832: Support for outbound proxy setting without using Route header
• #849: Modify conference audio switch behavior in connecting ports.
• #850: Remove 'Require=replaces' param in 'Refer-To' header (in call transfer with replaces).
• #851: Support for regular nomination in ICE
• #852: --ip-addr support for IPv6 for media transport in pjsua
• #854: Adding SOFTWARE attribute in all outgoing requests may cause compatibility problem with older STUN server (thanks Alexei Kuznetsov for the report)
• #855: Bug in digit map frequencies for DTMF digits (thanks FCCH for the report)
• #856: Put back the ICE candidate priority values according to the default values in the draft-mmusic-ice
• #857: Support for ICE keep-alive with Binding indication
• #858: Do not authenticate STUN 438 response
• #859: AMR-WB format param in the SDP is not negotiated correctly.
• #867: Return error instead of asserting when PJSUA-LIB fails to open log file

File:

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

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

@@ -265 +265 @@
     puts  ("Media Transport Options:");
     puts  ("  --use-ice           Enable ICE (default:no)");
-    puts  ("  --ice-no-host       Disable ICE host candidates (default: no)");
+    puts  ("  --ice-regular       Use ICE regular nomination (default: aggressive)");
+    puts  ("  --ice-max-hosts=N   Set maximum number of ICE host candidates");
     puts  ("  --ice-no-rtcp       Disable RTCP component in ICE (default: no)");
     puts  ("  --rtp-port=N        Base port to try for RTP (default=4000)");
@@ -477 +478 @@
            OPT_AUTO_ANSWER, OPT_AUTO_PLAY, OPT_AUTO_PLAY_HANGUP, OPT_AUTO_LOOP,
            OPT_AUTO_CONF, OPT_CLOCK_RATE, OPT_SND_CLOCK_RATE, OPT_STEREO,
-           OPT_USE_ICE, OPT_USE_SRTP, OPT_SRTP_SECURE,
-           OPT_USE_TURN, OPT_ICE_NO_HOST, OPT_ICE_NO_RTCP, OPT_TURN_SRV, 
+           OPT_USE_ICE, OPT_ICE_REGULAR, OPT_USE_SRTP, OPT_SRTP_SECURE,
+           OPT_USE_TURN, OPT_ICE_MAX_HOSTS, OPT_ICE_NO_RTCP, OPT_TURN_SRV, 
            OPT_TURN_TCP, OPT_TURN_USER, OPT_TURN_PASSWD,
            OPT_PLAY_FILE, OPT_PLAY_TONE, OPT_RTP_PORT, OPT_ADD_CODEC, 
@@ -554 +555 @@
 
         { "use-ice",    0, 0, OPT_USE_ICE},
+        { "ice-regular",0, 0, OPT_ICE_REGULAR},
         { "use-turn",   0, 0, OPT_USE_TURN},
-        { "ice-no-host",0, 0, OPT_ICE_NO_HOST},
+        { "ice-max-hosts",1, 0, OPT_ICE_MAX_HOSTS},
         { "ice-no-rtcp",0, 0, OPT_ICE_NO_RTCP},
         { "turn-srv",   1, 0, OPT_TURN_SRV},
@@ -993 +995 @@
             break;
 
+        case OPT_ICE_REGULAR:
+            cfg->media_cfg.ice_opt.aggressive = PJ_FALSE;
+            break;
+
         case OPT_USE_TURN:
             cfg->media_cfg.enable_turn = PJ_TRUE;
             break;
 
-        case OPT_ICE_NO_HOST:
-            cfg->media_cfg.ice_no_host_cands = PJ_TRUE;
+        case OPT_ICE_MAX_HOSTS:
+            cfg->media_cfg.ice_max_host_cands = my_atoi(pj_optarg);
             break;
 
@@ -1645 +1651 @@
         pj_strcat2(&cfg, "--use-ice\n");
 
+    if (config->media_cfg.ice_opt.aggressive == PJ_FALSE)
+        pj_strcat2(&cfg, "--ice-regular\n");
+
     if (config->media_cfg.enable_turn)
         pj_strcat2(&cfg, "--use-turn\n");
 
-    if (config->media_cfg.ice_no_host_cands)
-        pj_strcat2(&cfg, "--ice-no-host\n");
+    if (config->media_cfg.ice_max_host_cands >= 0) {
+        pj_ansi_sprintf(line, "--ice_max_host_cands %d\n",
+                        config->media_cfg.ice_max_host_cands);
+        pj_strcat2(&cfg, line);
+    }
 
     if (config->media_cfg.ice_no_rtcp)
@@ -1886 +1898 @@
     }
 
-    if (config->cfg.force_lr) {
+    if (!config->cfg.force_lr) {
         pj_strcat2(&cfg, "--no-force-lr\n");
     }
@@ -3688 +3700 @@
                 }
 
-                pjsua_call_xfer_replaces(call, dst_call, 0, &msg_data);
+                pjsua_call_xfer_replaces(call, dst_call, 
+                                         PJSUA_XFER_NO_REQUIRE_REPLACES, 
+                                         &msg_data);
             }
             break;
@@ -4719 +4733 @@
     for (i=0; i<app_config.cfg.max_calls; ++i) {
         enum { MAX_RETRY = 10 };
+        pj_sock_t sock[2];
+        pjmedia_sock_info si;
         unsigned j;
 
@@ -4725 +4741 @@
 
         for (j=0; j<MAX_RETRY; ++j) {
-            status = pjmedia_transport_udp_create3(pjsua_get_pjmedia_endpt(), 
-                                                   pj_AF_INET6(),
-                                                   NULL, 
-                                                   &app_config.rtp_cfg.bound_addr,
-                                                   port, 
-                                                   0, &tp[i].transport);
-
+            unsigned k;
+
+            for (k=0; k<2; ++k) {
+                pj_sockaddr bound_addr;
+
+                status = pj_sock_socket(pj_AF_INET6(), pj_SOCK_DGRAM(), 0, &sock[k]);
+                if (status != PJ_SUCCESS)
+                    break;
+
+                status = pj_sockaddr_init(pj_AF_INET6(), &bound_addr,
+                                          &app_config.rtp_cfg.bound_addr, 
+                                          (unsigned short)(port+k));
+                if (status != PJ_SUCCESS)
+                    break;
+
+                status = pj_sock_bind(sock[k], &bound_addr, 
+                                      pj_sockaddr_get_len(&bound_addr));
+                if (status != PJ_SUCCESS)
+                    break;
+            }
+            if (status != PJ_SUCCESS) {
+                if (k==1)
+                    pj_sock_close(sock[0]);
+
+                if (port != 0)
+                    port += 10;
+                else
+                    break;
+
+                continue;
+            }
+
+            pj_bzero(&si, sizeof(si));
+            si.rtp_sock = sock[0];
+            si.rtcp_sock = sock[1];
+        
+            pj_sockaddr_init(pj_AF_INET6(), &si.rtp_addr_name, 
+                             &app_config.rtp_cfg.public_addr, 
+                             (unsigned short)(port));
+            pj_sockaddr_init(pj_AF_INET6(), &si.rtcp_addr_name, 
+                             &app_config.rtp_cfg.public_addr, 
+                             (unsigned short)(port+1));
+
+            status = pjmedia_transport_udp_attach(pjsua_get_pjmedia_endpt(),
+                                                  NULL,
+                                                  &si,
+                                                  0,
+                                                  &tp[i].transport);
             if (port != 0)
                 port += 10;