2006-01-14 19:22:39 +02:00
|
|
|
diff -ur busybox-1.1.0/networking/telnetd.c busybox-1.1.0-owrt/networking/telnetd.c
|
|
|
|
--- busybox-1.1.0/networking/telnetd.c 2006-01-11 06:43:51.000000000 +0100
|
|
|
|
+++ busybox-1.1.0-owrt/networking/telnetd.c 2006-01-14 17:41:20.000000000 +0100
|
|
|
|
@@ -45,6 +45,7 @@
|
2005-02-06 03:32:23 +02:00
|
|
|
#include <arpa/telnet.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <sys/syslog.h>
|
|
|
|
+#include <net/if.h>
|
|
|
|
|
|
|
|
#include "busybox.h"
|
|
|
|
|
2006-01-14 19:22:39 +02:00
|
|
|
@@ -394,11 +395,13 @@
|
|
|
|
struct in_addr bind_addr = { .s_addr = 0x0 };
|
2005-02-06 03:32:23 +02:00
|
|
|
#endif /* CONFIG_FEATURE_TELNETD_INETD */
|
|
|
|
int c;
|
|
|
|
+ char *interface_name = NULL;
|
|
|
|
+ struct ifreq interface;
|
|
|
|
static const char options[] =
|
|
|
|
#ifdef CONFIG_FEATURE_TELNETD_INETD
|
|
|
|
- "f:l:";
|
|
|
|
+ "i:f:l:";
|
2006-01-14 19:22:39 +02:00
|
|
|
#else /* CONFIG_EATURE_TELNETD_INETD */
|
|
|
|
- "f:l:p:b:";
|
|
|
|
+ "i:f:l:p:b:";
|
2005-02-06 03:32:23 +02:00
|
|
|
#endif /* CONFIG_FEATURE_TELNETD_INETD */
|
|
|
|
int maxlen, w, r;
|
|
|
|
|
2006-01-14 19:22:39 +02:00
|
|
|
@@ -413,6 +416,9 @@
|
2005-02-06 03:32:23 +02:00
|
|
|
case 'f':
|
2006-01-14 19:22:39 +02:00
|
|
|
issuefile = optarg;
|
2005-02-06 03:32:23 +02:00
|
|
|
break;
|
2006-01-14 19:22:39 +02:00
|
|
|
+ case 'i':
|
|
|
|
+ interface_name = strdup(optarg);
|
|
|
|
+ break;
|
2005-02-06 03:32:23 +02:00
|
|
|
case 'l':
|
2006-01-14 19:22:39 +02:00
|
|
|
loginpath = optarg;
|
2005-02-06 03:32:23 +02:00
|
|
|
break;
|
2006-01-14 19:22:39 +02:00
|
|
|
@@ -465,6 +471,13 @@
|
|
|
|
sa.sin_addr = bind_addr;
|
|
|
|
#endif
|
2005-02-06 03:32:23 +02:00
|
|
|
|
2006-01-14 19:22:39 +02:00
|
|
|
+ /* Set it to listen on the specified interface */
|
|
|
|
+ if (interface_name) {
|
|
|
|
+ strncpy(interface.ifr_ifrn.ifrn_name, interface_name, IFNAMSIZ);
|
|
|
|
+ (void)setsockopt(master_fd, SOL_SOCKET,
|
|
|
|
+ SO_BINDTODEVICE, &interface, sizeof(interface));
|
|
|
|
+ }
|
2005-02-06 03:32:23 +02:00
|
|
|
+
|
|
|
|
if (bind(master_fd, (struct sockaddr *) &sa, sizeof(sa)) < 0) {
|
|
|
|
bb_perror_msg_and_die("bind");
|
|
|
|
}
|