diff --git a/AUTHORS b/AUTHORS index 0b7f76afcc..b3da70523c 100644 --- a/AUTHORS +++ b/AUTHORS @@ -198,6 +198,7 @@ Patches have also been contributed by: Tang Chen Dan HorĂ¡k Sage Weil + David L Stevens [....send patches to get your name here....] diff --git a/docs/formatnwfilter.html.in b/docs/formatnwfilter.html.in index 8df4a93040..5e9daeaddf 100644 --- a/docs/formatnwfilter.html.in +++ b/docs/formatnwfilter.html.in @@ -258,11 +258,19 @@

  • - action -- mandatory; must either be drop, - reject(since 0.9.0), - or accept if - the evaluation of the filtering rule is supposed to drop, - reject (using ICMP message), or accept a packet + action -- mandatory; must either be drop + (matching the rule silently discards the packet with no + further analysis), + reject (matching the rule generates an ICMP + reject message with no further analysis) (since + 0.9.0), accept (matching the rule accepts + the packet with no further analysis), return + (matching the rule passes this filter, but returns control to + the calling filter for further + analysis) (since 0.9.7), + or continue (matching the rule goes on to the next + rule for further analysis) (since + 0.9.7).
  • direction -- mandatory; must either be in, out or diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 08ede48fa9..e0c2fb630f 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -55,12 +55,16 @@ VIR_ENUM_IMPL(virNWFilterRuleAction, VIR_NWFILTER_RULE_ACTION_LAST, "drop", "accept", - "reject"); + "reject", + "return", + "continue"); VIR_ENUM_IMPL(virNWFilterJumpTarget, VIR_NWFILTER_RULE_ACTION_LAST, "DROP", "ACCEPT", - "REJECT"); + "REJECT", + "RETURN", + "CONTINUE"); VIR_ENUM_IMPL(virNWFilterRuleDirection, VIR_NWFILTER_RULE_DIRECTION_LAST, "in", diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 5306403a78..c96851aabb 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -299,6 +299,8 @@ enum virNWFilterRuleActionType { VIR_NWFILTER_RULE_ACTION_DROP = 0, VIR_NWFILTER_RULE_ACTION_ACCEPT, VIR_NWFILTER_RULE_ACTION_REJECT, + VIR_NWFILTER_RULE_ACTION_RETURN, + VIR_NWFILTER_RULE_ACTION_CONTINUE, VIR_NWFILTER_RULE_ACTION_LAST, };