Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hnetd: bump and add tunneling support

Browse source 
Signed-off-by: Steven Barth <steven@midlink.org>
This commit is contained in:
Steven Barth 2015-07-28 12:06:25 +02:00
parent 36efb8629f
commit c5a8562599
2 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
hnetd/Makefile
View file

@ -7,8 +7,8 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hnetd PKG_NAME:=hnetd
PKG_SOURCE_VERSION:=ea2bd2bc2d8e617efca4b27fbf1c5c3c8ad09ad9 PKG_SOURCE_VERSION:=a6b4b6f1f5d38646fa11064cf7394719e048bc87
PKG_VERSION:=2015-07-10-$(PKG_SOURCE_VERSION) PKG_VERSION:=2015-07-28-$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -37,7 +37,7 @@ define Package/hnetd/Default
CATEGORY:=Network CATEGORY:=Network
TITLE:=HNCP Homenet daemon - $(2) TITLE:=HNCP Homenet daemon - $(2)
URL:=https://github.com/sbyx/hnetd URL:=https://github.com/sbyx/hnetd
DEPENDS:=+odhcpd +odhcp6c +netifd +ip $(3) DEPENDS:=+odhcpd +odhcp6c +netifd $(3)
DEPENDS+=+@IPV6 DEPENDS+=+@IPV6
VARIANT:=$1 VARIANT:=$1
endef endef
@ -50,7 +50,7 @@ define Package/hnet-full
CATEGORY:=Network CATEGORY:=Network
TITLE:=HNCP Homenet metapackage TITLE:=HNCP Homenet metapackage
URL:=https://github.com/sbyx/hnetd URL:=https://github.com/sbyx/hnetd
DEPENDS:=+hnetd-nossl +luci-app-hnet DEPENDS:=+hnetd-nossl +luci-app-hnet +ip
# Routing # Routing
DEPENDS+=+babeld DEPENDS+=+babeld
# Service discovery # Service discovery
@ -62,9 +62,23 @@ endef
define Package/hnet-full-secure define Package/hnet-full-secure
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=HNCP Homenet metapackage TITLE:=HNCP Homenet metapackage (w/ SSL)
URL:=https://github.com/sbyx/hnetd 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 # Routing
DEPENDS+=+babeld DEPENDS+=+babeld
# Service discovery # Service discovery
@ -116,6 +130,11 @@ define Package/hnet-full-secure/install
true true
endef 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 define Package/luci-app-hnet/install
$(INSTALL_DIR) $(1)/usr/lib/lua/luci $(INSTALL_DIR) $(1)/usr/lib/lua/luci
$(INSTALL_DIR) $(1)/www $(INSTALL_DIR) $(1)/www
@ -137,4 +156,5 @@ $(eval $(call BuildPackage,hnetd-nossl))
$(eval $(call BuildPackage,hnetd-openssl)) $(eval $(call BuildPackage,hnetd-openssl))
$(eval $(call BuildPackage,hnet-full)) $(eval $(call BuildPackage,hnet-full))
$(eval $(call BuildPackage,hnet-full-secure)) $(eval $(call BuildPackage,hnet-full-secure))
$(eval $(call BuildPackage,hnet-full-l2tp))
$(eval $(call BuildPackage,luci-app-hnet)) $(eval $(call BuildPackage,luci-app-hnet))

3
hnetd/files/hnetd.init
View file

@ -51,6 +51,9 @@ start_service() {
# Routing script # Routing script
procd_append_param command -r /usr/sbin/hnetd-routing 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) # Prefix assignment (pa)
config_get val pa ip4prefix config_get val pa ip4prefix
[ -n "$val" ] && procd_append_param command --ip4prefix $val [ -n "$val" ] && procd_append_param command --ip4prefix $val