diff options
| author | Jan Huwald <jh@sotun.de> | 2012-04-23 16:16:17 (GMT) |
|---|---|---|
| committer | Jan Huwald <jh@sotun.de> | 2012-04-23 16:16:17 (GMT) |
| commit | 312d7c1eb3b92e11b192c0717b1480d096db20d3 (patch) | |
| tree | 2192d6c16ff21c10db57afb9dd77eb382094c283 | |
| parent | b0b97dc9cd2b210321eca295cc06c496776f6d58 (diff) | |
do not use init.d/n2n enable/disable in FSM
Otherwise N2N might be started after next boot independent of the
inetable state.
| -rwxr-xr-x | files/common/etc/fsm/inetable/trans/queen.enter | 5 | ||||
| -rwxr-xr-x | files/common/etc/fsm/inetable/trans/queen.leave | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/files/common/etc/fsm/inetable/trans/queen.enter b/files/common/etc/fsm/inetable/trans/queen.enter index b7393dc..404b0f2 100755 --- a/files/common/etc/fsm/inetable/trans/queen.enter +++ b/files/common/etc/fsm/inetable/trans/queen.enter @@ -58,8 +58,6 @@ echo "http://$gwip/cgi-bin/splash.html? /sbin/urlencode" > /tmp/redirection_targ enable_httpd redirection $gwip:81 change_service_httpd_listen $gwip:80 /etc/init.d/uhttpd restart -/etc/init.d/n2n enable -/etc/init.d/n2n start # fill splash table splash_sync "$1" @@ -69,3 +67,6 @@ iptables -t nat -F prerouting_inet_unsplashed iptables -t nat -A prerouting_inet_unsplashed -p tcp -j DNAT --to $gwip:81 iptables -t nat -A prerouting_inet_unsplashed -p udp --dport 53 -j DNAT --to $gwip:53 # TODO: discard any other UDP traffic + +## start N2N +/etc/init.d/n2n start diff --git a/files/common/etc/fsm/inetable/trans/queen.leave b/files/common/etc/fsm/inetable/trans/queen.leave index c2cf434..cb6dfeb 100755 --- a/files/common/etc/fsm/inetable/trans/queen.leave +++ b/files/common/etc/fsm/inetable/trans/queen.leave @@ -28,5 +28,6 @@ disable_httpd redirection rm /tmp/redirection_target change_service_httpd_listen /etc/init.d/uhttpd restart -/etc/init.d/n2n disable + +# stop N2N /etc/init.d/n2n stop |