Changeset 27 for trunk/src/sh_forward.c

Timestamp:

Apr 6, 2006, 8:55:51 PM (19 years ago)

Author:

rainer

Message:

Support for server-to-server relay and more user policies

File:

• trunk/src/sh_forward.c (modified) (4 diffs)

trunk/src/sh_forward.c

@@ -335 +335 @@
 #endif
 
-#ifdef SH_WITH_CLIENT
+#if defined(SH_WITH_CLIENT) || defined(SH_WITH_SERVER)
 
 static int count_dev_server = 0;
@@ -708 +708 @@
 static long sh_forward_try (char * errmsg);
 
+static unsigned int ServerPort = SH_DEFAULT_PORT;
+
+int sh_forward_server_port (const char * str)
+{
+  unsigned long l;
+  char * endptr;
+
+  SL_ENTER(_("sh_forward_server_port"));
+
+  l = strtoul (str, &endptr, 0);
+  if (l > 65535 || endptr == str)
+    {
+      SL_RETURN (-1, _("sh_forward_server_port"));
+    }
+  ServerPort = (unsigned int) l;
+  SL_RETURN (0, _("sh_forward_server_port"));
+}
 
 long sh_forward (char * errmsg)
@@ -880 +897 @@
 
   sockfd = connect_port_2 (sh.srvexport.name, sh.srvexport.alt, 
-                           SH_DEFAULT_PORT, 
+                           ServerPort, 
                            error_call, &error_num, error_msg, 256);
 
@@ -1441 +1458 @@
                                                 flag_err,
                                                 MSG_TCP_NOCONF);
-                              } else {
+                              } 
+#ifdef SH_WITH_CLIENT
+                              else {
                                 sh_socket_server_cmd(buffer);
                               }
+#endif
                               flag_err = 0;