|
@@ -11,8 +11,11 @@ cmd_log () {
|
|
|
}
|
|
|
|
|
|
cmd_run () {
|
|
|
- CMD=`${2}`
|
|
|
+ CMD=`${2} 2> /dev/null`
|
|
|
ERRCODE=$?
|
|
|
+ if [ $# -eq 3 ] && [ "${3}" = "-nolog" ]; then
|
|
|
+ return ${ERRCODE}
|
|
|
+ fi
|
|
|
cmd_log ${ERRCODE} "${1}" "${ERR}: ${2}, ${CMD}"
|
|
|
return ${ERRCODE}
|
|
|
}
|
|
@@ -25,11 +28,23 @@ iptable () {
|
|
|
iptable "${IFACE}" "D" ${@}
|
|
|
fi
|
|
|
if [ $# -eq 1 ]; then
|
|
|
- cmd_run "iptable" "iptables -t nat -${OPT} POSTROUTING -s ${1} -o ${IFACE} -j MASQUERADE"
|
|
|
+ if [ "${OPT}" = "D" ]; then
|
|
|
+ cmd_run "iptable" "iptables -t nat -${OPT} POSTROUTING -s ${1} -o ${IFACE} -j MASQUERADE" "-nolog"
|
|
|
+ else
|
|
|
+ cmd_run "iptable" "iptables -t nat -${OPT} POSTROUTING -s ${1} -o ${IFACE} -j MASQUERADE"
|
|
|
+ fi
|
|
|
elif [ $# -eq 2 ]; then
|
|
|
- cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -m state --state NEW -j ${2}"
|
|
|
+ if [ "${OPT}" = "D" ]; then
|
|
|
+ cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -m state --state NEW -j ${2}" "-nolog"
|
|
|
+ else
|
|
|
+ cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -m state --state NEW -j ${2}"
|
|
|
+ fi
|
|
|
elif [ $# -eq 3 ]; then
|
|
|
- cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -o ${3} -j ${2}"
|
|
|
+ if [ "${OPT}" = "D" ]; then
|
|
|
+ cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -o ${3} -j ${2}" "-nolog"
|
|
|
+ else
|
|
|
+ cmd_run "iptable" "iptables -${OPT} ${1} -i ${IFACE} -o ${3} -j ${2}"
|
|
|
+ fi
|
|
|
else
|
|
|
cmd_log 0 "iptable" "Unknown argument length ${#} (${@})."
|
|
|
fi
|
|
@@ -39,5 +54,9 @@ ebtable () {
|
|
|
if [ "${2}" = "I" ]; then
|
|
|
ebtable "${1}" "D" "${3}"
|
|
|
fi
|
|
|
- cmd_run "ebtable" "ebtables -t broute -${2} BROUTING -p ${3} -i ${1} -j DROP"
|
|
|
+ if [ "${2}" = "D" ]; then
|
|
|
+ cmd_run "ebtable" "ebtables -t broute -${2} BROUTING -p ${3} -i ${1} -j DROP" "-nolog"
|
|
|
+ else
|
|
|
+ cmd_run "ebtable" "ebtables -t broute -${2} BROUTING -p ${3} -i ${1} -j DROP"
|
|
|
+ fi
|
|
|
}
|