Changeset 20949 for gsdl/trunk/runtime-src/src/w32server/fnord.cpp

Timestamp:

2009-11-16T19:45:24+13:00 (14 years ago)

Author:

ak19

Message:

Need to write out hostIP in case we were using this address-resolution-method, and then next time started up the apache server instead of server.exe.

File:

• gsdl/trunk/runtime-src/src/w32server/fnord.cpp (modified) (3 diffs)

gsdl/trunk/runtime-src/src/w32server/fnord.cpp

@@ -338 +338 @@
     //   3: 127.0.0.1 -- always use 127.0.0.1
     char gsdl_address[100];
+    char hostIP[25]; // 16 should be enough to represent an IP address + null byte
 
     DWORD local_ip = GetLocalIP();
+    // always work out the hostIP:
+    sprintf(hostIP, "%d.%d.%d.%d", local_ip & 0xFF, (local_ip >> 8) & 0xFF, (local_ip >> 16) & 0xFF, (local_ip >> 24) & 0xFF);
+
     if (local_ip == INADDR_ANY || gsdl_address_resolution_method == 3) {
       local_ip = 127 + (0 << 8) + (0 << 16) + (1 << 24);
@@ -350 +354 @@
       sprintf(gsdl_address, "localhost");
     }
-    else {
+    else { 
       strcpy(gsdl_address, GetLocalName(NULL));
     }
@@ -356 +360 @@
     text_t url = "http://" + text_t(gsdl_address);
 
+    gsdl_host_IP = text_t(hostIP);
     gsdl_url = url;
     write_settings(gsdl_url);