Changeset 8836

Timestamp:

01/23/08 02:49:08 (5 years ago)

Author:

BrainSlayer

Message:

allow ssh tcp forwarding

Location:

src/router

Files:

• dropbear/config/sshd.webservices (modified) (1 diff)
• kromo/dd-wrt/Makefile (modified) (1 diff)
• kromo/dd-wrt/lang_pack/english.js (modified) (1 diff)
• kromo/dd-wrt/lang_pack/german.js (modified) (1 diff)
• services/services/sshd.c (modified) (1 diff)
• services/sysinit/defaults.c (modified) (1 diff)

src/router/dropbear/config/sshd.webservices

@@ -8 +8 @@
         </div>
         <div id="idssh">
+                <div class="setting">
+                        <div class="label"><% tran("service.ssh_forwarding"); %></div>
+                        <input class="spaceradio" type="radio" name="sshd_forwarding" value="1" <% nvram_checked("sshd_forwarding", "1"); %> /><% tran("share.enable"); %>&nbsp;
+                        <input class="spaceradio" type="radio" name="sshd_forwarding" value="0" <% nvram_checked("sshd_forwarding", "0"); %> /><% tran("share.disable"); %>
+                </div>
                 <div class="setting">
                         <div class="label"><% tran("service.ssh_password"); %></div>

src/router/kromo/dd-wrt/Makefile

@@ -233 +233 @@
         cp maksat/common-coral.css $(INSTALLDIR)/www/style
 endif
-
+ifeq ($(CONFIG_TRIMAX),y)
+        cp -f trimax/logo.png $(INSTALLDIR)/www/style/logo.png
+endif
 ifeq ($(CONFIG_MAKSAT),y)
+        cp -f maksat/SuperChannel.asp $(INSTALLDIR)/www
         cp -f maksat/logo.png $(INSTALLDIR)/www/style/logo.png
         cp -f maksat/logo.png $(INSTALLDIR)/www/images/logo.png

src/router/kromo/dd-wrt/lang_pack/english.js

@@ -1156 +1156 @@
 service.ssh_password="Password Login";
 service.ssh_key="Authorized Keys";
+service.ssh_forwarding="SSH TCP Forwarding";
 
 //radiooff.webservices

src/router/kromo/dd-wrt/lang_pack/german.js

@@ -1094 +1094 @@
 service.ssh_password="Passwort-Login";
 service.ssh_key="Authorisierte Schlüssel";
+service.ssh_forwarding="SSH TCP Weiterleitung";
 
 //hwmon.webservices

src/router/services/services/sshd.c

@@ -104 +104 @@
               DSS_HOST_KEY_FILE, "-p", port, passwd_ok);
 #else
-  ret =
-    eval ("dropbear", "-b", "/tmp/loginprompt", "-r", RSA_HOST_KEY_FILE, "-d",
-          DSS_HOST_KEY_FILE, "-p", port, passwd_ok);
+  if (nvram_match ("sshd_forwarding", "1"))
+    {
+      ret =
+        eval ("dropbear", "-b", "/tmp/loginprompt", "-r", RSA_HOST_KEY_FILE,
+              "-d", DSS_HOST_KEY_FILE, "-p", port, passwd_ok, "-a");
+    }
+  else
+    {
+      ret =
+        eval ("dropbear", "-b", "/tmp/loginprompt", "-r", RSA_HOST_KEY_FILE,
+              "-d", DSS_HOST_KEY_FILE, "-p", port, passwd_ok);
+    }
+}
 #endif
 //  ret = _eval (sshd_argv, NULL, 0, &pid);
 
-  return ret;
+return ret;
 }
 

src/router/services/sysinit/defaults.c

@@ -1289 +1289 @@
   {"sshd_enable", "0", 0},
 #endif
+  {"sshd_forwarding", "0", 0},
   {"sshd_port", "22", 0},
   {"sshd_passwd_auth", "1", 0},