X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1eaf166d838a51242e1ef93cd806896dc37f30f2..77ec3b2de9bb1880b258ec6aaf4949f146f6fd8d:/package/busybox/patches/300-netmsg.patch?ds=inline diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch index ac1a0aaaa..e8b2513eb 100644 --- a/package/busybox/patches/300-netmsg.patch +++ b/package/busybox/patches/300-netmsg.patch @@ -1,47 +1,46 @@ -diff -urN busybox.old/include/applets.h busybox.dev/include/applets.h ---- busybox.old/include/applets.h 2006-01-11 01:32:47.302791000 +0100 -+++ busybox.dev/include/applets.h 2006-01-11 01:33:18.744756250 +0100 -@@ -475,6 +475,9 @@ - #ifdef CONFIG_NC - APPLET(nc, nc_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) - #endif -+#ifdef CONFIG_NETMSG -+ APPLET_NOUSAGE("netmsg", netmsg_main, _BB_DIR_BIN, _BB_SUID_ALWAYS) -+#endif - #ifdef CONFIG_NETSTAT - APPLET(netstat, netstat_main, _BB_DIR_BIN, _BB_SUID_NEVER) - #endif -diff -urN busybox.old/networking/Config.in busybox.dev/networking/Config.in ---- busybox.old/networking/Config.in 2005-11-01 00:55:15.000000000 +0100 -+++ busybox.dev/networking/Config.in 2006-01-11 01:33:18.744756250 +0100 -@@ -435,6 +435,12 @@ +--- a/include/applets.src.h ++++ b/include/applets.src.h +@@ -266,6 +266,7 @@ IF_MT(APPLET(mt, BB_DIR_BIN, BB_SUID_DRO + IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP)) + IF_NAMEIF(APPLET(nameif, BB_DIR_SBIN, BB_SUID_DROP)) + IF_NC(APPLET(nc, BB_DIR_USR_BIN, BB_SUID_DROP)) ++IF_NETMSG(APPLET(netmsg, BB_DIR_BIN, BB_SUID_REQUIRE)) + IF_NETSTAT(APPLET(netstat, BB_DIR_BIN, BB_SUID_DROP)) + IF_NICE(APPLET(nice, BB_DIR_BIN, BB_SUID_DROP)) + IF_NOHUP(APPLET(nohup, BB_DIR_USR_BIN, BB_SUID_DROP)) +--- a/networking/Config.src ++++ b/networking/Config.src +@@ -612,6 +612,12 @@ config FEATURE_IPCALC_LONG_OPTIONS help - A simple Unix utility which reads and writes data across network - connections. -+ -+config CONFIG_NETMSG + Support long options for the ipcalc applet. + ++config NETMSG + bool "netmsg" + default n + help + simple program for sending udp broadcast messages - - config CONFIG_NC_GAPING_SECURITY_HOLE - bool "gaping security hole" -diff -urN busybox.old/networking/Makefile.in busybox.dev/networking/Makefile.in ---- busybox.old/networking/Makefile.in 2005-11-01 00:55:15.000000000 +0100 -+++ busybox.dev/networking/Makefile.in 2006-01-11 01:34:02.939518250 +0100 -@@ -28,6 +28,7 @@ - NETWORKING-$(CONFIG_IPTUNNEL) += iptunnel.o - NETWORKING-$(CONFIG_NAMEIF) += nameif.o - NETWORKING-$(CONFIG_NC) += nc.o -+NETWORKING-$(CONFIG_NETMSG) += netmsg.o - NETWORKING-$(CONFIG_NETSTAT) += netstat.o - NETWORKING-$(CONFIG_NSLOOKUP) += nslookup.o - NETWORKING-$(CONFIG_PING) += ping.o -diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c ---- busybox.old/networking/netmsg.c 1970-01-01 01:00:00.000000000 +0100 -+++ busybox.dev/networking/netmsg.c 2006-01-11 01:33:18.748756500 +0100 -@@ -0,0 +1,58 @@ ++ + config NETSTAT + bool "netstat" + default y +--- a/networking/Kbuild.src ++++ b/networking/Kbuild.src +@@ -27,6 +27,7 @@ lib-$(CONFIG_IP) += ip.o + lib-$(CONFIG_IPCALC) += ipcalc.o + lib-$(CONFIG_NAMEIF) += nameif.o + lib-$(CONFIG_NC) += nc.o ++lib-$(CONFIG_NETMSG) += netmsg.o + lib-$(CONFIG_NETSTAT) += netstat.o + lib-$(CONFIG_NSLOOKUP) += nslookup.o + lib-$(CONFIG_NTPD) += ntpd.o +--- /dev/null ++++ b/networking/netmsg.c +@@ -0,0 +1,65 @@ ++/* ++ * Copyright (C) 2006 Felix Fietkau ++ * ++ * This is free software, licensed under the GNU General Public License v2. ++ */ +#include +#include +#include @@ -51,6 +50,8 @@ diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c +#include +#include "busybox.h" + ++//usage:#define netmsg_trivial_usage NOUSAGE_STR ++//usage:#define netmsg_full_usage "" + +#ifndef CONFIG_NETMSG +int main(int argc, char **argv) @@ -58,13 +59,13 @@ diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c +int netmsg_main(int argc, char **argv) +#endif +{ -+ int s, i; ++ int s; + struct sockaddr_in addr; + int optval = 1; + unsigned char buf[1001]; + -+ if (argc != 2) { -+ fprintf(stderr, "usage: %s \"message\"\n", argv[0]); ++ if (argc != 3) { ++ fprintf(stderr, "usage: %s \"\"\n", argv[0]); + exit(1); + } + @@ -75,14 +76,14 @@ diff -urN busybox.old/networking/netmsg.c busybox.dev/networking/netmsg.c + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; -+ addr.sin_addr.s_addr = htonl(0xffffffff); ++ addr.sin_addr.s_addr = inet_addr(argv[1]); + addr.sin_port = htons(0x1337); + + memset(buf, 0, 1001); + buf[0] = 0xde; + buf[1] = 0xad; + -+ strncpy(buf + 2, argv[1], 998); ++ strncpy(buf + 2, argv[2], 998); + + if (setsockopt (s, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval, sizeof (optval)) < 0) { + perror("setsockopt()");