External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-06 04:55:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNWFilterRuleDef: Turn 'action' and 'tt' into proper enum types

Browse Source 
Convert the fields to the proper types and use virXMLPropEnum for
parsing.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-02-16 13:14:45 +01:00
parent 43f280cc65
commit f0c5da0f24
3 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/nwfilter_conf.c
View File

@ -2373,8 +2373,6 @@ virNWFilterRuleDefFixup(virNWFilterRuleDef *rule)
static virNWFilterRuleDef * static virNWFilterRuleDef *
virNWFilterRuleParse(xmlNodePtr node) virNWFilterRuleParse(xmlNodePtr node)
{ {
g_autofree char *action = NULL;
g_autofree char *direction = NULL;
g_autofree char *prio = NULL; g_autofree char *prio = NULL;
g_autofree char *statematch = NULL; g_autofree char *statematch = NULL;
bool found; bool found;
@ -2386,38 +2384,16 @@ virNWFilterRuleParse(xmlNodePtr node)
ret = g_new0(virNWFilterRuleDef, 1); ret = g_new0(virNWFilterRuleDef, 1);
action = virXMLPropString(node, "action");
direction = virXMLPropString(node, "direction");
prio = virXMLPropString(node, "priority"); prio = virXMLPropString(node, "priority");
statematch = virXMLPropString(node, "statematch"); statematch = virXMLPropString(node, "statematch");
if (!action) { if (virXMLPropEnum(node, "action", virNWFilterRuleActionTypeFromString,
virReportError(VIR_ERR_INTERNAL_ERROR, VIR_XML_PROP_REQUIRED, &ret->action) < 0)
"%s",
_("rule node requires action attribute"));
return NULL; return NULL;
}
if ((ret->action = virNWFilterRuleActionTypeFromString(action)) < 0) { if (virXMLPropEnum(node, "direction", virNWFilterRuleDirectionTypeFromString,
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, VIR_XML_PROP_REQUIRED, &ret->tt) < 0)
"%s",
_("unknown rule action attribute value"));
return NULL; return NULL;
}
if (!direction) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s",
_("rule node requires direction attribute"));
return NULL;
}
if ((ret->tt = virNWFilterRuleDirectionTypeFromString(direction)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
"%s",
_("unknown rule direction attribute value"));
return NULL;
}
ret->priority = MAX_RULE_PRIORITY / 2; ret->priority = MAX_RULE_PRIORITY / 2;

4
src/conf/nwfilter_conf.h
View File

@ -446,8 +446,8 @@ typedef struct _virNWFilterRuleDef virNWFilterRuleDef;
struct _virNWFilterRuleDef { struct _virNWFilterRuleDef {
virNWFilterRulePriority priority; virNWFilterRulePriority priority;
virNWFilterRuleFlags flags; virNWFilterRuleFlags flags;
int action; /* virNWFilterRuleActionType */ virNWFilterRuleActionType action;
int tt; /* virNWFilterRuleDirectionType */ virNWFilterRuleDirectionType tt;
virNWFilterRuleProtocolType prtclType; virNWFilterRuleProtocolType prtclType;
union { union {
ethHdrFilterDef ethHdrFilter; ethHdrFilterDef ethHdrFilter;

5
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -2361,6 +2361,11 @@ ebtablesCreateRuleInstance(virFirewall *fw,
target = virNWFilterJumpTargetTypeToString( target = virNWFilterJumpTargetTypeToString(
VIR_NWFILTER_RULE_ACTION_DROP); VIR_NWFILTER_RULE_ACTION_DROP);
break; break;
case VIR_NWFILTER_RULE_ACTION_DROP:
case VIR_NWFILTER_RULE_ACTION_ACCEPT:
case VIR_NWFILTER_RULE_ACTION_RETURN:
case VIR_NWFILTER_RULE_ACTION_CONTINUE:
case VIR_NWFILTER_RULE_ACTION_LAST:
default: default:
target = virNWFilterJumpTargetTypeToString(rule->action); target = virNWFilterJumpTargetTypeToString(rule->action);
} }