Merge a99c7a3b61
into 2750b16b47
This commit is contained in:
commit
220b88a20f
|
@ -829,6 +829,7 @@ mwan3_set_user_iptables_rule()
|
||||||
[ -z "$dest_ip" ] && unset dest_ip
|
[ -z "$dest_ip" ] && unset dest_ip
|
||||||
[ -z "$src_ip" ] && unset src_ip
|
[ -z "$src_ip" ] && unset src_ip
|
||||||
[ -z "$ipset" ] && unset ipset
|
[ -z "$ipset" ] && unset ipset
|
||||||
|
[ -z "$ipset_src" ] && unset ipset_src
|
||||||
[ -z "$src_port" ] && unset src_port
|
[ -z "$src_port" ] && unset src_port
|
||||||
[ -z "$dest_port" ] && unset dest_port
|
[ -z "$dest_port" ] && unset dest_port
|
||||||
if [ "$proto" != 'tcp' ] && [ "$proto" != 'udp' ]; then
|
if [ "$proto" != 'tcp' ] && [ "$proto" != 'udp' ]; then
|
||||||
|
@ -851,6 +852,10 @@ mwan3_set_user_iptables_rule()
|
||||||
ipset="-m set --match-set $ipset dst"
|
ipset="-m set --match-set $ipset dst"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ -n "$ipset_src" ]; then
|
||||||
|
ipset_src="-m set --match-set $ipset_src src"
|
||||||
|
fi
|
||||||
|
|
||||||
if [ -z "$use_policy" ]; then
|
if [ -z "$use_policy" ]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
@ -899,7 +904,7 @@ mwan3_set_user_iptables_rule()
|
||||||
${src_ip:+-s} $src_ip \
|
${src_ip:+-s} $src_ip \
|
||||||
${src_dev:+-i} $src_dev \
|
${src_dev:+-i} $src_dev \
|
||||||
${dest_ip:+-d} $dest_ip \
|
${dest_ip:+-d} $dest_ip \
|
||||||
$ipset \
|
$ipset $ipset_src \
|
||||||
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
|
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
|
||||||
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
|
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
|
||||||
-m mark --mark 0/$MMX_MASK \
|
-m mark --mark 0/$MMX_MASK \
|
||||||
|
@ -912,7 +917,7 @@ mwan3_set_user_iptables_rule()
|
||||||
${src_ip:+-s} $src_ip \
|
${src_ip:+-s} $src_ip \
|
||||||
${src_dev:+-i} $src_dev \
|
${src_dev:+-i} $src_dev \
|
||||||
${dest_ip:+-d} $dest_ip \
|
${dest_ip:+-d} $dest_ip \
|
||||||
$ipset \
|
$ipset $ipset_src \
|
||||||
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
|
${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
|
||||||
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
|
${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
|
||||||
-m mark --mark 0/$MMX_MASK \
|
-m mark --mark 0/$MMX_MASK \
|
||||||
|
|
Loading…
Reference in New Issue