Changeset 11319 for trunk

Timestamp:

2006-03-09T11:41:33+13:00 (18 years ago)

Author:

kjdon

Message:

added in localhost to address resolution methods

Location:

trunk/gsdl/src/w32server

Files:

• fnord.cpp (modified) (1 diff)
• resource.h (modified) (2 diffs)
• server.rc (modified) ( previous)
• settings.cpp (modified) (3 diffs)
• settings.h (modified) (1 diff)

trunk/gsdl/src/w32server/fnord.cpp

@@ -331 +331 @@
   // get the url and attempt to start a browser
   if (have_networking) {
-    // There are now three address resolution methods:
+    // There are now four 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
+    //   2: localhost -- always use localhost
+    //   3: 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) {
+    if (local_ip == INADDR_ANY || gsdl_address_resolution_method == 3) {
       local_ip = 127 + (0 << 8) + (0 << 16) + (1 << 24);
     }
 
-    if (gsdl_address_resolution_method == 1 || gsdl_address_resolution_method == 2) {
+    if (gsdl_address_resolution_method == 1 || gsdl_address_resolution_method == 3) {
       sprintf(gsdl_address, "%d.%d.%d.%d", local_ip & 0xFF, (local_ip >> 8) & 0xFF, (local_ip >> 16) & 0xFF, (local_ip >> 24) & 0xFF);
+    }
+    else if (gsdl_address_resolution_method == 2) {
+      sprintf(gsdl_address, "localhost");
     }
     else {

trunk/gsdl/src/w32server/resource.h

@@ -39 +39 @@
 #define ID_ARM_IP                       1025
 #define ID_ARM_127_0_0_1                1026
+#define ID_ARM_LOCALHOST                1027
 #define ID_PROJECT_SETTINGS             40001
 #define ID_PROJECT_EXIT                 40002
@@ -49 +50 @@
 #define _APS_NEXT_RESOURCE_VALUE        127
 #define _APS_NEXT_COMMAND_VALUE         40011
-#define _APS_NEXT_CONTROL_VALUE         1026
+#define _APS_NEXT_CONTROL_VALUE         1030
 #define _APS_NEXT_SYMED_VALUE           102
 #endif

trunk/gsdl/src/w32server/settings.cpp

@@ -590 +590 @@
   if (SendDlgItemMessage(hwndDlg, ID_ARM_IP,
              BM_GETCHECK, 0, 0) == 1) return ARM_IP;
+  if (SendDlgItemMessage(hwndDlg, ID_ARM_LOCALHOST,
+             BM_GETCHECK, 0, 0) == 1) return ARM_LOCALHOST;
   if (SendDlgItemMessage(hwndDlg, ID_ARM_127_0_0_1,
              BM_GETCHECK, 0, 0) == 1) return ARM_127_0_0_1;
@@ -602 +604 @@
   SendDlgItemMessage(hwndDlg, ID_ARM_IP, BM_SETCHECK,
              (address_res_method == ARM_IP) ? BST_CHECKED : BST_UNCHECKED, 0);
+  SendDlgItemMessage(hwndDlg, ID_ARM_LOCALHOST, BM_SETCHECK,
+             (address_res_method == ARM_LOCALHOST) ? BST_CHECKED : BST_UNCHECKED, 0);
   SendDlgItemMessage(hwndDlg, ID_ARM_127_0_0_1, BM_SETCHECK,
              (address_res_method == ARM_127_0_0_1) ? BST_CHECKED : BST_UNCHECKED, 0);
@@ -754 +758 @@
     dialog_update_enables(hwndDlg);
     return 1;
+    case ID_ARM_LOCALHOST:
+    set_address_resolution_field (hwndDlg, ARM_LOCALHOST);
+    dialog_update_enables(hwndDlg);
+    return 1;
      case ID_ARM_127_0_0_1:
     set_address_resolution_field (hwndDlg, ARM_127_0_0_1);

trunk/gsdl/src/w32server/settings.h

@@ -37 +37 @@
 #define ARM_NAME 0
 #define ARM_IP 1
-#define ARM_127_0_0_1 2
+#define ARM_LOCALHOST 2
+#define ARM_127_0_0_1 3
 
 #include "text_t.h"