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

Timestamp:

Dec 5, 2007 4:09:59 AM (16 years ago)

Author:

bennylp

Message:

Fixed error when creating TLS transport in pjsua-lib (the TLS type was misidentified was UDP)

File:

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

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

@@ -91 +91 @@
 static pjsua_call_id    current_call = PJSUA_INVALID_ID;
 static pj_str_t         uri_arg;
+
+static pjsua_transport_id   tls_id;
 
 #ifdef STEREO_DEMO
@@ -568 +570 @@
         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;
+              //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));
+              //return PJ_EINVAL;
             }
 
@@ -581 +583 @@
         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;
+              //PJ_LOG(1,(THIS_FILE,"Error: cannot disable both TCP and UDP"));
+              //return PJ_EINVAL;
             }
 
@@ -2217 +2219 @@
 
     status = pjsua_acc_create_request(current_acc, &method, dst_uri, &tdata);
-
-    status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL);
+    if (status == PJ_SUCCESS) {
+        status = pjsip_endpt_send_request(endpt, tdata, -1, NULL, NULL);
+    }
+
     if (status != PJ_SUCCESS) {
-        pjsua_perror(THIS_FILE, "Unable to send request", status);
+        pjsua_perror(THIS_FILE, "Unable to create/send request", status);
         return;
     }
+
 }
 
@@ -3425 +3430 @@
     }
 
+    /* Add IPv6 UDP */
+#if 0 && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6
+    if (1) {
+        pjsua_acc_id aid;
+
+        status = pjsua_transport_create(PJSIP_TRANSPORT_UDP6,
+                                        &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);
+        }
+    }
+#endif  /* PJ_HAS_IPV6 */
+
     /* Add TCP transport unless it's disabled */
     if (!app_config.no_tcp) {
@@ -3455 +3488 @@
             goto on_error;
         
+        tls_id = transport_id;
+
         /* Add local account */
         pjsua_acc_add_local(transport_id, PJ_FALSE, &acc_id);
@@ -3556 +3591 @@
         app_config.pool = NULL;
     }
+
+    pjsua_transport_close(tls_id, 0);
 
     status = pjsua_destroy();