svn commit: trunk/busybox: include ipsvd

[vda at busybox.net]

Author: vda
Date: 2007-04-01 12:10:36 -0700 (Sun, 01 Apr 2007)
New Revision: 18297

Log:
udpsvd: next part of ipsvd applets (not working yet)


Modified:
   trunk/busybox/include/applets.h
   trunk/busybox/include/usage.h
   trunk/busybox/ipsvd/Config.in
   trunk/busybox/ipsvd/Kbuild
   trunk/busybox/ipsvd/tcpsvd.c


Changeset:
Modified: trunk/busybox/include/applets.h
===================================================================
--- trunk/busybox/include/applets.h	2007-04-01 10:59:33 UTC (rev 18296)
+++ trunk/busybox/include/applets.h	2007-04-01 19:10:36 UTC (rev 18297)
@@ -311,6 +311,7 @@
 //USE_TUNE2FS(APPLET(tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_APP_UDHCPC(APPLET(udhcpc, _BB_DIR_SBIN, _BB_SUID_NEVER))
 USE_APP_UDHCPD(APPLET(udhcpd, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
+USE_UDPSVD(APPLET(udpsvd, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 USE_UMOUNT(APPLET(umount, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_UNAME(APPLET(uname, _BB_DIR_BIN, _BB_SUID_NEVER))
 USE_UNCOMPRESS(APPLET(uncompress, _BB_DIR_BIN, _BB_SUID_NEVER))

Modified: trunk/busybox/include/usage.h
===================================================================
--- trunk/busybox/include/usage.h	2007-04-01 10:59:33 UTC (rev 18296)
+++ trunk/busybox/include/usage.h	2007-04-01 19:10:36 UTC (rev 18297)
@@ -3348,6 +3348,11 @@
      "\n-E		Do not set up TCP-related environment variables" \
      "\n-v		Verbose"
 
+#define udpsvd_trivial_usage \
+       "TODO"
+#define udpsvd_full_usage \
+       "TODO"
+
 #define tftp_trivial_usage \
        "[OPTION]... HOST [PORT]"
 #define tftp_full_usage \

Modified: trunk/busybox/ipsvd/Config.in
===================================================================
--- trunk/busybox/ipsvd/Config.in	2007-04-01 10:59:33 UTC (rev 18296)
+++ trunk/busybox/ipsvd/Config.in	2007-04-01 19:10:36 UTC (rev 18297)
@@ -9,6 +9,12 @@
 	bool "tcpsvd"
 	default n
 	help
-	  tcpsvd listens on a port and runs a program for each new connection
+	  tcpsvd listens on a tcp port and runs a program for each new connection
 
+config UDPSVD
+	bool "udpsvd"
+	default n
+	help
+	  udpsvd listens on a udp port and runs a program for each new connection
+
 endmenu

Modified: trunk/busybox/ipsvd/Kbuild
===================================================================
--- trunk/busybox/ipsvd/Kbuild	2007-04-01 10:59:33 UTC (rev 18296)
+++ trunk/busybox/ipsvd/Kbuild	2007-04-01 19:10:36 UTC (rev 18297)
@@ -6,3 +6,4 @@
 
 lib-y:=
 lib-$(CONFIG_TCPSVD) += tcpsvd.o ipsvd_perhost.o
+lib-$(CONFIG_UDPSVD) += udpsvd.o

Modified: trunk/busybox/ipsvd/tcpsvd.c
===================================================================
--- trunk/busybox/ipsvd/tcpsvd.c	2007-04-01 10:59:33 UTC (rev 18296)
+++ trunk/busybox/ipsvd/tcpsvd.c	2007-04-01 19:10:36 UTC (rev 18297)
@@ -126,7 +126,6 @@
 	socklen_t sockadr_size;
 	uint16_t local_port = local_port;
 	uint16_t remote_port;
-	unsigned port;
 	char *local_hostname = NULL;
 	char *remote_hostname = (char*)""; /* "" used if no -h */
 	char *local_ip = local_ip;
@@ -221,8 +220,8 @@
 	if (max_per_host)
 		ipsvd_perhost_init(cmax);
 
-	port = bb_lookup_port(argv[1], "tcp", 0);
-	sock = create_and_bind_stream_or_die(argv[0], port);
+	local_port = bb_lookup_port(argv[1], "tcp", 0);
+	sock = create_and_bind_stream_or_die(argv[0], local_port);
 	xlisten(sock, backlog);
 	/* ndelay_off(sock); - it is the default I think? */
 
@@ -238,7 +237,7 @@
 
 	if (verbose) {
 		/* we do it only for ":port" cosmetics... oh well */
-		len_and_sockaddr *lsa = xhost2sockaddr(argv[0], port);
+		len_and_sockaddr *lsa = xhost2sockaddr(argv[0], local_port);
 		char *addr = xmalloc_sockaddr2dotted(&lsa->sa, lsa->len);
 
 		printf("%s: info: listening on %s", applet_name, addr);
@@ -246,7 +245,7 @@
 #ifndef SSLSVD
 		if (option_mask32 & OPT_u)
 			printf(", uid %u, gid %u",
-				(unsigned)ugid.uid, (unsigned)ugid.uid);
+				(unsigned)ugid.uid, (unsigned)ugid.gid);
 #endif
 		puts(", starting");
 	}
@@ -356,7 +355,7 @@
 		sockadr_size = sizeof(sock_adr);
 		if (getsockopt(conn, SOL_IP, SO_ORIGINAL_DST, &sock_adr.sa, &sockadr_size) == 0) {
 			char *ip = xmalloc_sockaddr2dotted_noport(&sock_adr.sa, sockadr_size);
-			port = get_nport(&sock_adr.sa);
+			unsigned port = get_nport(&sock_adr.sa);
 			port = ntohs(port);
 			xsetenv("TCPORIGDSTIP", ip);
 			xsetenv("TCPORIGDSTPORT", utoa(port));