Changeset 3923 for pjproject/trunk

Timestamp:

Dec 26, 2011 9:03:13 AM (13 years ago)

Author:

bennylp

Message:

Misc (re #1393): vidgui: added account and NAT support and fixed assertion on incoming call

File:

• pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp (modified) (9 diffs)

pjproject/trunk/pjsip-apps/src/vidgui/vidgui.cpp

@@ -31 +31 @@
 #define THIS_FILE               "vidgui.cpp"
 
+///////////////////////////////////////////////////////////////////////////
+//
+// SETTINGS
+//
+
+//
 // These configure SIP registration
-#define SIP_DOMAIN              NULL
-//#define SIP_DOMAIN            "pjsip.org"
+//
+#define USE_REGISTRATION        0
+#define SIP_DOMAIN              "pjsip.org"
 #define SIP_USERNAME            "vidgui"
 #define SIP_PASSWORD            "secret"
-#define SIP_PORT                5060
-
+#define SIP_PORT                5084
+#define SIP_TCP                 1
+
+//
+// NAT helper settings
+//
+#define USE_ICE                 1
+#define USE_STUN                0
+#define STUN_SRV                "stun.pjsip.org"
+
+//
+// Devices settings
+//
 #define DEFAULT_CAP_DEV         PJMEDIA_VID_DEFAULT_CAPTURE_DEV
 //#define DEFAULT_CAP_DEV               1
 #define DEFAULT_REND_DEV        PJMEDIA_VID_DEFAULT_RENDER_DEV
+
+
+//
+// End of Settings
+///////////////////////////////////////////////////////////////////////////
+
 
 MainWin *MainWin::theInstance_;
@@ -327 +351 @@
     pjsua_call_get_info(call_id, &ci);
 
-    if (currentCall_ == -1 && ci.state < PJSIP_INV_STATE_DISCONNECTED) {
+    if (currentCall_ == -1 && ci.state < PJSIP_INV_STATE_DISCONNECTED &&
+        ci.role == PJSIP_ROLE_UAC)
+    {
         emit signalNewCall(call_id, false);
     }
@@ -436 +462 @@
     ua_cfg.cb.on_incoming_call = &::on_incoming_call;
     ua_cfg.cb.on_call_media_state = &::on_call_media_state;
+#if USE_STUN
+    ua_cfg.stun_srv_cnt = 1;
+    ua_cfg.stun_srv[0] = pj_str((char*)STUN_SRV);
+#endif
 
     pjsua_logging_config log_cfg;
@@ -443 +473 @@
     pjsua_media_config med_cfg;
     pjsua_media_config_default(&med_cfg);
+    med_cfg.enable_ice = USE_ICE;
 
     status = pjsua_init(&ua_cfg, &log_cfg, &med_cfg);
@@ -472 +503 @@
     }
 
+#if SIP_TCP
     pjsua_transport_config tcp_cfg;
     pjsua_transport_config_default(&tcp_cfg);
@@ -482 +514 @@
         goto on_error;
     }
+#endif
 
     //
@@ -488 +521 @@
     pjsua_acc_config acc_cfg;
     pjsua_acc_config_default(&acc_cfg);
-#if SIP_DOMAIN
-    acc_cfg.id = pj_str( "sip:" SIP_USERNAME "@" SIP_DOMAIN);
+#if USE_REGISTRATION
+    acc_cfg.id = pj_str( (char*)"<sip:" SIP_USERNAME "@" SIP_DOMAIN ">");
     acc_cfg.reg_uri = pj_str((char*) ("sip:" SIP_DOMAIN));
     acc_cfg.cred_count = 1;
@@ -496 +529 @@
     acc_cfg.cred_info[0].username = pj_str((char*)SIP_USERNAME);
     acc_cfg.cred_info[0].data = pj_str((char*)SIP_PASSWORD);
+
+# if SIP_TCP
+    acc_cfg.proxy[acc_cfg.proxy_cnt++] = pj_str((char*) "<sip:" SIP_DOMAIN ";transport=tcp>");
+# endif
+
 #else
     char sip_id[80];
@@ -506 +544 @@
 #endif
 
-    acc_cfg.max_video_cnt = 1;
     acc_cfg.vid_cap_dev = DEFAULT_CAP_DEV;
     acc_cfg.vid_rend_dev = DEFAULT_REND_DEV;