Changeset 1526 for pjproject/trunk

Timestamp:

Oct 26, 2007 5:35:42 AM (17 years ago)

Author:

bennylp

Message:

More ticket #399: pj_sock_close() is called more than once. Also implemented NAT detection callback for Symbian UA

Location:

pjproject/trunk

Files:

• pjnath/src/pjnath/nat_detect.c (modified) (1 diff)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/nat_detect.c

@@ -831 +831 @@
         pj_ioqueue_unregister(sess->key);
         sess->key = NULL;
+        sess->sock = PJ_INVALID_SOCKET;
         te->id = 0;
         pj_mutex_unlock(sess->mutex);

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

@@ -58 +58 @@
 //
 // STUN server
-#if 0
+#if 1
         // Use this to have the STUN server resolved normally
 #   define STUN_DOMAIN  NULL
@@ -217 +217 @@
 
 
+/* NAT detection result */
+static void on_nat_detect(const pj_stun_nat_detect_result *res) 
+{
+    if (res->status != PJ_SUCCESS) {
+        pjsua_perror(THIS_FILE, "NAT detection failed", res->status);
+    } else {
+        PJ_LOG(3, (THIS_FILE, "NAT detected as %s", res->nat_type_name));
+    }    
+}
+
 /* Notification that call is being replaced. */
 static void on_call_replaced(pjsua_call_id old_call_id,
@@ -283 +293 @@
     cfg.cb.on_call_transfer_status = &on_call_transfer_status;
     cfg.cb.on_call_replaced = &on_call_replaced;
-
+    cfg.cb.on_nat_detect = &on_nat_detect;
+    
     if (SIP_PROXY) {
             cfg.outbound_proxy_cnt = 1;