Changeset 52897 in vbox for trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp

Timestamp:

Sep 30, 2014 2:45:00 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

96327

Message:

Main: DnsMonitorService: step on unicode rails: store network configuration in unicode-compatible containner (std::wstring) (preliminary tested on Linux, Mac and Windows); DnsMonitorService for Windows: reworked in order to subscribe to correct events and filter-out those ones we don't interested in. (Experimantal, needs more testing and review).

File:

• trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/HostDnsServiceResolvConf.cpp

@@ -61 +61 @@
 }
 
-
 HRESULT HostDnsServiceResolvConf::readResolvConf()
 {
     struct rcp_state st;
-    
+    wchar_t *pwczTmpStr;
+
     st.rcps_flags = RCPSF_NO_STR2IPCONV; 
     int rc = rcp_parse(&st, m->resolvConfFilename.c_str());
@@ -75 +75 @@
     {
         AssertBreak(st.rcps_str_nameserver[i]);
-        info.servers.push_back(st.rcps_str_nameserver[i]);
+
+        pwczTmpStr = NULL;
+        rc = RTStrToUtf16(st.rcps_str_nameserver[i], (RTUTF16 **)&pwczTmpStr);
+        if (RT_SUCCESS(rc) && pwczTmpStr)
+        {
+            info.servers.push_back(std::wstring(pwczTmpStr));
+            RTUtf16Free((RTUTF16 *)pwczTmpStr);
+        }
     }
-    
+
     if (st.rcps_domain)
-        info.domain = st.rcps_domain;
+    {
+        pwczTmpStr = NULL;
+        rc = RTStrToUtf16(st.rcps_domain, (RTUTF16 **)&pwczTmpStr);
+        if (RT_SUCCESS(rc) && pwczTmpStr)
+        {
+            info.domain = std::wstring(pwczTmpStr);
+            RTUtf16Free((RTUTF16 *)pwczTmpStr);
+        }
+    }
 
     for (unsigned i = 0; i != st.rcps_num_searchlist; ++i)
     {
         AssertBreak(st.rcps_searchlist[i]);
-        info.searchList.push_back(st.rcps_searchlist[i]);
+        pwczTmpStr = NULL;
+        rc = RTStrToUtf16(st.rcps_searchlist[i], (RTUTF16 **)&pwczTmpStr);
+        if (RT_SUCCESS(rc) && pwczTmpStr)
+        {
+            info.searchList.push_back(std::wstring(pwczTmpStr));
+            RTUtf16Free((RTUTF16 *)pwczTmpStr);
+        }
     }
     setInfo(info);