6relayd: Add DHCPv6-PD server support, fix relaying in stateful mode

SVN-Revision: 36381

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 1747a0cca118b8a8883bcd71d97f12d08851d43b..98c15d297932a7f0bbc9d51fa2d22f6e4cade1d5 100644 (file)
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2013-02-28.1
+PKG_VERSION:=2013-04-22
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://github.com/sbyx/6relayd.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=be18c9722e8fa76ca96de16fb927b85bfe3197bc
+PKG_SOURCE_VERSION:=e9eaa12f29f8ab5c58c5c64402baf4d7cd43bda3
 
 PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
 
@@ -36,7 +36,7 @@ define Package/6relayd/description
  of a master interface. This is useful to avoid NAT in chained IPv6-routers.
 
  It can also be used as a lightweight router advertisement daemon and provide
- stateless DHCPv6 service where size matters.
+ stateless DHCPv6 service for clients and act as PD-server where size matters.
 endef
 
 define Package/6relayd/conffiles

diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index ef0c711224a21cefa57dcd415d6d3b52c8f3fac1..f6d5183716df8a80da33b2d166e750e362cfafd6 100644 (file)
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -79,7 +79,7 @@ start_6relayd() {
        config_get_bool compat_ula "$cfg" compat_ula 0
        [ "$compat_ula" -eq 1 ] && append args "-c"
 
-       [ "$ndp" = "relay" ] && append args "-N -s -l"
+       [ "$ndp" = "relay" ] && append args "-N -s"
        [ "$rd" = "relay" ] && append args "-Rrelay"
        [ "$rd" = "server" ] && append args "-Rserver"
        [ "$dhcpv6" = "relay" ] && append args "-Drelay"