Changeset 10231

Timestamp:

2005-07-08T11:54:05+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added some alternative methods of resolving the address the local library will attempt to load, since many people have reported problems with the existing method lately. The first new method determines the IP but doesn't resolve it to a name, and the second new method always uses "127.0.0.1". This option is controlled using the "address_resolution_method" option in the Local Library gsdlsite.cfg file.

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (2 diffs)
• settings.cpp (modified) (3 diffs)
• settings.h (modified) (1 diff)

trunk/gsdl/src/w32server/fnord.cpp

@@ -330 +330 @@
 
   // get the url and attempt to start a browser
-  char *localname = GetLocalName(NULL);
   if (have_networking) {
-    text_t url = "http://" + text_t(localname);
+    // There are now three address resolution methods:
+    //   0: Standard -- get local IP then resolve to a name
+    //   1: IP only -- as above, but use IP only -- don't resolve to a name
+    //   2: 127.0.0.1 -- always use 127.0.0.1
+    char gsdl_address[100];
+
+    DWORD local_ip = GetLocalIP();
+    if (local_ip == INADDR_ANY || gsdl_address_resolution_method == 2) {
+      local_ip = 127 + (0 << 8) + (0 << 16) + (1 << 24);
+    }
+
+    if (gsdl_address_resolution_method == 1 || gsdl_address_resolution_method == 2) {
+      sprintf(gsdl_address, "%d.%d.%d.%d", local_ip & 0xFF, (local_ip >> 8) & 0xFF, (local_ip >> 16) & 0xFF, (local_ip >> 24) & 0xFF);
+    }
+    else {
+      strcpy(gsdl_address, GetLocalName(NULL));
+    }
+
+    text_t url = "http://" + text_t(gsdl_address);
 
     gsdl_url = url;
@@ -1058 +1075 @@
     exit (0);
   }
-  
+
   if (!gsdl_init()) // quit if can't initialise the library correctly
     exit (0);

trunk/gsdl/src/w32server/settings.cpp

@@ -66 +66 @@
 text_t gsdl_conffile;
 int gsdl_start_browser = 1;
+int gsdl_address_resolution_method = 0;
 
 // private data
@@ -311 +312 @@
     write_ini_line(fout, "collections", gsdl_collections);
     write_ini_line(fout, "start_browser", text_t(gsdl_start_browser));
-    
+    write_ini_line(fout, "address_resolution_method", text_t(gsdl_address_resolution_method));
+
     // collection levels
     colinfo_tmap::iterator here = gsdl_collectinfo.begin();
@@ -466 +468 @@
       } else if (key == "browserexe") {
         strcpy (gsdl_browser_exe, cstr_value);
+
+      } else if (key == "address_resolution_method") {
+        gsdl_address_resolution_method = value.getint();
 
       } else if (key == "collections") {

trunk/gsdl/src/w32server/settings.h

@@ -61 +61 @@
 extern text_t gsdl_conffile;
 extern int gsdl_start_browser;
+extern int gsdl_address_resolution_method;
 
 void Settings_Dialog(HWND window, int netscapeneeded);