Changeset 3036 for pjproject/trunk/pjsip-apps/src/pocketpj/PocketPJDlg.cpp

Timestamp:

Dec 29, 2009 3:33:13 PM (14 years ago)

Author:

bennylp

Message:

Misc PocketPJ fixes (#1006):

• always intantiate TCP to support TCP auto-switching
• bug fix in retrieving DNS server field from GetNetworkParams?() return value

File:

• pjproject/trunk/pjsip-apps/src/pocketpj/PocketPJDlg.cpp (modified) (5 diffs)

pjproject/trunk/pjsip-apps/src/pocketpj/PocketPJDlg.cpp

@@ -132 +132 @@
     {
         FIXED_INFO fi;
+        PIP_ADDR_STRING pDNS = NULL;
         ULONG len = sizeof(fi);
         CString err;
@@ -138 +139 @@
         if (GetNetworkParams(&fi, &len) != ERROR_SUCCESS) {
             err = _T("Info: Error querying network parameters. You must configure DNS server.");
-        } else if (fi.CurrentDnsServer == NULL) {
+        } else if (fi.CurrentDnsServer) {
+            pDNS = fi.CurrentDnsServer;
+        } else if (fi.DnsServerList.IpAddress.String[0] != 0) {
+            pDNS = &fi.DnsServerList;
+        } else {
             err = _T("Info: DNS server not configured. You must configure DNS server.");
         } 
@@ -155 +160 @@
             }
         } else {
-            strcpy(nameserver, fi.CurrentDnsServer->IpAddress.String);
+            strcpy(nameserver, pDNS->IpAddress.String);
             cfg.nameserver_count = 1;
             cfg.nameserver[0] = pj_str(nameserver);
@@ -169 +174 @@
 
     pjsua_logging_config_default(&log_cfg);
+    log_cfg.msg_logging = PJ_TRUE;
     log_cfg.log_filename = pj_str("\\PocketPJ.TXT");
 
@@ -214 +220 @@
     }
 
-    if (m_Cfg.m_TCP) {
+    // Always instantiate TCP to support auto-switching to TCP when
+    // packet is larger than 1300 bytes. If TCP is disabled when
+    // no auto-switching will occur
+    if (1) {
         // Create one TCP transport
         PopUp_Modify(POPUP_REGISTRATION, POPUP_EL_TITLE3, "Adding TCP transport..");