Commit 4f0d4f88 authored by root's avatar root

Fixed bridge

parent 80a51904
...@@ -21,7 +21,7 @@ deftimeout="3600" ...@@ -21,7 +21,7 @@ deftimeout="3600"
setproctitle("dpi") setproctitle("dpi")
online_streamer = NFStreamer(source="br0", promiscuous_mode=False, splt_analysis=20, statistical_analysis=False) online_streamer = NFStreamer(source="eth1", promiscuous_mode=False, splt_analysis=20, statistical_analysis=False)
templconf = """ templconf = """
{ {
......
...@@ -7,7 +7,8 @@ UPDEV="eth0" ...@@ -7,7 +7,8 @@ UPDEV="eth0"
#DOWNDEV="ifb0" #DOWNDEV="ifb0"
#DOWNDEV="dummy1" #DOWNDEV="dummy1"
#DOWNDEV="eth1" #DOWNDEV="eth1"
DOWNDEV="br0" DOWNDEV="eth1"
DOWNISBRIDGE=false
IP="/sbin/ip" IP="/sbin/ip"
TC="/sbin/tc" TC="/sbin/tc"
IPSET="/usr/sbin/ipset" IPSET="/usr/sbin/ipset"
...@@ -57,8 +58,10 @@ if [ "$DOWNDEV" == "ifb0" ] ; then ...@@ -57,8 +58,10 @@ if [ "$DOWNDEV" == "ifb0" ] ; then
FORCEIFB=true FORCEIFB=true
fi fi
if [ x"$(brctl show | grep $DOWNDEV)" != "" ] ; then if [ $DOWNISBRIDGE ] ; then
DOWNDEV=$(ls /sys/class/net/br0/brif/) if [ x"$(brctl show | grep $DOWNDEV)" != "" ] ; then
DOWNDEV=$(ls /sys/class/net/br0/brif/)
fi
fi fi
# NOTE: Express in mbit, a bit less than the actual connections helps # NOTE: Express in mbit, a bit less than the actual connections helps
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment