Changeset 19210 for gsdl

Timestamp:

2009-04-22T22:32:44+12:00 (15 years ago)

Author:

davidb

Message:

Local Library Server can now either be configured to connects from anywhere or be restricted to only allow local connections. The option is controlled by setting 'externalaccess' to 1 or 0 appropriately. A widget for this is provided under File/Settings

Location:

gsdl/trunk/runtime-src/src/w32server

Files:

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

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

@@ -35 +35 @@
 #include "locate.h"
 #include "d_winsock.h"
+#include "settings.h"
 
 //Private Variables and Declarations
@@ -217 +218 @@
     ServerSockAddr.sin_port = d_htons( (WORD) bind_port);
     ServerSockAddr.sin_family = AF_INET;
-    ServerSockAddr.sin_addr.s_addr = d_htonl(INADDR_ANY);
-    
+    if (gsdl_external_access) {
+      ServerSockAddr.sin_addr.s_addr = d_htonl(INADDR_ANY);
+    }
+    else {
+      ServerSockAddr.sin_addr.s_addr = d_htonl(INADDR_LOOPBACK);
+    }
+
+
     // Try to bind the socket with the address
     if (d_bind(ServerSocket, (LPSOCKADDR) &ServerSockAddr,

gsdl/trunk/runtime-src/src/w32server/resource.h

@@ -40 +40 @@
 #define ID_ARM_127_0_0_1                1026
 #define ID_ARM_LOCALHOST                1027
+#define ID_EXTERNAL_ACCESS              1028
 #define ID_PROJECT_SETTINGS             40001
 #define ID_PROJECT_EXIT                 40002

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

@@ -61 +61 @@
 // general settings
 int gsdl_port_num = 80;
+int gsdl_external_access = 0;
 int gsdl_auto_enter = 0;
 int gsdl_browser = GS_DEFAULT;
@@ -310 +311 @@
     
     write_ini_line(fout, "portnumber", text_t(gsdl_port_num));
+    write_ini_line(fout, "externalaccess", text_t(gsdl_external_access));
     write_ini_line(fout, "autoenter", text_t(gsdl_auto_enter));
     write_ini_line(fout, "browser", text_t(gsdl_browser));
@@ -402 +404 @@
   // general settings
   gsdl_port_num = 80;
+  gsdl_external_access = 0;
   gsdl_auto_enter = 0;
   gsdl_start_browser = 1;
@@ -464 +467 @@
       } else if (key == "portnumber") {
         gsdl_port_num = value.getint();
+
+      } else if (key == "externalaccess") {
+        gsdl_external_access = value.getint();
         
       } else if (key == "autoenter") {
@@ -636 +642 @@
   gsdl_port_num = GetDlgItemInt(hwndDlg, SERVER_PORT_EDIT_BOX, &bres, 0);
   if (!bres) gsdl_port_num = 80;
-  
+
+  // whether to allow external access or not
+  res = SendDlgItemMessage(hwndDlg, ID_EXTERNAL_ACCESS, BM_GETCHECK, 0, 0);
+  gsdl_external_access = (res == 1);
+    
   // whether to enter the library automatically on startup
   res = SendDlgItemMessage(hwndDlg, ID_AUTO_ENTER_LIBRARY, BM_GETCHECK, 0, 0);
   gsdl_auto_enter = (res == 1);
-  
+
   // which browser to use
   gsdl_browser = read_dialog_browser_field (hwndDlg);
@@ -666 +676 @@
     // set current values
     SetDlgItemInt(hwndDlg, SERVER_PORT_EDIT_BOX, gsdl_port_num, FALSE);
+    SendDlgItemMessage(hwndDlg, ID_EXTERNAL_ACCESS, BM_SETCHECK,
+               gsdl_external_access ? 1 : 0, 0);
     SendDlgItemMessage(hwndDlg, ID_AUTO_ENTER_LIBRARY, BM_SETCHECK,
                gsdl_auto_enter ? 1 : 0, 0);
@@ -877 +889 @@
   int old_gsdl_show_console = gsdl_show_console;
   int old_gsdl_port_num = gsdl_port_num;
+  int old_gsdl_external_access = gsdl_external_access;
   
   int res = 0;
@@ -912 +925 @@
     if (res == 1) {
       // only update if exited via the OK button
-      if (gsdl_port_num != old_gsdl_port_num) {
+      if ((gsdl_port_num != old_gsdl_port_num) 
+      || (gsdl_external_access != old_gsdl_external_access)) {
     EndHTTPServer();
     StartHTTPServer(window);

gsdl/trunk/runtime-src/src/w32server/settings.h

@@ -62 +62 @@
 // general settings
 extern int gsdl_port_num;
+extern int gsdl_external_access;
 extern int gsdl_auto_enter;
 extern int gsdl_browser;