;;
esac
- rule_in="pipe ${pipe_in} in uid $slice_id ${rule_in}"
- rule_out="pipe ${pipe_out} out uid $slice_id ${rule_out}"
+ rule_in="pipe ${pipe_in} in jail $slice_id ${rule_in} // $type $arg"
+ rule_out="pipe ${pipe_out} out jail $slice_id ${rule_out} // $type $arg"
${IPFW_CHECK} add ${rule_nr} $rule_in > /dev/null || \
abort "ipfw syntax error $rule_in"
${IPFW_CHECK} add ${rule_nr} $rule_out > /dev/null || \
$IPFW delete ${rule_nr}
$IPFW pipe delete ${pipe_in}
$IPFW pipe delete ${pipe_out}
- echo "removed configuration $slice_id} ${type} ${arg}"
+ echo "removed configuration ${slice_id} ${type} ${arg}"
[ "$TEST" = "1" ] && return
# remove from the database
grep -v -- "^${slice_id} ${type} ${arg} " $DBFILE > ${DBFILE}.tmp
do_release ${SLICE_ID} $type $args
;;
x"show")
- # XXX should filter on uid
+ # XXX should filter on jail
[ "$type" = "rules" ] && ${IPFW} show && return 0
[ "$type" = "pipes" ] && ${IPFW} pipe show && return 0
abort "'show' should be followed by {rules|pipes}"