Changeset 1248 for pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

Timestamp:

May 3, 2007 7:56:21 PM (17 years ago)

Author:

bennylp

Message:

Misc Symbian fixes, looks good

File:

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

pjproject/trunk/pjsip-apps/src/symbian_ua/ua.cpp

@@ -47 +47 @@
 // Destination URI (to make call, or to subscribe presence)
 //
-#define SIP_DST_URI     "sip:192.168.0.70:5061"
+#define SIP_DST_URI     "sip:192.168.0.7:5061"
 
 //
@@ -53 +53 @@
 //
 #define HAS_SIP_ACCOUNT 0       // 0 to disable registration
-#define SIP_DOMAIN      "colinux"
-#define SIP_USER        "bulukucing"
-#define SIP_PASSWD      "netura"
+#define SIP_DOMAIN      "server"
+#define SIP_USER        "user"
+#define SIP_PASSWD      "password"
 
 //
@@ -61 +61 @@
 //
 #define SIP_PROXY       NULL
-//#define SIP_PROXY     "sip:192.168.0.1"
+//#define SIP_PROXY     "sip:192.168.0.8"
+
+
+//
+// Configure nameserver if DNS SRV is to be used with both SIP
+// or STUN (for STUN see other settings below)
+//
+#define NAMESERVER      NULL
+//#define NAMESERVER    "62.241.163.201"
+
+//
+// STUN server
+#if 0
+        // Use this to have the STUN server resolved normally
+#   define STUN_DOMAIN  NULL
+#   define STUN_SERVER  "stun.fwdnet.net"
+#elif 0
+        // Use this to have the STUN server resolved with DNS SRV
+#   define STUN_DOMAIN  "iptel.org"
+#   define STUN_SERVER  NULL
+#else
+        // Use this to disable STUN
+#   define STUN_DOMAIN  NULL
+#   define STUN_SERVER  NULL
+#endif
+
+//
+// Use ICE?
+//
+#define USE_ICE         1
 
 
@@ -94 +123 @@
     g_call_id = call_id;
     
-    /* Automatically answer incoming calls with 200/OK */
-    pjsua_call_answer(call_id, 200, NULL, NULL);
+    /* Automatically answer incoming calls with 180/Ringing */
+    pjsua_call_answer(call_id, 180, NULL, NULL);
 }
 
@@ -110 +139 @@
         if (call_id == g_call_id)
             g_call_id = PJSUA_INVALID_ID;
-    } else {
+    } else if (ci.state != PJSIP_INV_STATE_INCOMING) {
         if (g_call_id == PJSUA_INVALID_ID)
             g_call_id = call_id;
@@ -276 +305 @@
         }
         
+        if (NAMESERVER) {
+                cfg.nameserver_count = 1;
+                cfg.nameserver[0] = pj_str(NAMESERVER);
+        }
+        
+        if (NAMESERVER && STUN_DOMAIN) {
+                cfg.stun_domain = pj_str(STUN_DOMAIN);
+        } else if (STUN_SERVER) {
+                cfg.stun_host = pj_str(STUN_SERVER);
+        }
+        
+        
         pjsua_logging_config_default(&log_cfg);
         log_cfg.console_level = 4;
@@ -285 +326 @@
         med_cfg.clock_rate = 8000;
         med_cfg.ec_tail_len = 0;
+        med_cfg.enable_ice = USE_ICE;
         
         status = pjsua_init(&cfg, &log_cfg, &med_cfg);
@@ -483 +525 @@
 }
 
+
 ////////////////////////////////////////////////////////////////////////////
 int ua_main() 
@@ -492 +535 @@
         if (status != PJ_SUCCESS)
                 return status;
-        
-        
+
         // Run the UI
         CActiveSchedulerWait *asw = new CActiveSchedulerWait;