Merge pull request #265 from freifunk-gluon/remove-tunneldigger
tunneldigger: remove redundant package
This commit is contained in:
commit
c113a73912
|
@ -1,44 +0,0 @@
|
||||||
include $(TOPDIR)/rules.mk
|
|
||||||
|
|
||||||
PKG_NAME:=tunneldigger
|
|
||||||
PKG_RELEASE:=1
|
|
||||||
|
|
||||||
PKG_SOURCE_PROTO:=git
|
|
||||||
PKG_SOURCE_URL:=https://github.com/wlanslovenija/tunneldigger.git
|
|
||||||
PKG_SOURCE_DATE:=2020-05-17
|
|
||||||
PKG_SOURCE_VERSION:=8995046a2ba8f111391e01e6bb38a352c0cedaa1
|
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
|
||||||
include $(INCLUDE_DIR)/cmake.mk
|
|
||||||
|
|
||||||
define Package/tunneldigger
|
|
||||||
SECTION:=net
|
|
||||||
CATEGORY:=Network
|
|
||||||
DEPENDS:=+libnl-tiny +kmod-l2tp +kmod-l2tp-eth +librt +libpthread
|
|
||||||
TITLE:=L2TPv3 tunnel broker client
|
|
||||||
endef
|
|
||||||
|
|
||||||
TARGET_CFLAGS += \
|
|
||||||
-I$(STAGING_DIR)/usr/include/libnl-tiny \
|
|
||||||
-I$(STAGING_DIR)/usr/include \
|
|
||||||
-DLIBNL_TINY
|
|
||||||
|
|
||||||
define Build/Prepare
|
|
||||||
$(call Build/Prepare/Default)
|
|
||||||
$(CP) $(PKG_BUILD_DIR)/client/* $(PKG_BUILD_DIR)
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/tunneldigger/install
|
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
|
||||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/tunneldigger $(1)/usr/bin/tunneldigger
|
|
||||||
$(INSTALL_DIR) $(1)/etc/init.d
|
|
||||||
$(INSTALL_BIN) ./files/tunneldigger.init $(1)/etc/init.d/tunneldigger
|
|
||||||
$(INSTALL_DIR) $(1)/etc/config
|
|
||||||
$(INSTALL_DATA) ./files/config.default $(1)/etc/config/tunneldigger
|
|
||||||
endef
|
|
||||||
|
|
||||||
define Package/tunneldigger/conffiles
|
|
||||||
/etc/config/tunneldigger
|
|
||||||
endef
|
|
||||||
|
|
||||||
$(eval $(call BuildPackage,tunneldigger))
|
|
|
@ -1,10 +0,0 @@
|
||||||
config broker
|
|
||||||
list address 'x.y.z.w:8942'
|
|
||||||
list address 'x.y.z.w:53'
|
|
||||||
list address 'x.y.z.w:123'
|
|
||||||
option uuid 'abcd'
|
|
||||||
option group 'root'
|
|
||||||
option interface 'l2tp0'
|
|
||||||
option limit_bw_down '1024'
|
|
||||||
option broker_selection 'usage'
|
|
||||||
option enabled '0'
|
|
|
@ -1,97 +0,0 @@
|
||||||
#!/bin/sh /etc/rc.common
|
|
||||||
|
|
||||||
. $IPKG_INSTROOT/lib/functions/network.sh
|
|
||||||
|
|
||||||
START=90
|
|
||||||
|
|
||||||
PIDPATH=/var/run
|
|
||||||
tunnel_id=1
|
|
||||||
|
|
||||||
missing() {
|
|
||||||
echo "Not starting tunneldigger - missing $1" >&2
|
|
||||||
}
|
|
||||||
|
|
||||||
config_cb() {
|
|
||||||
local cfg="$CONFIG_SECTION"
|
|
||||||
config_get configname "$cfg" TYPE
|
|
||||||
case "$configname" in
|
|
||||||
broker)
|
|
||||||
config_get_bool enabled "$cfg" enabled 1
|
|
||||||
config_get addresses "$cfg" address
|
|
||||||
config_get uuid "$cfg" uuid
|
|
||||||
config_get interface "$cfg" interface
|
|
||||||
config_get group "$cfg" group
|
|
||||||
config_get limit_bw_down "$cfg" limit_bw_down
|
|
||||||
config_get hook_script "$cfg" hook_script
|
|
||||||
config_get bind_interface "$cfg" bind_interface
|
|
||||||
config_get broker_selection "$cfg" broker_selection
|
|
||||||
|
|
||||||
[ $enabled -eq 0 ] && return
|
|
||||||
|
|
||||||
local broker_opts=""
|
|
||||||
for address in $addresses; do
|
|
||||||
append broker_opts "-b ${address}"
|
|
||||||
done
|
|
||||||
|
|
||||||
[ ! -z "${limit_bw_down}" ] && append broker_opts "-L ${limit_bw_down}"
|
|
||||||
[ ! -z "${hook_script}" ] && append broker_opts "-s ${hook_script}"
|
|
||||||
[ ! -z "${bind_interface}" ] && {
|
|
||||||
# Resolve logical interface name.
|
|
||||||
unset _bind_interface
|
|
||||||
network_get_device _bind_interface "${bind_interface}" || _bind_interface="${bind_interface}"
|
|
||||||
append broker_opts "-I ${_bind_interface}"
|
|
||||||
}
|
|
||||||
[ ! -z "${broker_selection}" ] && {
|
|
||||||
# Set broker selection.
|
|
||||||
case "${broker_selection}" in
|
|
||||||
usage)
|
|
||||||
append broker_opts "-a"
|
|
||||||
;;
|
|
||||||
first)
|
|
||||||
append broker_opts "-g"
|
|
||||||
;;
|
|
||||||
random)
|
|
||||||
append broker_opts "-r"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -z "$uuid" ]; then
|
|
||||||
missing uuid
|
|
||||||
return
|
|
||||||
elif [ -z "$interface" ]; then
|
|
||||||
missing interface
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Starting tunneldigger on ${interface}"
|
|
||||||
/sbin/start-stop-daemon -S -q -b -m -c root:${group} -p ${PIDPATH}/tunneldigger.${interface}.pid -x /usr/bin/tunneldigger -- -u ${uuid} -i ${interface} -t ${tunnel_id} ${broker_opts}
|
|
||||||
|
|
||||||
let tunnel_id++
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
config_load tunneldigger
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
for PIDFILE in `find ${PIDPATH}/ -name "tunneldigger\.*\.pid"`; do
|
|
||||||
PID="$(cat ${PIDFILE})"
|
|
||||||
IFACE="$(echo ${PIDFILE} | awk -F\/tunneldigger '{print $2}' | cut -d'.' -f2)"
|
|
||||||
echo "Stopping tunneldigger for interface ${IFACE}"
|
|
||||||
start-stop-daemon -K -q -p $PIDFILE
|
|
||||||
while test -d "/proc/${PID}"; do
|
|
||||||
echo " waiting for tunneldigger to stop"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
echo " tunneldigger stopped"
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
restart() {
|
|
||||||
stop
|
|
||||||
start
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue