Changeset 3295

Timestamp:

07/20/07 13:49:20 (1 year ago)

Author:

tg

Message:

refresh netmsg patch, integrate my diff, use strlcpy, simplify

Files:

• trunk/freewrt/package/busybox/patches/300-netmsg.patch (modified) (5 diffs)
• trunk/freewrt/package/busybox/patches/980-crontab-use-editor.patch (moved) (moved from trunk/freewrt/package/busybox/patches/980-expected-behaviour.patch) (2 diffs)

trunk/freewrt/package/busybox/patches/300-netmsg.patch

@@ -1 @@
-
-1.orig/include/applets.h       2007-01-24 22:34:48.000000000 +0100
-1/include/applets.h    2007-02-05 13:11:49.000000000 +0100
-
+
+2.orig/include/applets.h       Sun Mar 18 16:59:11 2007
+2/include/applets.h    Fri Jul 20 11:39:04 2007
+ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_
- USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
@@ -10 +10 @@
- USE_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_NEVER))
- USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
- lib-$(CONFIG_IPTUNNEL)     += iptunnel.o
- lib-$(CONFIG_NAMEIF)       += nameif.o
@@ -46 +20 @@
- lib-$(CONFIG_NSLOOKUP)     += nslookup.o
- lib-$(CONFIG_PING)         += ping.o
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-+/*
-+ * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org>
++ * Copyright (c) 2007 Thorsten Glaser <tg@mirbsd.org>
-+ *
-s
+c
-+ */
++
-+#include <sys/types.h>
-+#include <sys/socket.h>
@@ -64 +54 @@
-+#include "busybox.h"
-+
-+
-+#ifndef CONFIG_NETMSG
-+int main(int argc, char **argv)
@@ -71 +60 @@
-+#endif
-+{
-
+, optval = -1, rv = 1
-+       struct sockaddr_in addr;
-+       int optval = 1;
-+       unsigned char buf[1001];
-+
-+       if (argc != 3) {
-+               fprintf(stderr, "usage: %s <ip> \"<message>\"\n", argv[0]);
-exit
+return 
-+       }
-+
-+       if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-+               perror("Opening socket");
-exit
+return 
-+       }
-+
-
+ 
-+       addr.sin_family = AF_INET;
-+       addr.sin_addr.s_addr = inet_addr(argv[1]);
-+       addr.sin_port = htons(0x1337);
-+
-
-
-
+
+
-+
-
+
+
+
+
-+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-+       }
++       rv = 0;
-+
-
-
-
-
-
-
-
-
+
-+       close(s);
-exit(1
+return (rv
-+}

trunk/freewrt/package/busybox/patches/980-crontab-use-editor.patch

@@ -1 @@
-
-
+
+
+
-@@ -297,6 +297,8 @@ static void EditFile(const char *user, c
-                        exit(0);
@@ -10 +11 @@
- 
-                snprintf(visual, sizeof(visual), "%s %s", ptr, file);
---- busybox-1.4.2/networking/netmsg.c.orig      Wed Jun  6 15:28:44 2007
-+++ busybox-1.4.2/networking/netmsg.c   Fri Jun  8 13:12:08 2007
-@@ -34,6 +34,8 @@ int netmsg_main(int argc, char **argv)
-                exit(1);
-        }
- 
-+       while (strlen(argv[2]) > 0) {
-+
-        memset(&addr, 0, sizeof(addr));
-        addr.sin_family = AF_INET;
-        addr.sin_addr.s_addr = inet_addr(argv[1]);
-@@ -44,6 +46,7 @@ int netmsg_main(int argc, char **argv)
-        buf[1] = 0xad;
- 
-        strncpy(buf + 2, argv[2], 998);
-+       argv[2] += strlen(buf + 2);
- 
-        if (setsockopt (s, SOL_SOCKET, SO_BROADCAST, (caddr_t) &optval, sizeof (optval)) < 0) {
-                perror("setsockopt()");
-@@ -53,6 +56,8 @@ int netmsg_main(int argc, char **argv)
-        if (sendto(s, buf, 1001, 0, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-                perror("sendto()");
-                goto fail;
-+       }
-+
-        }
- 
-        return 0;