[or-cvs] r20696: {torvm} Set VM kernel version for 0.0.3, misc cleanup. (in torvm/trunk/build: kamikaze/patches win32/files win32/src/torvm-w32)

[coderman@xxxxxxxx]

Author: coderman
Date: 2009-09-29 10:31:06 -0400 (Tue, 29 Sep 2009)
New Revision: 20696

Modified:
   torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch
   torvm/trunk/build/win32/files/uninstall.bat
   torvm/trunk/build/win32/src/torvm-w32/torvm.c
Log:
Set VM kernel version for 0.0.3, misc cleanup.

Modified: torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch
===================================================================
--- torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch	2009-09-29 14:15:11 UTC (rev 20695)
+++ torvm/trunk/build/kamikaze/patches/002-kamikaze-mod-basefiles.patch	2009-09-29 14:31:06 UTC (rev 20696)
@@ -230,7 +230,7 @@
 -exec /bin/ash --login
 diff -Naur a/package/base-files/files/etc/banner b/package/base-files/files/etc/banner
 --- a/package/base-files/files/etc/banner	2009-04-17 14:32:29.989894000 +0000
-+++ b/package/base-files/files/etc/banner	2009-05-27 03:52:06.692738202 +0000
++++ b/package/base-files/files/etc/banner	2009-09-29 14:19:37.728246070 +0000
 @@ -1,10 +1,26 @@
 -  _______                     ________        __
 - |       |.-----.-----.-----.|  |  |  |.----.|  |_
@@ -266,7 +266,7 @@
 +
 +
 +
-+ Tor Virtual Machine - version 0.0.2-dev
++ Tor Virtual Machine - version 0.0.3
 +
 diff -Naur a/package/base-files/files/etc/config/fstab b/package/base-files/files/etc/config/fstab
 --- a/package/base-files/files/etc/config/fstab	2007-09-22 13:47:20.783817000 +0000

Modified: torvm/trunk/build/win32/files/uninstall.bat
===================================================================
--- torvm/trunk/build/win32/files/uninstall.bat	2009-09-29 14:15:11 UTC (rev 20695)
+++ torvm/trunk/build/win32/files/uninstall.bat	2009-09-29 14:31:06 UTC (rev 20696)
@@ -1,5 +1,5 @@
 @ECHO OFF
-ECHO "Removing installed https://www.torproject.org software."
+ECHO Removing installed https://www.torproject.org software.
 IF EXIST "%USERPROFILE%\Local Settings\Application Data\Thandy\TorVM Updates" (
   cd "%USERPROFILE%\Local Settings\Application Data\Thandy\TorVM Updates"
   for %%f in (*.msi) do ECHO Removing %%f

Modified: torvm/trunk/build/win32/src/torvm-w32/torvm.c
===================================================================
--- torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-09-29 14:15:11 UTC (rev 20695)
+++ torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-09-29 14:31:06 UTC (rev 20696)
@@ -1186,29 +1186,37 @@
                               0,
                               KEY_READ,   
                               &tkey);
-        len = sizeof (name_data);
-        status = RegQueryValueEx(tkey,
-                                 "DhcpDNS",
-                                 NULL,
-                                 &name_type,
-                                 name_data,
-                                 &len);
         if (status == ERROR_SUCCESS) {
-          ce->dns1 = strdup(name_data);
-        }
-        len = sizeof (name_data);
-        status = RegQueryValueEx(tkey,
-                                 "DhcpWINS",
-                                 NULL,
-                                 &name_type,
-                                 name_data,
-                                 &len);
-        if (status == ERROR_SUCCESS) {
-          ce->dns2 = strdup(name_data);
+          len = sizeof (name_data);
+          status = RegQueryValueEx(tkey,
+                                   "DhcpDNS",
+                                   NULL,
+                                   &name_type,
+                                   name_data,
+                                   &len);
+          if (status == ERROR_SUCCESS) {
+            ce->dns1 = strdup(name_data);
+          }
+          len = sizeof (name_data);
+          status = RegQueryValueEx(tkey,
+                                   "DhcpWINS",
+                                   NULL,
+                                   &name_type,
+                                   name_data,
+                                   &len);
+          if (status == ERROR_SUCCESS) {
+            ce->dns2 = strdup(name_data);
+          } 
+          RegCloseKey (tkey);
         } 
         if (isconnected (ce->guid)) {
           linfo ("Interface %s (%s) is currently connected.", ce->name, ce->macaddr);
           ce->isactive = TRUE;
+          status = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                                tcpip_string,
+                                0,
+                                KEY_READ,   
+                                &tkey);
           if (status == ERROR_SUCCESS) {
             len = sizeof (BOOL);
             status = RegQueryValueEx(tkey,