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

Merge branch 'master' into bmx6_testing

Browse source
This commit is contained in:
Pau Escrich 2014-01-10 17:39:00 +01:00
commit dbdf03e816
6 changed files with 60 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
alfred/Makefile
View file

@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
#
PKG_NAME:=alfred
PKG_VERSION:=2013.4.0
PKG_RELEASE:=1
PKG_RELEASE:=3
PKG_MD5SUM:=3891697e127b1037cfc9349fd96e9993
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

28
alfred/files/alfred.init
View file

@ -13,9 +13,10 @@ alfred_args=""
vis_args=""
facters_dir="/etc/alfred"
pid_file_alfred="/var/run/alfred.pid"
pid_file_vis="/var/run/vis.pid"
pid_file_vis="/var/run/batadv-vis.pid"
enable=0
vis_enable=0
batmanif=""
SERVICE_DAEMONIZE=1
SERVICE_WRITE_PID=1
@ -23,7 +24,7 @@ alfred_start()
{
local args=""
local section="$1"
local disabled interface mode batmanif
local disabled interface mode
# check if section is disabled
config_get_bool disabled "$section" disabled 0
@ -44,7 +45,7 @@ alfred_start()
enable=1
config_get_bool start_vis "$section" start_vis 0
if [ "$start_vis" = 1 ] && [ -x /usr/sbin/vis ]; then
if [ "$start_vis" = 1 ] && [ -x /usr/sbin/batadv-vis ]; then
vis_enable=1
append vis_args "-i $batmanif -s"
fi
@ -62,14 +63,29 @@ start()
if [ "$enable" = "0" ]; then
exit 0
fi
mesh_dir="/sys/class/net/$batmanif/mesh/"
if ! [ -d "$mesh_dir" ] ; then
timeout=30
echo "${initscript}: waiting $timeout secs for $batmanif interface..."
for i in $(seq $timeout); do
sleep 1
[ -d "$mesh_dir" ] && break
if [ $i == $timeout ] ; then
echo "${initscript}: $batmanif not detected, alfred not starting."
exit 1
fi
done
fi
echo "${initscript}: starting alfred"
SERVICE_PID_FILE="$pid_file_alfred"
service_start /usr/sbin/alfred ${alfred_args}
if [ "$vis_enable" = "1" ]; then
echo "${initscript}: starting vis"
echo "${initscript}: starting batadv-vis"
SERVICE_PID_FILE="$pid_file_vis"
service_start /usr/sbin/vis ${vis_args}
service_start /usr/sbin/batadv-vis ${vis_args}
fi
if [ "$run_facters" = "1" ]; then
@ -87,7 +103,7 @@ stop()
SERVICE_PID_FILE="$pid_file_alfred"
service_stop /usr/sbin/alfred
SERVICE_PID_FILE="$pid_file_vis"
[ -x /usr/sbin/vis ] && service_stop /usr/sbin/vis
[ -x /usr/sbin/batadv-vis ] && service_stop /usr/sbin/batadv-vis
sed "\|for file in $facters_dir/\* ; do |d" -i /etc/crontabs/root
/etc/init.d/cron restart
}

5
luci-app-bmx6/files/usr/lib/lua/luci/view/bmx6/nodes_j.htm
View file

@ -113,7 +113,8 @@
// Looking for the extensions
var hna6 = [];
var tun4in6 = [];
var tun6 = [];
var tun6in6 = [];
for( var e = 0; e < extensions.length; e++)
{
if( extensions[e].HNA6_EXTENSION )
@ -125,6 +126,7 @@
// Gateways
var gateways = '<ul>';
if ( typeof(tun4in6) !== "undefined" && tun4in6 !== null )
for ( var t = 0; t < tun4in6.length; t++)
{
if ( tun4in6[t].networklen == "32" )
@ -133,6 +135,7 @@
gateways += "<li>"+tun4in6[t].network+'/'+tun4in6[t].networklen + ' | ' + tun4in6[t].bandwidth+'</li>';
}
if ( typeof(tun6in6) !== "undefined" && tun6in6 !== null )
for ( var t = 0; t < tun6in6.length; t++)
{
if ( tun6in6[t].networklen == "128" )

2
nodogsplash/Makefile
View file

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nodogsplash
PKG_FIXUP:=autoreconf
PKG_VERSION:=0.9_beta9.9.8
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

13
nodogsplash/files/nodogsplash.init
View file

@ -13,6 +13,7 @@
IPT=/usr/sbin/iptables
WD_DIR=/usr/bin
NDS_CONF=/etc/nodogsplash/nodogsplash.conf
OPTIONS=""
START=65
STOP=65
@ -168,9 +169,11 @@ test_module() {
do_module_tests "ipt_mac"
do_module_tests "ipt_mark"
# if not using traffic control,
# you can comment out the following 3 lines:
do_module_tests "imq" "numdevs=2"
do_module_tests "ipt_IMQ"
do_module_tests "sch_htb"
# test for imq modules, only if TrafficControl is enabled in conf
if ( grep -q -E '^[[:space:]]*TrafficControl[[:space:]]+(yes|true|1)' "$NDS_CONF" ) ; then
do_module_tests "imq" "numdevs=2"
do_module_tests "ipt_IMQ"
do_module_tests "sch_htb"
fi
}

40
olsrd/files/olsrd.hotplug.sh
View file

@ -11,7 +11,7 @@ olsrd_list_configured_interfaces()
# is disabled
;;
*)
echo "$interface"
echo "$interface" # e.g. 'lan'
;;
esac
@ -19,26 +19,32 @@ olsrd_list_configured_interfaces()
} done
}
olsrd_interface_already_in_config()
{
# e.g.: 'Interface "eth0.1" "eth0.2" "wlan0"'
if grep -s ^'Interface ' '/var/etc/olsrd.conf' | grep -q "\"$DEVICE\""; then
logger -t olsrd_hotplug -p daemon.debug "[OK] already_active: '$INTERFACE' => '$DEVICE'"
return 0
else
logger -t olsrd_hotplug -p daemon.info "[OK] ifup: '$INTERFACE' => '$DEVICE'"
return 1
fi
}
olsrd_interface_needs_adding()
{
local interface="$1" # e.g. wlanadhocRADIO1
local device="$2" # e.g. wlan1-1
local myif
local config="/var/etc/olsrd.conf"
local interface
for myif in $(olsrd_list_configured_interfaces); do {
[ "$myif" = "$interface" ] && {
if grep -s ^'Interface ' "$config" | grep -q "\"$device\""; then
logger -t olsrd_hotplug -p daemon.debug "[OK] already_active: $INTERFACE => $DEVICE"
return 1
else
logger -t olsrd_hotplug -p daemon.info "[OK] ifup: $INTERFACE => $DEVICE"
return 0
fi
# likely and cheap operation:
olsrd_interface_already_in_config && return 1
for interface in $(olsrd_list_configured_interfaces); do {
[ "$interface" = "$INTERFACE" ] && {
olsrd_interface_already_in_config || return 0
}
} done
logger -t olsrd_hotplug -p daemon.debug "[OK] interface $INTERFACE not used for olsrd"
logger -t olsrd_hotplug -p daemon.debug "[OK] interface '$INTERFACE' => '$DEVICE' not used for olsrd"
return 1
}
@ -47,7 +53,9 @@ case "$ACTION" in
# only work after the first normal startup
# also: no need to test, if enabled
[ -e '/var/etc/olsrd.conf' ] && {
olsrd_interface_needs_adding "$INTERFACE" "$DEVICE" && {
# INTERFACE = e.g. 'wlanadhocRADIO1' or 'cfg144d8f'
# DEVICE = e.g. 'wlan1-1'
olsrd_interface_needs_adding && {
. /etc/rc.common /etc/init.d/olsrd restart
}
}