diff options
| author | Steven Barth | 2015-07-28 10:06:25 +0000 |
|---|---|---|
| committer | Steven Barth | 2015-07-28 10:06:43 +0000 |
| commit | c5a8562599ecea81a014ed8f714d61b29e12df55 (patch) | |
| tree | b6845d8b5436c84f1685df8a7b67569a49e257bb | |
| parent | 36efb8629fd5388615e9eb24e8fe9d334a0b88bb (diff) | |
| download | routing-c5a8562599ecea81a014ed8f714d61b29e12df55.tar.gz | |
hnetd: bump and add tunneling support
Signed-off-by: Steven Barth <steven@midlink.org>
| -rw-r--r-- | hnetd/Makefile | 32 | ||||
| -rw-r--r-- | hnetd/files/hnetd.init | 3 |
2 files changed, 29 insertions, 6 deletions
diff --git a/hnetd/Makefile b/hnetd/Makefile index b9fe825..03e3fb9 100644 --- a/hnetd/Makefile +++ b/hnetd/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hnetd -PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9 -PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION) +PKG_SOURCE_VERSION:=a6b4b6f1f5d38646fa11064cf7394719e048bc87 +PKG_VERSION:=2015-07-28-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git @@ -37,7 +37,7 @@ define Package/hnetd/Default CATEGORY:=Network TITLE:=HNCP Homenet daemon - $(2) URL:=https://github.com/sbyx/hnetd - DEPENDS:=+odhcpd +odhcp6c +netifd +ip $(3) + DEPENDS:=+odhcpd +odhcp6c +netifd $(3) DEPENDS+=+@IPV6 VARIANT:=$1 endef @@ -50,7 +50,7 @@ define Package/hnet-full CATEGORY:=Network TITLE:=HNCP Homenet metapackage URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-nossl +luci-app-hnet + DEPENDS:=+hnetd-nossl +luci-app-hnet +ip # Routing DEPENDS+=+babeld # Service discovery @@ -62,9 +62,23 @@ endef define Package/hnet-full-secure SECTION:=net CATEGORY:=Network - TITLE:=HNCP Homenet metapackage + TITLE:=HNCP Homenet metapackage (w/ SSL) URL:=https://github.com/sbyx/hnetd - DEPENDS:=+hnetd-openssl +luci-app-hnet + DEPENDS:=+hnetd-openssl +luci-app-hnet +ip + # Routing + DEPENDS+=+babeld + # Service discovery + DEPENDS+=+ohybridproxy + # Distributed PCP support + DEPENDS+=+miniupnpd +minimalist-pcproxy +endef + +define Package/hnet-full-l2tp + SECTION:=net + CATEGORY:=Network + TITLE:=HNCP Homenet metapackage (w/ L2TP) + URL:=https://github.com/sbyx/hnetd + DEPENDS:=+hnetd-nossl +luci-app-hnet +ip-full +kmod-l2tp-eth # Routing DEPENDS+=+babeld # Service discovery @@ -116,6 +130,11 @@ define Package/hnet-full-secure/install true endef +define Package/hnet-full-l2tp/install + $(INSTALL_DIR) $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/generic/tunnel.script $(1)/usr/sbin/hnetd-tunnel +endef + define Package/luci-app-hnet/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/www @@ -137,4 +156,5 @@ $(eval $(call BuildPackage,hnetd-nossl)) $(eval $(call BuildPackage,hnetd-openssl)) $(eval $(call BuildPackage,hnet-full)) $(eval $(call BuildPackage,hnet-full-secure)) +$(eval $(call BuildPackage,hnet-full-l2tp)) $(eval $(call BuildPackage,luci-app-hnet)) diff --git a/hnetd/files/hnetd.init b/hnetd/files/hnetd.init index 6d7d0ec..6b98b8c 100644 --- a/hnetd/files/hnetd.init +++ b/hnetd/files/hnetd.init @@ -51,6 +51,9 @@ start_service() { # Routing script procd_append_param command -r /usr/sbin/hnetd-routing + [ -x /usr/sbin/hnetd-tunnel ] && \ + procd_append_param command -t /usr/sbin/hnetd-tunnel + # Prefix assignment (pa) config_get val pa ip4prefix [ -n "$val" ] && procd_append_param command --ip4prefix $val |