Re: [OpenWrt-Devel] [Babel-users] [PATCH] babeld: use procd to start, stop, and respawn
On Mon, Sep 08, 2014 at 10:54:29AM -0700, Dave Taht wrote: On Mon, Sep 8, 2014 at 6:10 AM, Baptiste Jonglez bjong...@illyse.org wrote: Additionally adds a patch to the babeld source is to prevent the attempted recreation of a pidfile when babeld restarts uncleanly. This is also possible to do by passing -I '' on the command line, however procd interprets an empty argument terminating the list, and thus cannot supply empty arguments to programs it manages. Patching babeld itself is a workaround. Why not tackle the root issue? It seems that you encountered crashes in babeld, so that should be fixed, instead of working around the crashes. I did experience a few babeld crashes myself, but never managed to find where they came from. There lies the rub. If you have a deployed machine on a rooftop somewhere, it is better to restart the daemon automagically and log the action rather than attempt to debug it. Using procd to manage this stuff reduces the probability of a babel failure taking out a node by several orders of magnitude, and I strongly favor managing it this way. Certainly finding and fixing bugs so that it doesn't ever crash is a good option, but in the real world, nothing is perfect, and defense in depth is needed. However, there is an elephant in the room here: procd interprets an empty argument terminating the list, and thus cannot supply empty arguments to programs it manages. Isn't there a way to fix *that* bug (or rather limitation) at least? Best, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Polipo not pre-compiled in Barrier Breaker rc2?
[Cc: openwrt-devel] On Tue, Jul 29, 2014 at 07:32:47PM +0100, David Bonnes wrote: On 29 July 2014 17:22, Juliusz Chroboczek j...@pps.univ-paris-diderot.fr wrote: I was unable to test [polipo] on BB rc1 because it is not in the list of pre-compiled packages! Yes it is. Did you forget to run opkg update? Hmmm, I get a good result with the latest snapshot (r41846), but both RC1 or RC2 (RC2 was released today)!! Polipo has been migrated to the new (github-based, community-maintained) package feed: https://github.com/openwrt/packages But that feed should be enabled by default in BB. Could an openwrt maintainer shed some light on why polipo does not seem to appear in the pre-compiled packages for BB rc2? Many thanks, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Polipo not pre-compiled in Barrier Breaker rc2?
David, On Wed, Jul 30, 2014 at 10:56:41AM +0100, Gabriel Kerneis wrote: [Cc: openwrt-devel] On Tue, Jul 29, 2014 at 07:32:47PM +0100, David Bonnes wrote: On 29 July 2014 17:22, Juliusz Chroboczek j...@pps.univ-paris-diderot.fr wrote: I was unable to test [polipo] on BB rc1 because it is not in the list of pre-compiled packages! Yes it is. Did you forget to run opkg update? Hmmm, I get a good result with the latest snapshot (r41846), but both RC1 or RC2 (RC2 was released today)!! Polipo has been migrated to the new (github-based, community-maintained) package feed: https://github.com/openwrt/packages But that feed should be enabled by default in BB. Could an openwrt maintainer shed some light on why polipo does not seem to appear in the pre-compiled packages for BB rc2? It looks like you have been a bit to eager to try the RC2 build and report this issue :-) Please bear with us for a while longer, RC2 is not yet announced because the feeds are still building. We will do an announcement on the mailing list and in the news forum / openwrt.org frontpage when its done which should be today hopefully. https://forum.openwrt.org/viewtopic.php?pid=242127#p242127 So hopefully everything should be okay in a little while. Sorry for the noise, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] ndppd: new upstream release 0.2.3
Hi,
Here is a patch to upgrade ndppd to the latest upstream release in Openwrt.
Could you please apply it (or give me commit rights to the ndppd package
since I am maintaining it anyway)?
Many thanks,
Gabriel
Also update maintainer email address and cherry-pick commit 00da8bf to prevent
daemonizing before reading the configuration file.
---
ipv6/ndppd/Makefile|8 +--
...001-Fix-issue-2-ndppd-d-monizes-too-early.patch | 53
2 files changed, 57 insertions(+), 4 deletions(-)
create mode 100644
ipv6/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile
index b7c3282..40a5b68 100644
--- a/ipv6/ndppd/Makefile
+++ b/ipv6/ndppd/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ndppd
-PKG_VERSION:=0.2.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.2.3
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
# Latest release
PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/
-PKG_MD5SUM:=d90c4b65777a62274c1837dba341e5a8
+PKG_MD5SUM:=d6f3243bb7fc04c8085371c9acddc50e
# Development snapshot
#PKG_SOURCE_URL=git://github.com/Tuhox/ndppd.git
@@ -30,7 +30,7 @@ define Package/ndppd
CATEGORY:=Network
TITLE:=NDP Proxy Daemon
URL:=http://www.priv.nu/projects/ndppd/
- MAINTAINER:=Gabriel Kerneis kern...@pps.jussieu.fr
+ MAINTAINER:=Gabriel Kerneis kern...@pps.univ-paris-diderot.fr
DEPENDS:=+kmod-ipv6 $(CXX_DEPENDS)
endef
diff --git
a/ipv6/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
b/ipv6/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
new file mode 100644
index 000..dad23f5
--- /dev/null
+++ b/ipv6/ndppd/patches/0001-Fix-issue-2-ndppd-d-monizes-too-early.patch
@@ -0,0 +1,53 @@
+From 00da8bf7bab88a3827af4110fb27df9cde542e32 Mon Sep 17 00:00:00 2001
+From: Daniel Adolfsson dan...@priv.nu
+Date: Tue, 12 Feb 2013 13:25:22 +0100
+Subject: [PATCH] =?UTF-8?q?Fix=20issue=20#2=20-=20ndppd=20d=C3=A6monizes=20t?=
+ =?UTF-8?q?oo=20early?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/ndppd.cc | 18 --
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/src/ndppd.cc b/src/ndppd.cc
+index 6ac19e8..20ced6f 100644
+--- a/src/ndppd.cc
b/src/ndppd.cc
+@@ -201,15 +201,6 @@ int main(int argc, char* argv[], char* env[])
+ }
+ }
+
+-if (daemon) {
+-logger::syslog(true);
+-
+-if (daemonize() 0) {
+-logger::error() Failed to daemonize process;
+-return 1;
+-}
+-}
+-
+ if (!pidfile.empty()) {
+ std::ofstream pf;
+ pf.open(pidfile.c_str(), std::ios::out | std::ios::trunc);
+@@ -225,8 +216,15 @@ int main(int argc, char* argv[], char* env[])
+
+ if (!configure(config_path))
+ return -1;
++
++if (daemon) {
++logger::syslog(true);
+
+-//route::load(/proc/net/ipv6_route);
++if (daemonize() 0) {
++logger::error() Failed to daemonize process;
++return 1;
++}
++}
+
+ // Time stuff.
+
+--
+1.7.10.4
+
--
1.7.10.4
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] tcpdump: new upstream release 4.2.1
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
net/tcpdump/Makefile |6 +-
net/tcpdump/patches/001-remove_pcap_debug.patch|2 +-
.../patches/002-remove_static_libpcap_check.patch | 15 +-
net/tcpdump/patches/004-fix_3g_iface.patch |4 +-
net/tcpdump/patches/100-tcpdump_mini.patch | 662 ++--
5 files changed, 336 insertions(+), 353 deletions(-)
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index ec6703b..0e76c58 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -8,15 +8,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=tcpdump
-PKG_VERSION:=4.1.1
-PKG_RELEASE:=2
+PKG_VERSION:=4.2.1
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tcpdump.org/release/ \
http://ftp.gwdg.de/pub/misc/tcpdump/ \
http://www.at.tcpdump.org/ \
http://www.br.tcpdump.org/
-PKG_MD5SUM:=d0dd58bbd6cd36795e05c6f1f74420b0
+PKG_MD5SUM:=c202878c6db054767b52651041b9e60e
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/net/tcpdump/patches/001-remove_pcap_debug.patch
b/net/tcpdump/patches/001-remove_pcap_debug.patch
index b67c434..14d1b84 100644
--- a/net/tcpdump/patches/001-remove_pcap_debug.patch
+++ b/net/tcpdump/patches/001-remove_pcap_debug.patch
@@ -1,6 +1,6 @@
--- a/tcpdump.c
+++ b/tcpdump.c
-@@ -901,20 +901,6 @@ main(int argc, char **argv)
+@@ -982,20 +982,6 @@ main(int argc, char **argv)
error(invalid data link type %s,
gndo-ndo_dltname);
break;
diff --git a/net/tcpdump/patches/002-remove_static_libpcap_check.patch
b/net/tcpdump/patches/002-remove_static_libpcap_check.patch
index 0bffaab..8ab54aa 100644
--- a/net/tcpdump/patches/002-remove_static_libpcap_check.patch
+++ b/net/tcpdump/patches/002-remove_static_libpcap_check.patch
@@ -1,6 +1,6 @@
--- a/configure
+++ b/configure
-@@ -9440,28 +9440,6 @@ echo ${ECHO_T}Using $pfopen 6; }
+@@ -7130,28 +7130,6 @@ echo ${ECHO_T}Using $pfopen 6; }
LIBS=$LIBS $pfopen
fi
fi
@@ -29,10 +29,15 @@
#
# Look for pcap-config.
#
-@@ -9580,40 +9558,6 @@ fi
- echo $as_me: error: see the INSTALL doc for more info 2;}
-{ (exit 1); exit 1; }; }
- fi
+@@ -7335,45 +7313,6 @@ if test $ac_cv_lib_pcap_main = yes; then
+ libpcap=-lpcap
+ fi
+
+- if test $libpcap = FAIL ; then
+- { { echo $as_me:$LINENO: error: see the INSTALL doc for
more info 5
+-echo $as_me: error: see the INSTALL doc for more info 2;}
+- { (exit 1); exit 1; }; }
+- fi
-
{ echo $as_me:$LINENO: checking for extraneous pcap header directories 5
-echo $ECHO_N checking for extraneous pcap header directories... $ECHO_C
6; }
- if test \( ! -r /usr/local/include/pcap.h \) -a \
diff --git a/net/tcpdump/patches/004-fix_3g_iface.patch
b/net/tcpdump/patches/004-fix_3g_iface.patch
index cd10184..35d105f 100644
--- a/net/tcpdump/patches/004-fix_3g_iface.patch
+++ b/net/tcpdump/patches/004-fix_3g_iface.patch
@@ -8,7 +8,7 @@
#ifndef WIN32
#include sys/wait.h
#include sys/resource.h
-@@ -566,6 +567,7 @@ main(int argc, char **argv)
+@@ -625,6 +626,7 @@ main(int argc, char **argv)
#ifdef HAVE_PCAP_FINDALLDEVS
pcap_if_t *devpointer;
int devnum;
@@ -16,7 +16,7 @@
#endif
int status;
#ifdef WIN32
-@@ -708,7 +710,8 @@ main(int argc, char **argv)
+@@ -775,7 +777,8 @@ main(int argc, char **argv)
* It can be useful on Windows, where more than
* one interface can have the same name.
*/
diff --git a/net/tcpdump/patches/100-tcpdump_mini.patch
b/net/tcpdump/patches/100-tcpdump_mini.patch
index 6d4403e..d9537c4 100644
--- a/net/tcpdump/patches/100-tcpdump_mini.patch
+++ b/net/tcpdump/patches/100-tcpdump_mini.patch
@@ -1,58 +1,29 @@
--- a/Makefile.in
+++ b/Makefile.in
-@@ -68,34 +68,38 @@ RANLIB = @RANLIB@
+@@ -68,6 +68,22 @@ RANLIB = @RANLIB@
+ @rm -f $@
+ $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
- CSRC =addrtoname.c af.c checksum.c cpack.c gmpls.c oui.c gmt2local.c
ipproto.c \
- nlpid.c l2vpn.c machdep.c parsenfsfh.c \
-- print-802_11.c print-ap1394.c print-ah.c print-arcnet.c \
-- print-aodv.c print-arp.c print-ascii.c print-atalk.c print-atm.c \
-- print-beep.c print-bfd.c print-bgp.c print-bootp.c print-bt.c \
-- print-cdp.c print-cfm.c print-chdlc.c print-cip.c print-cnfp.c \
-- print-dccp.c print-decnet.c \
-- print-domain.c
[OpenWrt-Devel] [PATCH] [packages] ndppd: initial import (release 0.2.1)
Hi,
here is a patch to add a package for ndppd:
ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery
Protocol) messages between interfaces. ndppd currently only supports
Neighbor Solicitation Messages and Neighbor Advertisement Messages.
The ndp_proxy provided by Linux doesn't support listing proxies, and only
hosts are supported. No subnets. ndppd solves this by listening for
Neighbor Solicitation messages on an interface, then query the internal
interfaces for that target IP before finally sending a Neighbor
Advertisement message.
http://www.priv.nu/projects/ndppd/
I tested it and it works fine. I am willing to maintain it.
Note that this my first C++ package and it took a lot of trial and error to get
the Build/Compile target working. Any feedback would be much welcome.
Best regard,
--
Gabriel
From 689b4a52af2e25e3574d0dca7cc5e63ed100c50a Mon Sep 17 00:00:00 2001
From: Gabriel Kerneis kern...@pps.jussieu.fr
Date: Fri, 27 Jan 2012 15:35:14 +0100
Subject: [PATCH] [packages] ndppd: initial import (release 0.2.1)
---
ipv6/ndppd/Makefile | 62 +++
ipv6/ndppd/files/ndppd.init | 16 +++
2 files changed, 78 insertions(+), 0 deletions(-)
create mode 100644 ipv6/ndppd/Makefile
create mode 100644 ipv6/ndppd/files/ndppd.init
diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile
new file mode 100644
index 000..08ccc76
--- /dev/null
+++ b/ipv6/ndppd/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2007-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ndppd
+PKG_VERSION:=0.2.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/
+PKG_MD5SUM:=9b65a8cccfce8689f0c1c410c20b4790
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ndppd
+ SECTION:=ipv6
+ CATEGORY:=IPv6
+ TITLE:=NDP Proxy Daemon
+ URL:=http://www.priv.nu/projects/ndppd/
+ MAINTAINER:=Gabriel Kerneis kern...@pps.jussieu.fr
+ DEPENDS:=+kmod-ipv6 +confuse +uclibcxx
+endef
+
+define Package/ndppd/description
+ ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery
+ Protocol) messages between interfaces. ndppd currently only supports Neighbor
+ Solicitation Messages and Neighbor Advertisement Messages.
+
+ The ndp_proxy provided by Linux doesn't support listing proxies, and only hosts
+ are supported. No subnets. ndppd solves this by listening for Neighbor
+ Solicitation messages on an interface, then query the internal interfaces for
+ that target IP before finally sending a Neighbor Advertisement message.
+endef
+
+define Package/ndppd/conffiles
+/etc/ndppd.conf
+endef
+
+define Build/Compile
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ CXX=$(TARGET_CXX) \
+ CXXFLAGS=$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) -fno-builtin -fno-rtti -nostdinc++ \
+ -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include \
+ LDFLAGS=$(TARGET_LDFLAGS) \
+ LIBS=-nodefaultlibs -luClibc++ -lconfuse \
+ ndppd
+endef
+
+define Package/ndppd/install
+ $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndppd $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/etc/init.d
+ $(INSTALL_BIN) ./files/ndppd.init $(1)/etc/init.d/ndppd
+ $(INSTALL_CONF) $(PKG_BUILD_DIR)/ndppd.conf-dist $(1)/etc/ndppd.conf
+endef
+
+$(eval $(call BuildPackage,ndppd))
diff --git a/ipv6/ndppd/files/ndppd.init b/ipv6/ndppd/files/ndppd.init
new file mode 100644
index 000..4cf0e8a
--- /dev/null
+++ b/ipv6/ndppd/files/ndppd.init
@@ -0,0 +1,16 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2007-2011 OpenWrt.org
+
+START=90
+
+SERVICE_USE_PID=1
+SERVICE_PID_FILE=/var/run/ndppd.pid
+
+start() {
+ mkdir -p /var/run
+ service_start /usr/sbin/ndppd -p $SERVICE_PID_FILE -d
+}
+
+stop() {
+ service_stop /usr/sbin/ndppd
+}
--
1.7.8.3
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [Babel-users] AHCPD in openwrt (currently broken for multiple interface)
Dave, On Wed, Jun 22, 2011 at 09:54:16AM -0600, Dave Taht wrote: The head of openwrt and the related luci gui currently are not configuring ahcpd correctly in the presence of *multiple* client interfaces. This is a known issue, sadly unresolved because of me lacking time to work on it. I plan to have this fixed by next August. If people on this list can come up with a patch before that, I'd be glad to review it. (By the way, the babeld package needs a cleanup too, but at least it is not broken.) Best regards, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] IPv6 dependency
On Sat, Dec 04, 2010 at 04:18:36AM +0100, Jo-Philipp Wich wrote: As far as I can tell, selecting Enable IPv6 support in packages does not automatically select the kernel module kmod-ipv6. Should it? Could it? No and no. Doing that would force everybody who wants to ship IPv6 read packages to include kmod-ipv6 in the images. Why? Couldn't kmod-ipv6 be built as an (ipkg) module, thus not included by default in the images, but producing IPv6-ready images. (I am not a kernel guru so I might be wrong here.) It could at least be mentioned as a comment/warning when selecting IPv6 support. Otherwise, it is far too easy to forget kmod-ipv6, build and flash a kernel without it, then figure out kmod-ipv6 is missing, build it as a module and... fail to install it since the kernel is missing IPv6-related symbols. Then it is of course too late and you have to reflash with a new kernel to be able to install kmod-ipv6.ipkg. I guess a lot of people might be bitten by this issue (I have been in the past, and it took me some time to understand what was going on --- and I found bug reports of other people with the same problem). Best regards, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add support for darcs-based feeds
The following patch adds support for darcs-based feeds.
It is tested and works well for my purpose. I wish it
were committed upstream so that I can share my feed with
other users without converting it to svn/git/whatever.
Best regards,
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
scripts/feeds |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/scripts/feeds b/scripts/feeds
index 43c5c6d..be92f6e 100755
--- a/scripts/feeds
+++ b/scripts/feeds
@@ -123,7 +123,11 @@ my %update_method = (
'src-hg' = {
'init' = hg clone '%s' '%s',
'update'= hg pull --update,
- 'controldir'= .hg}
+ 'controldir'= .hg},
+ 'src-darcs' = {
+ 'init'= darcs get '%s' '%s',
+ 'update' = darcs pull -a,
+ 'controldir' = _darcs},
);
# src-git: pull broken
@@ -278,6 +282,7 @@ my %install_method = (
'src-git' = \install_generic,
'src-bzr' = \install_generic,
'src-hg' = \install_generic,
+ 'src-darcs' = \install_generic,
);
my %feed;
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Add support for darcs repositories
Hi, This patch adds support for darcs repositories (as sources of packages). It does *not* add support for darcs:// URI scheme because such a scheme do not exist (AFAIK). You must therefore manually set PKG_SOURCE_PROTO to darcs in your Makefile (and use a regular http:// URI). You also have to set PKG_SOURCE_VERSION to a string matching a tag contained in the repository, and PKG_SOURCE_SUBDIR to something sensible ($(PACKAGE_NAME)-$(PACKAGE_SOURCE_VERSION) for instance). Same rationale as for the previous patch (useless to most, but small and straightforward so why no add it?). Best regards, Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr --- include/download.mk | 19 ++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/include/download.mk b/include/download.mk index 9dd26a7..a2238bc 100644 --- a/include/download.mk +++ b/include/download.mk @@ -28,7 +28,7 @@ $(strip \ ) endef -# code for creating tarballs from cvs/svn/git/bzr/hg checkouts - useful for mirror support +# code for creating tarballs from cvs/svn/git/bzr/hg/darcs checkouts - useful for mirror support dl_pack/bz2=$(TAR) cfj $(1) $(2) dl_pack/gz=$(TAR) cfz $(1) $(2) dl_pack/unknown=echo ERROR: Unknown pack format for file $(1); false @@ -128,11 +128,28 @@ define DownloadMethod/hg ) endef +define DownloadMethod/darcs + $(call wrap_mirror, \ + echo Checking out files from the darcs repository...; \ + mkdir -p $(TMP_DIR)/dl \ + cd $(TMP_DIR)/dl \ + rm -rf $(SUBDIR) \ + [ \! -d $(SUBDIR) ] \ + darcs get -t $(VERSION) $(URL) $(SUBDIR) \ + find $(SUBDIR) -name _darcs | xargs rm -rf \ + echo Packing checkout... \ + $(call dl_pack,$(TMP_DIR)/dl/$(FILE),$(SUBDIR)) \ + mv $(TMP_DIR)/dl/$(FILE) $(DL_DIR)/ \ + rm -rf $(SUBDIR); \ + ) +endef + Validate/cvs=VERSION SUBDIR Validate/svn=VERSION SUBDIR Validate/git=VERSION SUBDIR Validate/bzr=VERSION SUBDIR Validate/hg=VERSION SUBDIR +Validate/darcs=VERSION SUBDIR define Download/Defaults URL:= -- 1.7.1 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] Allow UCI interface names in /etc/config/dnsmasq
Hi,
any chance to have this patch applied, or is there still something wrong
with it?
Thank you very much,
Gabriel
On Mon, Jul 19, 2010 at 05:13:54PM +0200, Gabriel Kerneis wrote:
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
package/dnsmasq/files/dnsmasq.init |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/dnsmasq/files/dnsmasq.init
b/package/dnsmasq/files/dnsmasq.init
index e2f35e8..c69f0d2 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -42,11 +42,13 @@ append_server() {
}
append_interface() {
- append args -i $1
+ local ifname=$(uci_get_state network $1 ifname $1)
+ append args -i $ifname
}
append_notinterface() {
- append args -I $1
+ local ifname=$(uci_get_state network $1 ifname $1)
+ append args -I $ifname
}
append_addnhosts() {
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] dnsmasq not responding on IPv6
Hi, On Mon, Jul 19, 2010 at 10:10:16AM +0200, Florian Fainelli wrote: You can check a couple of things : - make sure your build is IPv6 enabled, including support for IPv6 sockets in your C library (it should be the case) Since babeld is working, I guess this is the case (but if you have any simple way to check, I'd be glad to hear about it - I used the build available on downloads.openwrt.org by the way). - check that dnsmasq is actually bound to an IPv6 socket, if support for these are disabled, it may just silently drop binding on these netstat -l -u seems to indicate this is the case (bound to ::1). - the default firewall is now IPv6 aware and might block DNS requests to your router Yeah, I thought about this one too, but the problem occurred even before I installed ip6tables (I'll double check though). Can anyone confirm that host -6 www.kame.net your:router:ipv6:address works for him (anyone using IPv6 on it's local network obviously)? Thanks for your advice and I'll let you know if I understand what is going on, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] dnsmasq not responding on IPv6
On Mon, Jul 19, 2010 at 12:08:41PM +0200, Alexander Sulfrian wrote: On Mon, 19 Jul 2010 10:24:43 +0200 Gabriel Kerneis kern...@pps.jussieu.fr wrote: netstat -l -u seems to indicate this is the case (bound to ::1). Please notice that ::1 is localhost in IPv6 ;) The equivalent to 0.0.0.0 in IPv6 is :: Sorry, this was a typo. The actual local address is :::53 and the foreign one is :::*. And the firewall rules are exactly the same in v6 and v4 (except udp port 68 opened in v4 only on the WAN interface, which should have nothing to do with it). The enigma remains... -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] dnsmasq not responding on IPv6
On Sun, Jul 18, 2010 at 03:39:11PM +0200, Gabriel Kerneis wrote: - I have a dual-stack router, that I can ping from my client with both IPv4 and IPv6, That was wrong actually. Sorry for the noise, it had nothing to do with dnsmasq but was a mere routing issue, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Allow UCI interface names in /etc/config/dnsmasq
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
package/dnsmasq/files/dnsmasq.init |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/dnsmasq/files/dnsmasq.init
b/package/dnsmasq/files/dnsmasq.init
index e2f35e8..156d5d5 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -42,11 +42,13 @@ append_server() {
}
append_interface() {
- append args -i $1
+ local _uciname=`uci get -q -P /var/state network.$1.ifname`
+ append args -i ${_uciname:-$1}
}
append_notinterface() {
- append args -I $1
+ local _uciname=`uci get -q -P /var/state network.$1.ifname`
+ append args -I ${_uciname:-$1}
}
append_addnhosts() {
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Allow UCI interface names in /etc/config/dnsmasq
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
package/dnsmasq/files/dnsmasq.init |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/package/dnsmasq/files/dnsmasq.init
b/package/dnsmasq/files/dnsmasq.init
index e2f35e8..c69f0d2 100644
--- a/package/dnsmasq/files/dnsmasq.init
+++ b/package/dnsmasq/files/dnsmasq.init
@@ -42,11 +42,13 @@ append_server() {
}
append_interface() {
- append args -i $1
+ local ifname=$(uci_get_state network $1 ifname $1)
+ append args -i $ifname
}
append_notinterface() {
- append args -I $1
+ local ifname=$(uci_get_state network $1 ifname $1)
+ append args -I $ifname
}
append_addnhosts() {
--
1.7.1
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] dnsmasq not responding on IPv6
Hi all, Using the snapshot release of OpenWrt, I cannot access the dns proxy feature of dnsmasq with IPv6. Here is what works and what does not: - I have a dual-stack router, that I can ping from my client with both IPv4 and IPv6, - dnsmasq -v on this router says that it is IPv6 enabled, - netstat -l confirms that it listens on both IPv4 and IPv6 (port 53, tcp udp), - my firewall is configured to accept any request from the LAN, - but when I put the IPv6 address of my router instead of the IPv4 one in /etc/hosts on my client, it does not work (and using host -6 fails at well). Using tcpdump on the router, I can see the request from the client coming but no answer when I use IPv6 (contrary to IPv4). There must be something obvious that I am missing, but I am totally lost. Do you have any idea or already faced this kind of issue? Many thanks in advance, -- Gabriel Kerneis ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Resolve interfaces in dnsmasq configuration
Hi, shouldn't /etc/init.d/dnsmasq try to resolve the name of interfaces w.r.t. how they are called in /etc/config/network? I've been bitten by this recently. If there is no objection, I'll make a patch and submit it here. Regards, -- Gabriel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH RFC] [package] babeld and ahcpd: update and UCIfication
Hi, I've finished to convert the babeld and ahcpd packages to use UCI. In the meantime, I've updated them to latest upstream revision and integrated ahcp as a protocol in OpenWrt. The latter means that now, if you want to configure an interface with ahcp, you just need to put the following in /etc/config/network: config 'interface' 'wifi' option 'ifname' 'ath0' option 'proto' 'ahcp' The config file (/etc/config/ahcp) is now reserved for forwarder and server mode configuration. Nothing prevents you from using ahcp in client mode on some interfaces, and server mode on some others (but server and forwarder modes are mutually exclusive). The babel patch is not very different from what I sent yesterday, only a few fixes based on feedback I got off-list (thank you all). This patches have been tested today rather extensively. I'll commit them in the trunk very soon, but felt it necessary to make this public annoucement since they change deeply how the packages are configured. Please upgrade and provide more feedback if anything looks wrong. Atheros packages (working on my Fonera 2100) are available here: http://www.pps.jussieu.fr/~kerneis/software/files/ahcpd_0.51-1_atheros.ipk http://www.pps.jussieu.fr/~kerneis/software/files/babeld_0.98-1_atheros.ipk Regards, -- Gabriel Kerneis From 86eeb382fef31d07e102d99b63f06cd17e716d9b Mon Sep 17 00:00:00 2001 From: Gabriel Kerneis kern...@pps.jussieu.fr Date: Mon, 15 Feb 2010 19:21:39 +0100 Subject: [PATCH 1/2] [package] babeld: update to 0.98, fix scripts - Full-featured UCI configuration file (no need for babeld.conf). - Do not check the pid file (useless) and ahcpd script (harmful). - Make /etc/config/babeld a config file. - Launch at most one instance of babeld. - Add status and reload options to init script. - 8 February 2010: babeld 0.98: * Implement the ability to prefer Babel routes to external routes according to the kernel priority (-A). * Implement the ability to redistribute boot routes when the protocol is explicitly specified on the redistribute line. * Allow trailing whitespace in config file. Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr --- net/babel/Makefile| 12 ++-- net/babel/files/babeld.conf | 20 +- net/babel/files/babeld.config | 72 - net/babel/files/babeld.init | 142 +++-- 4 files changed, 212 insertions(+), 34 deletions(-) diff --git a/net/babel/Makefile b/net/babel/Makefile index 144bf9e..d26ebba 100644 --- a/net/babel/Makefile +++ b/net/babel/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=0.97 +PKG_VERSION:=0.98 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=be0748c382dfe60bd35aa6b661e6077d +PKG_MD5SUM:=85af76e90914b82d9ece497e15df252f include $(INCLUDE_DIR)/package.mk @@ -22,6 +22,7 @@ define Package/babeld CATEGORY:=Network TITLE:=A loop-free distance-vector routing protocol URL:=http://www.pps.jussieu.fr/~jch/software/babel/ + MAINTAINER:=Gabriel Kerneis kern...@pps.jussieu.fr DEPENDS:=+kmod-ipv6 +librt endef @@ -37,19 +38,16 @@ endef define Package/babeld/conffiles /etc/babeld.conf +/etc/config/babeld endef -MAKE_FLAGS += \ - CC=$(TARGET_CC) \ - CFLAGS=$(TARGET_CFLAGS) \ - define Package/babeld/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) ./files/babeld.conf $(1)/etc/ $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/babeld.config $(1)/etc/config/babeld + $(INSTALL_CONF) ./files/babeld.config $(1)/etc/config/babeld $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/babeld.init $(1)/etc/init.d/babeld endef diff --git a/net/babel/files/babeld.conf b/net/babel/files/babeld.conf index 07fcbe1..fd488f9 100644 --- a/net/babel/files/babeld.conf +++ b/net/babel/files/babeld.conf @@ -1,11 +1,15 @@ # babel config file -# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan +# Copyright (C) 2008-2010 Juliusz Chroboczek, L. Aaron Kaplan # j...@pps.jussieu.fr , aa...@lo-res.org # # This config file simply documents sample entries. -# redistribute means: redistribute routes from other -# routing protocols into babel. local means addresses assigned to local interfaces. +# redistribute means: redistribute routes from other routing protocols +# into babel. local means addresses assigned to local interfaces. # +# You do not need to edit this file: you can use /etc/config/babeld +# instead (sections interface and filter). Both files can be used +# simultaneously (the rules of this file are executed first). + # the default rules are: # ## redistribute local @@ -14,15 +18,23 @@ # this says, redistribute local addresses but no other routes - # redistribute IPv4 default route into babel ## redistribute local ip 0.0.0.0/0 le 0 metric 128
[OpenWrt-Devel] [PATCH] [package] babeld: update to 0.98, fix scripts
Hi, I plan to commit the following patch for the Babel package (in OpenWrt) in the next few days. I’ve tested it roughly and it seems to work. But since it’s a major rewrite of the configuration file and init script, I’d be glad to get some feedback from people using Babel (and others as well). Does it work for you? Is there something obviously wrong, or that could be done more efficiently? Thak you for your comments. Regards, Gabriel Kerneis ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [package] babeld: update to 0.98, fix scripts
- Full-featured UCI configuration file (no need for babeld.conf). - Do not check the pid file (useless) and ahcpd script (harmful). - 8 February 2010: babeld 0.98: * Implement the ability to prefer Babel routes to external routes according to the kernel priority (-A). * Implement the ability to redistribute boot routes when the protocol is explicitly specified on the redistribute line. * Allow trailing whitespace in config file. Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr --- net/babel/Makefile|4 +- net/babel/files/babeld.conf | 20 +- net/babel/files/babeld.config | 71 +- net/babel/files/babeld.init | 131 ++--- 4 files changed, 197 insertions(+), 29 deletions(-) diff --git a/net/babel/Makefile b/net/babel/Makefile index 144bf9e..763e32d 100644 --- a/net/babel/Makefile +++ b/net/babel/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=0.97 +PKG_VERSION:=0.98 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=be0748c382dfe60bd35aa6b661e6077d +PKG_MD5SUM:=85af76e90914b82d9ece497e15df252f include $(INCLUDE_DIR)/package.mk diff --git a/net/babel/files/babeld.conf b/net/babel/files/babeld.conf index 07fcbe1..fd488f9 100644 --- a/net/babel/files/babeld.conf +++ b/net/babel/files/babeld.conf @@ -1,11 +1,15 @@ # babel config file -# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan +# Copyright (C) 2008-2010 Juliusz Chroboczek, L. Aaron Kaplan # j...@pps.jussieu.fr , aa...@lo-res.org # # This config file simply documents sample entries. -# redistribute means: redistribute routes from other -# routing protocols into babel. local means addresses assigned to local interfaces. +# redistribute means: redistribute routes from other routing protocols +# into babel. local means addresses assigned to local interfaces. # +# You do not need to edit this file: you can use /etc/config/babeld +# instead (sections interface and filter). Both files can be used +# simultaneously (the rules of this file are executed first). + # the default rules are: # ## redistribute local @@ -14,15 +18,23 @@ # this says, redistribute local addresses but no other routes - # redistribute IPv4 default route into babel ## redistribute local ip 0.0.0.0/0 le 0 metric 128 # same but for IPv6 ## redistribute local ip ::/0 le 0 metric 128 + # don't redistribute all local addresses, only selected ones # after the first line, the deny rules kicks in. After the deny # no redistribute local rules are going to match ## redistribute local ip 192.160.4.0/24 ## redistribute local deny + + +# Babel refuses to redistribute routes with a protocol number of boot; +# this is standard practice, and means that you cannot easily +# redistribute the default route installed by dhcp. It is however +# possible to redistribute such route by explicitly specifying proto 3 +# on the redistribute line. +## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128 diff --git a/net/babel/files/babeld.config b/net/babel/files/babeld.config index 3b0fb38..ab6a639 100644 --- a/net/babel/files/babeld.config +++ b/net/babel/files/babeld.config @@ -1,2 +1,69 @@ -config babeld - #list 'interface' 'wlan' +config general + option 'multicast_address' 'ff02::cca6:c0f9:e182:5373' + option 'port' '8475' + option 'state_file' '/var/lib/babel-state' + option 'hello_interval' '4' + option 'wired_hello_interval' '20' + # Enable detection of idle networks. This functonality is + # experimental, don't use it unless you know what you are doing. + ## option 'idle_hello_interval' '0' + option 'kernel_priority' '0' + # Do not use this option unless you know what you are doing, as it can + # cause persistent route flapping. + ## option 'duplication_priority' '0' + option 'carrier_sense' 'false' + option 'assume_wireless' 'false' + option 'no_split_horizon' 'false' + option 'parasitic' 'false' + option 'debug' '0' + # Listen for connections from a front-end, e.g. on port 33123. + ## option 'local_server' '33123' + # Use the given kernel routing table for routes inserted by babeld. + ## option 'export_table' '0' + # Export routes from the given kernel routing table. + ## option 'import_table' '0' + # The configuration file is not necessary since you can do everything + # from this file. + option 'conffile' '/etc/babeld.conf' + option 'logfile' '/var/log/babeld.log' + option 'pidfile' '/var/run/babeld.pid' + +# You can use aliases (like lan, wlan) or real names (like eth0.0). +# If you use an alias, it must be already defined when babeld starts. +# Otherwise, the name is taken literally and the interface can be +# brought up later (useful for tunnels
Re: [OpenWrt-Devel] [PATCH] [package] babeld: update to 0.98, fix scripts
On Tue, Feb 16, 2010 at 04:11:50PM +0100, Gabriel Kerneis wrote: I plan to commit the following patch Here it is. -- Gabriel Kerneis From 6656c8ccfcd365fe5b548cc29a6e16e9da0b1145 Mon Sep 17 00:00:00 2001 From: Gabriel Kerneis kern...@pps.jussieu.fr Date: Mon, 15 Feb 2010 19:21:39 +0100 Subject: [PATCH] [package] babeld: update to 0.98, fix scripts - Full-featured UCI configuration file (no need for babeld.conf). - Do not check the pid file (useless) and ahcpd script (harmful). - 8 February 2010: babeld 0.98: * Implement the ability to prefer Babel routes to external routes according to the kernel priority (-A). * Implement the ability to redistribute boot routes when the protocol is explicitly specified on the redistribute line. * Allow trailing whitespace in config file. Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr --- net/babel/Makefile|4 +- net/babel/files/babeld.conf | 20 +- net/babel/files/babeld.config | 71 +- net/babel/files/babeld.init | 131 ++--- 4 files changed, 197 insertions(+), 29 deletions(-) diff --git a/net/babel/Makefile b/net/babel/Makefile index 144bf9e..763e32d 100644 --- a/net/babel/Makefile +++ b/net/babel/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=0.97 +PKG_VERSION:=0.98 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=be0748c382dfe60bd35aa6b661e6077d +PKG_MD5SUM:=85af76e90914b82d9ece497e15df252f include $(INCLUDE_DIR)/package.mk diff --git a/net/babel/files/babeld.conf b/net/babel/files/babeld.conf index 07fcbe1..fd488f9 100644 --- a/net/babel/files/babeld.conf +++ b/net/babel/files/babeld.conf @@ -1,11 +1,15 @@ # babel config file -# Copyright (C) 2008 Juliusz Chroboczek, L. Aaron Kaplan +# Copyright (C) 2008-2010 Juliusz Chroboczek, L. Aaron Kaplan # j...@pps.jussieu.fr , aa...@lo-res.org # # This config file simply documents sample entries. -# redistribute means: redistribute routes from other -# routing protocols into babel. local means addresses assigned to local interfaces. +# redistribute means: redistribute routes from other routing protocols +# into babel. local means addresses assigned to local interfaces. # +# You do not need to edit this file: you can use /etc/config/babeld +# instead (sections interface and filter). Both files can be used +# simultaneously (the rules of this file are executed first). + # the default rules are: # ## redistribute local @@ -14,15 +18,23 @@ # this says, redistribute local addresses but no other routes - # redistribute IPv4 default route into babel ## redistribute local ip 0.0.0.0/0 le 0 metric 128 # same but for IPv6 ## redistribute local ip ::/0 le 0 metric 128 + # don't redistribute all local addresses, only selected ones # after the first line, the deny rules kicks in. After the deny # no redistribute local rules are going to match ## redistribute local ip 192.160.4.0/24 ## redistribute local deny + + +# Babel refuses to redistribute routes with a protocol number of boot; +# this is standard practice, and means that you cannot easily +# redistribute the default route installed by dhcp. It is however +# possible to redistribute such route by explicitly specifying proto 3 +# on the redistribute line. +## redistribute ip 0.0.0.0/0 le 0 proto 3 metric 128 diff --git a/net/babel/files/babeld.config b/net/babel/files/babeld.config index 3b0fb38..ab6a639 100644 --- a/net/babel/files/babeld.config +++ b/net/babel/files/babeld.config @@ -1,2 +1,69 @@ -config babeld - #list 'interface' 'wlan' +config general + option 'multicast_address' 'ff02::cca6:c0f9:e182:5373' + option 'port' '8475' + option 'state_file' '/var/lib/babel-state' + option 'hello_interval' '4' + option 'wired_hello_interval' '20' + # Enable detection of idle networks. This functonality is + # experimental, don't use it unless you know what you are doing. + ## option 'idle_hello_interval' '0' + option 'kernel_priority' '0' + # Do not use this option unless you know what you are doing, as it can + # cause persistent route flapping. + ## option 'duplication_priority' '0' + option 'carrier_sense' 'false' + option 'assume_wireless' 'false' + option 'no_split_horizon' 'false' + option 'parasitic' 'false' + option 'debug' '0' + # Listen for connections from a front-end, e.g. on port 33123. + ## option 'local_server' '33123' + # Use the given kernel routing table for routes inserted by babeld. + ## option 'export_table' '0' + # Export routes from the given kernel routing table. + ## option 'import_table' '0' + # The configuration file is not necessary since you can do everything + # from this file. + option 'conffile' '/etc/babeld.conf' + option 'logfile' '/var/log/babeld.log' + option 'pidfile' '/var/run/babeld.pid' + +# You can use aliases (like lan, wlan) or real names (like eth0.0
[OpenWrt-Devel] [PATCH] Fix and upgrade the ahcpd package
Hello,
the following patch fixes the ahcpd package. More precisely, it:
- upgrades ahcpd to the latest release (0.50),
- adds librt dependency to the Makefile,
- removes the installation of the obsolete ahcp-dummy-config.sh file,
- fixes the ahcpd.init file to ensure compatibility with ahcpd 0.50,
options, and provide a sane default behaviour (forward ahcpd messages
without performing any configuration).
Since I do not know if opkg is able to distinguish between ahcpd 0.5
(the former version) and ahcpd 0.50 (the current, incompatible,
version), I labelled this release ahcpd-0.50-3 (the former being
ahcpd-0.5-2). If this is unnecessary, please feel free to label it
0.50-1 instead.
Regards,
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
Index: ipv6/ahcpd/files/ahcpd.init
===
--- ipv6/ahcpd/files/ahcpd.init (révision 18433)
+++ ipv6/ahcpd/files/ahcpd.init (copie de travail)
@@ -7,7 +7,9 @@
ahcpd_config() {
local cfg=$1
config_get interfaces $cfg interfaces
- config_get_bool no_ipv4 $cfg no_ipv4 0
+ config_get_bool no_config $cfg no_config 0
+ config_get_bool ipv4_only $cfg ipv4_only 0
+ config_get_bool ipv6_only $cfg ipv6_only 0
config_get_bool no_dns $cfg no_dns 0
}
@@ -15,17 +17,24 @@
config_load ahcpd
config_foreach ahcpd_config ahcpd
mkdir -p /var/lib
- [ -r /usr/lib/ahcp/ahcp.dat ] authority=-a /usr/lib/ahcp/ahcp.dat
- if [ $no_ipv4 -eq 0 ]; then
- unset no_ipv4
+ if [ $no_config -eq 0 ]; then
+ unset no_config
fi
+ if [ $ipv4_only -eq 0 ]; then
+ unset ipv4_only
+ fi
+ if [ $ipv6_only -eq 0 ]; then
+ unset ipv6_only
+ fi
if [ $no_dns -eq 0 ]; then
unset no_dns
fi
if [ -e $pidfile ] ; then
echo $pidfile exists -- not starting ahcpd. 2
else
- /usr/sbin/ahcpd -D -I $pidfile ${no_ipv4:+-s} ${no_dns:+-N}
$authority $interfaces
+ /usr/sbin/ahcpd -s /usr/lib/ahcp/ahcp-config.sh -D -I $pidfile \
+ ${ipv4_only:+-4} ${ipv6_only:+-6} ${no_dns:+-N}
${no_config:+-n} \
+ $interfaces
fi
}
Index: ipv6/ahcpd/files/ahcpd.config
===
--- ipv6/ahcpd/files/ahcpd.config (révision 18433)
+++ ipv6/ahcpd/files/ahcpd.config (copie de travail)
@@ -1,4 +1,6 @@
config ahcpd
option interfaces wl0
+ option no_config true
option no_dns false
- option no_ipv4 true
+ option ipv4_only false
+ option ipv6_only false
Index: ipv6/ahcpd/Makefile
===
--- ipv6/ahcpd/Makefile (révision 18433)
+++ ipv6/ahcpd/Makefile (copie de travail)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ahcpd
-PKG_VERSION:=0.5
-PKG_RELEASE:=2
+PKG_VERSION:=0.50
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/
-PKG_MD5SUM:=0e5fe1199161eeef214c43eca7eec9a1
+PKG_MD5SUM:=627ec199784c60e5250651f82511fff2
include $(INCLUDE_DIR)/package.mk
@@ -22,7 +22,7 @@
CATEGORY:=IPv6
TITLE:=Ad-Hoc Configuration Protocol daemon
URL:=http://www.pps.jussieu.fr/~jch/software/ahcp/
- DEPENDS:=+kmod-ipv6 +ip
+ DEPENDS:=+kmod-ipv6 +ip +librt
endef
define Package/ahcpd/description
@@ -52,9 +52,8 @@
define Package/ahcpd/install
$(INSTALL_DIR) $(1)/usr/bin
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-generate{,-address} $(1)/usr/bin/
$(INSTALL_DIR) $(1)/usr/lib/ahcp
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp{,-dummy}-config.sh
$(1)/usr/lib/ahcp/
+ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcp-config.sh $(1)/usr/lib/ahcp/
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ahcpd $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/etc/config
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ahcpd: fix ticket 3550
This is a fix for ticket 3550 (I don't have the rights to reopen the
ticket there, hence my post on this list). I'm not a shell guru so do
not hesitate to change it if something looks wrong.
Signed-off-by: Gabriel Kerneis kern...@pps.jussieu.fr
---
Index: ipv6/ahcpd/files/ahcpd.init
===
--- ipv6/ahcpd/files/ahcpd.init (révision 15226)
+++ ipv6/ahcpd/files/ahcpd.init (copie de travail)
@@ -7,8 +7,8 @@
ahcpd_config() {
local cfg=$1
config_get interfaces $cfg interfaces
- config_get no_ipv4 $cfg no_ipv4
- config_get no_dns $cfg no_dns
+ config_get_bool no_ipv4 $cfg no_ipv4 0
+ config_get_bool no_dns $cfg no_dns 0
}
start() {
@@ -16,6 +16,12 @@
config_foreach ahcpd_config ahcpd
mkdir -p /var/lib
[ -r /usr/lib/ahcp/ahcp.dat ] authority=-a /usr/lib/ahcp/ahcp.dat
+ if [ $no_ipv4 -eq 0 ]; then
+unset no_ipv4
+fi
+ if [ $no_dns -eq 0 ]; then
+unset no_dns
+fi
if [ -e $pidfile ] ; then
echo $pidfile exists -- not starting ahcpd. 2
else
Index: ipv6/ahcpd/files/ahcpd.config
===
--- ipv6/ahcpd/files/ahcpd.config (révision 15226)
+++ ipv6/ahcpd/files/ahcpd.config (copie de travail)
@@ -1,5 +1,4 @@
config ahcpd
option interfaces wl0
- # Comment out to actually disable, see ticket 3550
option no_dns false
option no_ipv4 true
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
