mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-13 18:34:53 +00:00
06fa1c46fc
The following patches were removed:
010-networking-fix-uninitialized-memory-when-displaying-.patch
https://git.busybox.net/busybox/commit/?id=f2c043acfcf9dad9fd3d65821b81f89986bbe54e
030-ip-fix-problem-on-mips64-n64-big-endian-musl-systems.patch
https://git.busybox.net/busybox/commit/?id=4ab372d49a6e82b0bf097dedb96d26330c5f2d5f
204-udhcpc_src_ip_rebind.patch
https://git.busybox.net/busybox/commit/?id=abe8f7515aded80889d78c2c1c8947997918cf90
230-ntpd_delayed_resolve.patch
https://git.busybox.net/busybox/commit/?id=c8641962e4cbde48108ddfc1c105e3320778190d
https://git.busybox.net/busybox/commit/?id=e4caf1dd9ce8569371a0eeb77ccf02a572dc0f11
260-arping_missing_includes.patch
Not needed any more, still builds with musl for me.
Add in 92fd6e6f1a "busybox: fix arping applet building on musl"
The Kconfig files were updated with these commands:
cd config
../convert_menuconfig.pl .../build_dir/target-*/busybox-1.25.0
cd ..
./convert_defaults.pl < .../build_dir/target-*/busybox-1.25.0/.config > Config-defaults.in
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
104 lines
2.5 KiB
Diff
104 lines
2.5 KiB
Diff
--- a/include/applets.src.h
|
|
+++ b/include/applets.src.h
|
|
@@ -229,6 +229,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
|
|
@@ -639,6 +639,12 @@ config FEATURE_IPCALC_LONG_OPTIONS
|
|
help
|
|
Support long options for the ipcalc applet.
|
|
|
|
+config NETMSG
|
|
+ bool "netmsg"
|
|
+ default n
|
|
+ help
|
|
+ simple program for sending udp broadcast messages
|
|
+
|
|
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 <nbd@nbd.name>
|
|
+ *
|
|
+ * This is free software, licensed under the GNU General Public License v2.
|
|
+ */
|
|
+#include <sys/types.h>
|
|
+#include <sys/socket.h>
|
|
+#include <netinet/in.h>
|
|
+#include <netdb.h>
|
|
+#include <stdio.h>
|
|
+#include <stdlib.h>
|
|
+#include <string.h>
|
|
+#include "busybox.h"
|
|
+
|
|
+//usage:#define netmsg_trivial_usage NOUSAGE_STR
|
|
+//usage:#define netmsg_full_usage ""
|
|
+
|
|
+#ifndef CONFIG_NETMSG
|
|
+int main(int argc, char **argv)
|
|
+#else
|
|
+int netmsg_main(int argc, char **argv)
|
|
+#endif
|
|
+{
|
|
+ int s;
|
|
+ struct sockaddr_in addr;
|
|
+ int optval = 1;
|
|
+ unsigned char buf[1001];
|
|
+
|
|
+ if (argc != 3) {
|
|
+ fprintf(stderr, "usage: %s <ip> \"<message>\"\n", argv[0]);
|
|
+ exit(1);
|
|
+ }
|
|
+
|
|
+ if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
|
|
+ perror("Opening socket");
|
|
+ exit(1);
|
|
+ }
|
|
+
|
|
+ memset(&addr, 0, sizeof(addr));
|
|
+ addr.sin_family = AF_INET;
|
|
+ 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[2], 998);
|
|
+
|
|
+ if (setsockopt (s, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval, sizeof (optval)) < 0) {
|
|
+ perror("setsockopt()");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ if (sendto(s, buf, 1001, 0, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
|
|
+ perror("sendto()");
|
|
+ goto fail;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+
|
|
+fail:
|
|
+ close(s);
|
|
+ exit(1);
|
|
+}
|