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

This patch fixes some compilation issues for the RHEL5 build. I am also removing the IPV6 constant where it appears in the wrong place.

Browse Source
This commit is contained in:
Stefan Berger 2010-04-06 06:29:00 -04:00
parent 84fa113217
commit f7d32ce260
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/conf/nwfilter_conf.c
View File

@ -392,7 +392,9 @@ struct _virXMLAttr2Struct
static const struct int_map macProtoMap[] = {
INTMAP_ENTRY(ETHERTYPE_ARP , "arp"),
INTMAP_ENTRY(ETHERTYPE_IP , "ipv4"),
#ifdef ETHERTYPE_IPV6
INTMAP_ENTRY(ETHERTYPE_IPV6, "ipv6"),
#endif
INTMAP_ENTRY_LAST
};
@ -547,7 +549,6 @@ static const struct int_map ipProtoMap[] = {
#ifdef IPPROTO_SCTP
INTMAP_ENTRY(IPPROTO_SCTP, "sctp"),
#endif
INTMAP_ENTRY(IPPROTO_IPV6, "ipv6"),
INTMAP_ENTRY(IPPROTO_ICMPV6, "icmpv6"),
INTMAP_ENTRY_LAST
};
@ -1124,7 +1125,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
nwItemDesc *item;
int int_val;
unsigned int uint_val;
void *data_ptr, *storage_ptr;
void *data_ptr = NULL, *storage_ptr;
valueValidator validator;
char *match = virXMLPropString(node, "match");
nwIPAddress ipaddr;
@ -1550,7 +1551,7 @@ virNWFilterRuleParse(xmlNodePtr node)
char *direction;
char *prio;
int found;
int found_i;
int found_i = 0;
unsigned int priority;
xmlNodePtr cur;