diff options
| -rw-r--r-- | config/trunk | 4 | ||||
| -rwxr-xr-x | files/common/etc/init.d/hbbp | 4 | ||||
| -rwxr-xr-x | files/common/sbin/p2ptbl | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/config/trunk b/config/trunk index 5b8f242..c26fb76 100644 --- a/config/trunk +++ b/config/trunk @@ -32,6 +32,7 @@ CONFIG_PACKAGE_coreutils=y CONFIG_PACKAGE_coreutils-join=y CONFIG_PACKAGE_ebtables=y CONFIG_PACKAGE_flock=y +CONFIG_PACKAGE_hbbp=y CONFIG_PACKAGE_hostapd-mini=y CONFIG_PACKAGE_ip6tables=y CONFIG_PACKAGE_kmod-batman-adv=y @@ -47,6 +48,7 @@ CONFIG_PACKAGE_kmod-ipv6=y # CONFIG_PACKAGE_kmod-lib-crc-ccitt is not set CONFIG_PACKAGE_kmod-lib-crc16=y CONFIG_PACKAGE_kmod-lib-textsearch=y +CONFIG_PACKAGE_kmod-nfnetlink=y # CONFIG_PACKAGE_kmod-ppp is not set CONFIG_PACKAGE_kmod-tun=y CONFIG_PACKAGE_libip6tc=y @@ -54,9 +56,9 @@ CONFIG_PACKAGE_libpthread=y CONFIG_PACKAGE_librpc=y CONFIG_PACKAGE_librt=y CONFIG_PACKAGE_n2n=y +CONFIG_PACKAGE_nacl=y # CONFIG_PACKAGE_ppp is not set # CONFIG_PACKAGE_uboot-envtools is not set -CONFIG_PACKAGE_udp-broadcast=y CONFIG_PACKAGE_uhttpd=y # CONFIG_PACKAGE_wpad-mini is not set CONFIG_PACKAGE_zlib=y diff --git a/files/common/etc/init.d/hbbp b/files/common/etc/init.d/hbbp index 6fbcc86..c6daa1b 100755 --- a/files/common/etc/init.d/hbbp +++ b/files/common/etc/init.d/hbbp @@ -3,9 +3,9 @@ START=45 start() { cd /hbbp - listener br-mesh + hbbpd br-mesh } stop() { - killall listener + killall hbbpd } diff --git a/files/common/sbin/p2ptbl b/files/common/sbin/p2ptbl index 3c18855..341cecd 100755 --- a/files/common/sbin/p2ptbl +++ b/files/common/sbin/p2ptbl @@ -39,7 +39,7 @@ update () { if [ -n "$4" ]; then # broadcast update gzip <"$tmpfile" >"$tmpfile.gz" - broadcaster $4 p2ptbl/$(basename "$1") - <"$tmpfile.gz" + hbbpc $4 p2ptbl/$(basename "$1") - <"$tmpfile.gz" rm "$tmpfile.gz" fi rm "$tmpfile" @@ -84,7 +84,7 @@ gossip() { while [ $lc -ge 1 ]; do head -n$lc "$1.gossip" | gzip >"$1.gossip.gz" if [ $tgts -ge $(wc -c <"$1.gossip.gz") ]; then - broadcaster $if p2ptbl/$(basename "$1") - <"$1.gossip.gz" + hbbpc $if p2ptbl/$(basename "$1") - <"$1.gossip.gz" rm "$1.gossip" "$1.gossip.gz" return; fi |