Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feature: add jsoninfo to olsr and open firewall ports 9090

This commit is contained in:
Trevor Paskett - K7FPV 2016-01-05 11:00:22 -07:00
parent 3c235a0c62
commit 3359c44ca7
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/buildsteps/kconfig/003-packages
View File

@ -59,6 +59,7 @@ CONFIG_PACKAGE_olsrd-mod-dyn-gw=y
CONFIG_PACKAGE_olsrd-mod-httpinfo=y CONFIG_PACKAGE_olsrd-mod-httpinfo=y
CONFIG_PACKAGE_olsrd-mod-nameservice=y CONFIG_PACKAGE_olsrd-mod-nameservice=y
CONFIG_PACKAGE_olsrd-mod-txtinfo=y CONFIG_PACKAGE_olsrd-mod-txtinfo=y
CONFIG_PACKAGE_olsrd-mod-jsoninfo=y
CONFIG_PACKAGE_olsrd-mod-dot-draw=y CONFIG_PACKAGE_olsrd-mod-dot-draw=y
CONFIG_PACKAGE_olsrd-mod-watchdog=y CONFIG_PACKAGE_olsrd-mod-watchdog=y
CONFIG_PACKAGE_olsrd-mod-secure=y CONFIG_PACKAGE_olsrd-mod-secure=y

13
files/etc/config.mesh/firewall
View File

@ -168,3 +168,16 @@ config rule
option dest_port 161 option dest_port 161
option proto udp option proto udp
option target ACCEPT option target ACCEPT
# olsr jsoninfo
config rule
option src wifi
option dest_port 9090
option proto tcp
option target ACCEPT
config rule
option src dtdlink
option dest_port 9090
option proto tcp
option target ACCEPT

4
files/etc/config.mesh/olsrd
View File

@ -22,6 +22,10 @@ config LoadPlugin
option library 'olsrd_txtinfo.so.0.1' option library 'olsrd_txtinfo.so.0.1'
option accept '0.0.0.0' option accept '0.0.0.0'
config LoadPlugin
option library 'olsrd_jsoninfo.so.0.0'
option accept '0.0.0.0'
#config LoadPlugin #config LoadPlugin
# option library 'olsrd_secure.so.0.6' # option library 'olsrd_secure.so.0.6'
# option keyfile '/etc/olsrd.d/olsrd_secure_key' # option keyfile '/etc/olsrd.d/olsrd_secure_key'

2
files/usr/local/bin/vtun_up
View File

@ -40,6 +40,7 @@ if [ $rules_exist -eq 0 -a "$action" = "up" ] ; then
iptables -A zone_vpn -p udp -m udp --dport 698 -j ACCEPT iptables -A zone_vpn -p udp -m udp --dport 698 -j ACCEPT
iptables -A zone_vpn -p tcp -m tcp --dport 1978 -j ACCEPT iptables -A zone_vpn -p tcp -m tcp --dport 1978 -j ACCEPT
iptables -A zone_vpn -p tcp -m tcp --dport 23 -j ACCEPT iptables -A zone_vpn -p tcp -m tcp --dport 23 -j ACCEPT
iptables -A zone_vpn -p tcp -m tcp --dport 9090 -j ACCEPT
iptables -I zone_dtdlink_forward 1 -j zone_vpn_ACCEPT iptables -I zone_dtdlink_forward 1 -j zone_vpn_ACCEPT
iptables -I zone_lan_forward 1 -j zone_vpn_ACCEPT iptables -I zone_lan_forward 1 -j zone_vpn_ACCEPT
iptables -I zone_wifi_forward 1 -j zone_vpn_ACCEPT iptables -I zone_wifi_forward 1 -j zone_vpn_ACCEPT
@ -91,6 +92,7 @@ if [ $inf_count -eq 0 -a "$action" = "down" ] ; then
iptables -D zone_vpn -p udp -m udp --dport 698 -j ACCEPT iptables -D zone_vpn -p udp -m udp --dport 698 -j ACCEPT
iptables -D zone_vpn -p tcp -m tcp --dport 8080 -j ACCEPT iptables -D zone_vpn -p tcp -m tcp --dport 8080 -j ACCEPT
iptables -D zone_vpn -p tcp -m tcp --dport 2222 -j ACCEPT iptables -D zone_vpn -p tcp -m tcp --dport 2222 -j ACCEPT
iptables -D zone_vpn -p tcp -m tcp --dport 9090 -j ACCEPT
iptables -D zone_vpn -p icmp -m icmp --icmp-type 8 -j ACCEPT iptables -D zone_vpn -p icmp -m icmp --icmp-type 8 -j ACCEPT
iptables -D delegate_output -j zone_vpn_ACCEPT iptables -D delegate_output -j zone_vpn_ACCEPT
iptables -D delegate_input -i tun+ -j zone_vpn iptables -D delegate_input -i tun+ -j zone_vpn