Changeset 3370 for pjproject/trunk

Timestamp:

Nov 17, 2010 9:05:10 AM (14 years ago)

Author:

bennylp

Message:

Re #1151 (misc): also enable plain UDP SIP transport when enabling IPv6, since many UA will use IPv4 in their Contacts (keyword: sipit27)

File:

• pjproject/trunk/pjsip-apps/src/pjsua/pjsua_app.c (modified) (1 diff)

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

@@ -4818 +4818 @@
         pjsip_transport_type_e type = PJSIP_TRANSPORT_UDP;
 
-        if (app_config.ipv6)
-            type = PJSIP_TRANSPORT_UDP6;
-
         status = pjsua_transport_create(type,
-                                        &app_config.udp_cfg, 
+                                        &app_config.udp_cfg,
+                                        &transport_id);
+        if (status != PJ_SUCCESS)
+            goto on_error;
+
+        /* Add local account */
+        pjsua_acc_add_local(transport_id, PJ_TRUE, &aid);
+        //pjsua_acc_set_transport(aid, transport_id);
+        pjsua_acc_set_online_status(current_acc, PJ_TRUE);
+
+        if (app_config.udp_cfg.port == 0) {
+            pjsua_transport_info ti;
+            pj_sockaddr_in *a;
+
+            pjsua_transport_get_info(transport_id, &ti);
+            a = (pj_sockaddr_in*)&ti.local_addr;
+
+            tcp_cfg.port = pj_ntohs(a->sin_port);
+        }
+    }
+
+    /* Add UDP IPv6 transport unless it's disabled. */
+    if (!app_config.no_udp && app_config.ipv6) {
+        pjsua_acc_id aid;
+        pjsip_transport_type_e type = PJSIP_TRANSPORT_UDP6;
+        pjsua_transport_config udp_cfg;
+
+        udp_cfg = app_config.udp_cfg;
+        if (udp_cfg.port == 0)
+            udp_cfg.port = 5060;
+        else
+            udp_cfg.port += 10;
+        status = pjsua_transport_create(type,
+                                        &udp_cfg,
                                         &transport_id);
         if (status != PJ_SUCCESS)