extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-21 02:08:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make 'show dynamic <zone>' work correctly with new ipset program

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2011-06-20 17:22:04 -07:00
parent 39e74911d8
commit 7b2cbf2449
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/lib.cli
View File

@ -422,7 +422,9 @@ list_zone() {
[ -n "$(mywhich ipset)" ] || fatal_error "The ipset utility cannot be located" [ -n "$(mywhich ipset)" ] || fatal_error "The ipset utility cannot be located"
sets=$(find_sets $1) sets=$(ipset -L -n | grep '^$1_');
[ -n "$sets" ] || sets=$(find_sets $1)
for setname in $sets; do for setname in $sets; do
echo "${setname#${1}_}:" echo "${setname#${1}_}:"

15
Shorewall6/lib.cli
View File

@ -400,13 +400,6 @@ show_routing() {
# #
# 'list dynamic' command executor # 'list dynamic' command executor
# #
find_sets() {
local junk
local setname
ipset -L -n | grep "^Name: ${1}_" | while read junk setname; do echo $setname; done
}
list_zone() { list_zone() {
local sets local sets
@ -414,11 +407,11 @@ list_zone() {
[ -n "$(mywhich ipset)" ] || fatal_error "The ipset utility cannot be located" [ -n "$(mywhich ipset)" ] || fatal_error "The ipset utility cannot be located"
sets=$(find_sets $1) sets=$(ipset -L -n | grep "^6_$1_")
for setname in $sets; do for setname in $sets; do
echo "${setname#${1}_}:" echo "${setname#${1}_}:"
ipset -L $setname -n | awk 'BEGIN {prnt=0;}; \ ipset -L $setname | awk 'BEGIN {prnt=0;}; \
/^Members:/ {prnt=1; next; }; \ /^Members:/ {prnt=1; next; }; \
/^Bindings:/ {prnt=0; }; \ /^Bindings:/ {prnt=0; }; \
{ if (prnt == 1) print " ", $1; };' { if (prnt == 1) print " ", $1; };'
@ -1293,7 +1286,7 @@ add_command() {
for host in $hostlist; do for host in $hostlist; do
interface=${host%%:*} interface=${host%%:*}
ipset=${zone}_${interface}; ipset=6_${zone}_${interface};
if ! qt $IPSET -L $ipset -n; then if ! qt $IPSET -L $ipset -n; then
fatal_error "Zone $zone, interface $interface is does not have a dynamic host list" fatal_error "Zone $zone, interface $interface is does not have a dynamic host list"
@ -1352,7 +1345,7 @@ delete_command() {
for hostent in $hostlist; do for hostent in $hostlist; do
interface=${hostent%%:*} interface=${hostent%%:*}
ipset=${zone}_${interface}; ipset=6_${zone}_${interface};
if ! qt $IPSET -L $ipset -n; then if ! qt $IPSET -L $ipset -n; then
fatal_error "Zone $zone, interface $interface is does not have a dynamic host list" fatal_error "Zone $zone, interface $interface is does not have a dynamic host list"