mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-01-23 13:05:27 +00:00
While writing a couple of test cases for the nwfilter's XML parser I
found some cases where the output ended up not looking as expected. So the following changes are in the patch below: - if the protocol ID in the MAC header is an integer, just write it into the datastructure without trying to find a corresponding string for it and if none is found failing - when writing the protocol ID as string, simply write it as integer if no corresponding string can be found - same changes for arpOpcode parsing and printing - same changes for protocol ID in an IP packet - DSCP value needs to be written into the data structure - IP protocol version number is redundant at this level, so remove it - parse the protocol ID found inside an IP packet not only as string but also as uint8 - arrange the display of the src and destination masks to be shown after the src and destination ip address respectively in the XML - the existing libvirt IP address parser accepts for example '25' as an IP address. I want this to be parsed as a CIDR type netmask. So try to parse it as an integer first (CIDR netmask) and if that doesn't work as a dotted IP address style netmask. - instantiation of rules with MAC masks didn't work because they weren't printed into a buffer, yet.
This commit is contained in:
Stefan Berger
parent
6cbc33063a
commit
e813200714
@ -403,19 +403,17 @@ checkMacProtocolID(enum attrDatatype datatype, void *value,
|
||||
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED)
|
||||
{
|
||||
int32_t res = -1;
|
||||
const char *str;
|
||||
|
||||
if (datatype == DATATYPE_STRING) {
|
||||
if (intMapGetByString(macProtoMap, (char *)value, 1, &res) == 0)
|
||||
res = -1;
|
||||
} else if (datatype == DATATYPE_UINT16) {
|
||||
if (intMapGetByInt(macProtoMap,
|
||||
(int32_t)*(uint16_t *)value, &str) == 0)
|
||||
res = -1;
|
||||
res = (uint32_t)*(uint16_t *)value;
|
||||
}
|
||||
|
||||
if (res != -1) {
|
||||
nwf->p.ethHdrFilter.dataProtocolID.u.u16 = res;
|
||||
nwf->p.ethHdrFilter.dataProtocolID.datatype = DATATYPE_UINT16;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -433,9 +431,10 @@ macProtocolIDFormatter(virBufferPtr buf,
|
||||
nwf->p.ethHdrFilter.dataProtocolID.u.u16,
|
||||
&str)) {
|
||||
virBufferVSprintf(buf, "%s", str);
|
||||
return 1;
|
||||
} else {
|
||||
virBufferVSprintf(buf, "%d", nwf->p.ethHdrFilter.dataProtocolID.u.u16);
|
||||
}
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@ -500,15 +499,12 @@ arpOpcodeValidator(enum attrDatatype datatype,
|
||||
virNWFilterRuleDefPtr nwf)
|
||||
{
|
||||
int32_t res = -1;
|
||||
const char *str;
|
||||
|
||||
if (datatype == DATATYPE_STRING) {
|
||||
if (intMapGetByString(arpOpcodeMap, (char *)value, 1, &res) == 0)
|
||||
res = -1;
|
||||
} else if (datatype == DATATYPE_UINT16) {
|
||||
if (intMapGetByInt(arpOpcodeMap,
|
||||
(uint32_t)*(uint16_t *)value, &str) == 0)
|
||||
res = -1;
|
||||
res = (uint32_t)*(uint16_t *)value;
|
||||
}
|
||||
|
||||
if (res != -1) {
|
||||
@ -530,9 +526,10 @@ arpOpcodeFormatter(virBufferPtr buf,
|
||||
nwf->p.arpHdrFilter.dataOpcode.u.u16,
|
||||
&str)) {
|
||||
virBufferVSprintf(buf, "%s", str);
|
||||
return 1;
|
||||
} else {
|
||||
virBufferVSprintf(buf, "%d", nwf->p.arpHdrFilter.dataOpcode.u.u16);
|
||||
}
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
@ -560,16 +557,12 @@ static bool checkIPProtocolID(enum attrDatatype datatype,
|
||||
virNWFilterRuleDefPtr nwf)
|
||||
{
|
||||
int32_t res = -1;
|
||||
const char *str;
|
||||
|
||||
if (datatype == DATATYPE_STRING) {
|
||||
if (intMapGetByString(ipProtoMap, (char *)value, 1, &res) == 0)
|
||||
res = -1;
|
||||
} else if (datatype == DATATYPE_UINT8) {
|
||||
// may just accept what user provides and not test...
|
||||
if (intMapGetByInt(ipProtoMap,
|
||||
(uint32_t)*(uint16_t *)value, &str) == 0)
|
||||
res = -1;
|
||||
res = (uint32_t)*(uint16_t *)value;
|
||||
}
|
||||
|
||||
if (res != -1) {
|
||||
@ -591,19 +584,25 @@ formatIPProtocolID(virBufferPtr buf,
|
||||
nwf->p.ipHdrFilter.ipHdr.dataProtocolID.u.u8,
|
||||
&str)) {
|
||||
virBufferVSprintf(buf, "%s", str);
|
||||
return 1;
|
||||
} else {
|
||||
virBufferVSprintf(buf, "%d",
|
||||
nwf->p.ipHdrFilter.ipHdr.dataProtocolID.u.u8);
|
||||
}
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
static bool
|
||||
dscpValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, void *val,
|
||||
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED)
|
||||
virNWFilterRuleDefPtr nwf)
|
||||
{
|
||||
uint8_t dscp = *(uint16_t *)val;
|
||||
if (dscp > 63)
|
||||
return 0;
|
||||
|
||||
nwf->p.ipHdrFilter.ipHdr.dataDSCP.u.u8 = dscp;
|
||||
nwf->p.ipHdrFilter.ipHdr.dataDSCP.datatype = DATATYPE_UINT8;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -684,26 +683,21 @@ static const virXMLAttr2Struct arpAttributes[] = {
|
||||
|
||||
static const virXMLAttr2Struct ipAttributes[] = {
|
||||
COMMON_MAC_PROPS(ipHdrFilter),
|
||||
{
|
||||
.name = "version",
|
||||
.datatype = DATATYPE_UINT8,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataIPVersion),
|
||||
},
|
||||
{
|
||||
.name = SRCIPADDR,
|
||||
.datatype = DATATYPE_IPADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataSrcIPAddr),
|
||||
},
|
||||
{
|
||||
.name = DSTIPADDR,
|
||||
.datatype = DATATYPE_IPADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataDstIPAddr),
|
||||
},
|
||||
{
|
||||
.name = SRCIPMASK,
|
||||
.datatype = DATATYPE_IPMASK,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataSrcIPMask),
|
||||
},
|
||||
{
|
||||
.name = DSTIPADDR,
|
||||
.datatype = DATATYPE_IPADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataDstIPAddr),
|
||||
},
|
||||
{
|
||||
.name = DSTIPMASK,
|
||||
.datatype = DATATYPE_IPMASK,
|
||||
@ -711,7 +705,7 @@ static const virXMLAttr2Struct ipAttributes[] = {
|
||||
},
|
||||
{
|
||||
.name = "protocol",
|
||||
.datatype = DATATYPE_STRING,
|
||||
.datatype = DATATYPE_STRING | DATATYPE_UINT8,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipHdrFilter.ipHdr.dataProtocolID),
|
||||
.validator= checkIPProtocolID,
|
||||
.formatter= formatIPProtocolID,
|
||||
@ -755,16 +749,16 @@ static const virXMLAttr2Struct ipv6Attributes[] = {
|
||||
.datatype = DATATYPE_IPV6ADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipv6HdrFilter.ipHdr.dataSrcIPAddr),
|
||||
},
|
||||
{
|
||||
.name = DSTIPADDR,
|
||||
.datatype = DATATYPE_IPV6ADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipv6HdrFilter.ipHdr.dataDstIPAddr),
|
||||
},
|
||||
{
|
||||
.name = SRCIPMASK,
|
||||
.datatype = DATATYPE_IPV6MASK,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipv6HdrFilter.ipHdr.dataSrcIPMask),
|
||||
},
|
||||
{
|
||||
.name = DSTIPADDR,
|
||||
.datatype = DATATYPE_IPV6ADDR,
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.ipv6HdrFilter.ipHdr.dataDstIPAddr),
|
||||
},
|
||||
{
|
||||
.name = DSTIPMASK,
|
||||
.datatype = DATATYPE_IPV6MASK,
|
||||
@ -817,16 +811,16 @@ static const virXMLAttr2Struct ipv6Attributes[] = {
|
||||
.datatype = ADDRTYPE,\
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataSrcIPAddr),\
|
||||
},\
|
||||
{\
|
||||
.name = DSTIPADDR,\
|
||||
.datatype = ADDRTYPE,\
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDstIPAddr),\
|
||||
},\
|
||||
{\
|
||||
.name = SRCIPMASK,\
|
||||
.datatype = MASKTYPE,\
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataSrcIPMask),\
|
||||
},\
|
||||
{\
|
||||
.name = DSTIPADDR,\
|
||||
.datatype = ADDRTYPE,\
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDstIPAddr),\
|
||||
},\
|
||||
{\
|
||||
.name = DSTIPMASK,\
|
||||
.datatype = MASKTYPE,\
|
||||
@ -856,7 +850,7 @@ static const virXMLAttr2Struct ipv6Attributes[] = {
|
||||
.name = DSCP,\
|
||||
.datatype = DATATYPE_UINT8,\
|
||||
.dataIdx = offsetof(virNWFilterRuleDef, p.STRUCT.ipHdr.dataDSCP),\
|
||||
.validator = dscpValidator,\
|
||||
/*.validator = dscpValidator,*/\
|
||||
}
|
||||
|
||||
#define COMMON_PORT_PROPS(STRUCT) \
|
||||
@ -1276,8 +1270,7 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
|
||||
case DATATYPE_IPMASK:
|
||||
storage_ptr = &item->u.u8;
|
||||
if (!virNWIPv4AddressParser(prop, &ipaddr)) {
|
||||
if (sscanf(prop, "%d", &int_val) == 1) {
|
||||
if (virStrToLong_i(prop, NULL, 10, &int_val) == 0) {
|
||||
if (int_val >= 0 && int_val <= 32) {
|
||||
if (!validator)
|
||||
*(uint8_t *)storage_ptr =
|
||||
@ -1286,9 +1279,8 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
data_ptr = &int_val;
|
||||
} else
|
||||
rc = -1;
|
||||
} else
|
||||
rc = -1;
|
||||
} else {
|
||||
if (virNWIPv4AddressParser(prop, &ipaddr)) {
|
||||
int_val = virSocketGetNumNetmaskBits(
|
||||
&ipaddr.addr);
|
||||
if (int_val >= 0)
|
||||
@ -1296,6 +1288,8 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
else
|
||||
rc = -1;
|
||||
found = 1;
|
||||
} else
|
||||
rc = -1;
|
||||
}
|
||||
break;
|
||||
|
||||
@ -1330,8 +1324,7 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
|
||||
case DATATYPE_IPV6MASK:
|
||||
storage_ptr = &item->u.u8;
|
||||
if (!virNWIPv6AddressParser(prop, &ipaddr)) {
|
||||
if (sscanf(prop, "%d", &int_val) == 1) {
|
||||
if (virStrToLong_i(prop, NULL, 10, &int_val) == 0) {
|
||||
if (int_val >= 0 && int_val <= 128) {
|
||||
if (!validator)
|
||||
*(uint8_t *)storage_ptr =
|
||||
@ -1340,9 +1333,8 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
data_ptr = &int_val;
|
||||
} else
|
||||
rc = -1;
|
||||
} else
|
||||
rc = -1;
|
||||
} else {
|
||||
if (virNWIPv6AddressParser(prop, &ipaddr)) {
|
||||
int_val = virSocketGetNumNetmaskBits(
|
||||
&ipaddr.addr);
|
||||
if (int_val >= 0)
|
||||
@ -1350,6 +1342,8 @@ virNWFilterRuleDetailsParse(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
else
|
||||
rc = -1;
|
||||
found = 1;
|
||||
} else
|
||||
rc = -1;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
@ -189,6 +189,7 @@ printDataType(virConnectPtr conn,
|
||||
break;
|
||||
|
||||
case DATATYPE_MACADDR:
|
||||
case DATATYPE_MACMASK:
|
||||
if (bufsize < VIR_MAC_STRING_BUFLEN) {
|
||||
virNWFilterReportError(conn, VIR_ERR_INVALID_NWFILTER,
|
||||
_("Buffer too small for MAC address"));
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user