From f204ca87f035d973ad92f1b6ecfe0b179227c6b9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Wed, 6 Aug 2014 11:56:45 +0200 Subject: [PATCH] Update routing repo to 14.07 This gets us an up-to-date alfred (and batman-adv 2014.x, as soon as we start to support it). --- modules | 3 +- ...tch => 0001-alfred-adjust-intervals.patch} | 13 ++--- .../0001-alfred-fix-socket-fd-leak.patch | 49 ------------------- 3 files changed, 9 insertions(+), 56 deletions(-) rename patches/packages/routing/{0002-alfred-adjust-intervals.patch => 0001-alfred-adjust-intervals.patch} (61%) delete mode 100644 patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch diff --git a/modules b/modules index b5eb93a8..5a946024 100644 --- a/modules +++ b/modules @@ -11,7 +11,8 @@ PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git PACKAGES_GLUON_COMMIT=1628f219607339492b00fb921757ac8716d1358b PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git -PACKAGES_ROUTING_COMMIT=0e4201a983df967e88e6ce5451f5f5f99bab2370 +PACKAGES_ROUTING_COMMIT=9d3c311fdd7dc15fd5e333b55c259fc2cf661ea2 +PACKAGES_ROUTING_BRANCH=for-14.07 PACKAGES_LUCI_REPO=git://github.com/freifunk-gluon/luci.git PACKAGES_LUCI_COMMIT=bed710786d8a3a63f5908823e6382a51efc91003 diff --git a/patches/packages/routing/0002-alfred-adjust-intervals.patch b/patches/packages/routing/0001-alfred-adjust-intervals.patch similarity index 61% rename from patches/packages/routing/0002-alfred-adjust-intervals.patch rename to patches/packages/routing/0001-alfred-adjust-intervals.patch index b3bce5a6..707dd68c 100644 --- a/patches/packages/routing/0002-alfred-adjust-intervals.patch +++ b/patches/packages/routing/0001-alfred-adjust-intervals.patch @@ -1,21 +1,22 @@ From: Matthias Schiffer -Date: Sat, 18 Jan 2014 21:52:09 +0100 +Date: Sat, 26 Jul 2014 18:58:22 +0200 Subject: alfred: adjust intervals -diff --git a/alfred/patches/0003-alfred-adjust-intervals.patch b/alfred/patches/0003-alfred-adjust-intervals.patch +diff --git a/alfred/patches/0001-alfred-adjust-intervals.patch b/alfred/patches/0001-alfred-adjust-intervals.patch new file mode 100644 -index 0000000..eb31f91 +index 0000000..e8ffd3a --- /dev/null -+++ b/alfred/patches/0003-alfred-adjust-intervals.patch -@@ -0,0 +1,14 @@ ++++ b/alfred/patches/0001-alfred-adjust-intervals.patch +@@ -0,0 +1,15 @@ +--- a/alfred.h ++++ b/alfred.h -+@@ -30,9 +30,9 @@ ++@@ -30,10 +30,10 @@ + #include "list.h" + #include "packet.h" + +-#define ALFRED_INTERVAL 10 ++#define ALFRED_INTERVAL 60 ++ #define ALFRED_IF_CHECK_INTERVAL 60 + #define ALFRED_REQUEST_TIMEOUT 10 +-#define ALFRED_SERVER_TIMEOUT 60 ++#define ALFRED_SERVER_TIMEOUT 180 diff --git a/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch b/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch deleted file mode 100644 index 971d2146..00000000 --- a/patches/packages/routing/0001-alfred-fix-socket-fd-leak.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Matthias Schiffer -Date: Sat, 18 Jan 2014 21:15:16 +0100 -Subject: alfred: fix socket fd leak - -diff --git a/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch b/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch -new file mode 100644 -index 0000000..2374e25 ---- /dev/null -+++ b/alfred/patches/0002-batadv-vis-don-t-leak-socket-fd-in-get_if_mac.patch -@@ -0,0 +1,39 @@ -+From 449b94ee85a42fbabec550d920002ad07738e733 Mon Sep 17 00:00:00 2001 -+Message-Id: <449b94ee85a42fbabec550d920002ad07738e733.1390075976.git.mschiffer@universe-factory.net> -+From: Matthias Schiffer -+Date: Sat, 18 Jan 2014 21:04:05 +0100 -+Subject: [PATCH] batadv-vis: don't leak socket fd in get_if_mac() -+ -+Leaking an fd every time get_if_mac() is called causes a batadv-vis server -+process to hit the open file limit in a matter of hours when there are many -+active interfaces and the limit is as low as 1024 (which it is on OpenWRT). -+ -+Reported-by: Jan-Philipp Litza -+Signed-off-by: Matthias Schiffer -+--- -+ vis/vis.c | 7 ++++++- -+ 1 file changed, 6 insertions(+), 1 deletion(-) -+ -+--- a/vis/vis.c -++++ b/vis/vis.c -+@@ -97,6 +97,7 @@ static int get_if_mac(char *ifname, uint -+ { -+ struct ifreq ifr; -+ int sock; -++ int ret; -+ -+ strncpy(ifr.ifr_name, ifname, IFNAMSIZ); -+ -+@@ -105,7 +106,11 @@ static int get_if_mac(char *ifname, uint -+ return -1; -+ } -+ -+- if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { -++ ret = ioctl(sock, SIOCGIFHWADDR, &ifr); -++ -++ close(sock); -++ -++ if (ret == -1) { -+ fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); -+ return -1; -+ }