Apply ipv4/ipv6 to whole group

firehol · Feb 3, 2014 · 097ae80 · 097ae80
1 parent d3f01d9
commit 097ae80
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/sbin/firehol.in b/sbin/firehol.in
@@ -4329,6 +4329,7 @@ group() {
 
 	case $type in
 		with|start|begin)
+			push_namespace "${FIREHOL_NS_CURR}"
 			# increase the counter
 			FIREHOL_GROUP_COUNTER=$[FIREHOL_GROUP_COUNTER + 1]
 
@@ -4362,6 +4363,7 @@ group() {
 			set_work_function "Closing group '${work_name}'. Now working under '${FIREHOL_GROUP_STACK[$FIREHOL_GROUP_DEPTH]}'"
 
 			work_name=${FIREHOL_GROUP_STACK[$FIREHOL_GROUP_DEPTH]}
+			pop_namespace
 			;;
 
 		*)
@@ -4373,6 +4375,18 @@ group() {
 	return 0
 }
 
+group4() {
+	ipv4 group "$@"
+}
+
+group6() {
+	ipv6 group "$@"
+}
+
+group46() {
+	both group "$@"
+}
+
 close_all_groups() {
 	while [ ${FIREHOL_GROUP_DEPTH} -gt 0 ]
 	do