External/libvirt
1
0
Fork 0
Code

conf: Adjust coding style for nwfilter conf sources

Browse Source 
Alter the format of the code to follow more recent style guidelines of
two empty lines between functions, function decls with "[static] type"
on one line followed by function name with arguments to functions each
on one line.
This commit is contained in:
John Ferlan 2017-03-02 12:13:02 -05:00
parent 079747a36d
commit d82aee6add
2 changed files with 99 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/conf/nwfilter_conf.c
View File

@ -139,6 +139,7 @@ static const struct int_map chain_priorities[] = {
INTMAP_ENTRY_LAST, INTMAP_ENTRY_LAST,
}; };
/* /*
* only one filter update allowed * only one filter update allowed
*/ */
@ -151,12 +152,14 @@ virNWFilterReadLockFilterUpdates(void)
virRWLockRead(&updateLock); virRWLockRead(&updateLock);
} }
void void
virNWFilterWriteLockFilterUpdates(void) virNWFilterWriteLockFilterUpdates(void)
{ {
virRWLockWrite(&updateLock); virRWLockWrite(&updateLock);
} }
void void
virNWFilterUnlockFilterUpdates(void) virNWFilterUnlockFilterUpdates(void)
{ {
@ -164,7 +167,6 @@ virNWFilterUnlockFilterUpdates(void)
} }
/* /*
* attribute names for the rules XML * attribute names for the rules XML
*/ */
@ -234,7 +236,9 @@ static const char ipsetflags_str[] = "ipsetflags";
* lookup a map entry given the integer. * lookup a map entry given the integer.
*/ */
static int static int
intMapGetByInt(const struct int_map *intmap, int32_t attr, const char **res) intMapGetByInt(const struct int_map *intmap,
int32_t attr,
const char **res)
{ {
size_t i = 0; size_t i = 0;
bool found = false; bool found = false;
@ -263,7 +267,9 @@ intMapGetByInt(const struct int_map *intmap, int32_t attr, const char **res)
* value. Returns 0 if entry was found with result returned, -1 otherwise. * value. Returns 0 if entry was found with result returned, -1 otherwise.
*/ */
static int static int
intMapGetByString(const struct int_map *intmap, const char *str, int casecmp, intMapGetByString(const struct int_map *intmap,
const char *str,
int casecmp,
int32_t *result) int32_t *result)
{ {
size_t i = 0; size_t i = 0;
@ -428,7 +434,8 @@ static const struct int_map macProtoMap[] = {
static bool static bool
checkMacProtocolID(enum attrDatatype datatype, union data *value, checkMacProtocolID(enum attrDatatype datatype,
union data *value,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
nwItemDesc *item ATTRIBUTE_UNUSED) nwItemDesc *item ATTRIBUTE_UNUSED)
{ {
@ -478,7 +485,8 @@ macProtocolIDFormatter(virBufferPtr buf,
static bool static bool
checkVlanVlanID(enum attrDatatype datatype, union data *value, checkVlanVlanID(enum attrDatatype datatype,
union data *value,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
nwItemDesc *item ATTRIBUTE_UNUSED) nwItemDesc *item ATTRIBUTE_UNUSED)
{ {
@ -497,8 +505,10 @@ checkVlanVlanID(enum attrDatatype datatype, union data *value,
return false; return false;
} }
static bool static bool
checkVlanProtocolID(enum attrDatatype datatype, union data *value, checkVlanProtocolID(enum attrDatatype datatype,
union data *value,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
nwItemDesc *item ATTRIBUTE_UNUSED) nwItemDesc *item ATTRIBUTE_UNUSED)
{ {
@ -524,6 +534,7 @@ checkVlanProtocolID(enum attrDatatype datatype, union data *value,
return false; return false;
} }
static bool static bool
vlanProtocolIDFormatter(virBufferPtr buf, vlanProtocolIDFormatter(virBufferPtr buf,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
@ -545,12 +556,14 @@ vlanProtocolIDFormatter(virBufferPtr buf,
return true; return true;
} }
/* generic function to check for a valid (ipv4,ipv6, mac) mask /* generic function to check for a valid (ipv4,ipv6, mac) mask
* A mask is valid of there is a sequence of 1's followed by a sequence * A mask is valid of there is a sequence of 1's followed by a sequence
* of 0s or only 1s or only 0s * of 0s or only 1s or only 0s
*/ */
static bool static bool
checkValidMask(unsigned char *data, int len) checkValidMask(unsigned char *data,
int len)
{ {
uint32_t idx = 0; uint32_t idx = 0;
uint8_t mask = 0x80; uint8_t mask = 0x80;
@ -712,7 +725,8 @@ formatIPProtocolID(virBufferPtr buf,
static bool static bool
dscpValidator(enum attrDatatype datatype, union data *val, dscpValidator(enum attrDatatype datatype,
union data *val,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
nwItemDesc *item ATTRIBUTE_UNUSED) nwItemDesc *item ATTRIBUTE_UNUSED)
{ {
@ -738,7 +752,9 @@ static const struct int_map stateMatchMap[] = {
static int static int
parseStringItems(const struct int_map *int_map, parseStringItems(const struct int_map *int_map,
const char *input, int32_t *flags, char sep) const char *input,
int32_t *flags,
char sep)
{ {
int rc = 0; int rc = 0;
size_t i, j; size_t i, j;
@ -770,8 +786,10 @@ parseStringItems(const struct int_map *int_map,
static int static int
printStringItems(virBufferPtr buf, const struct int_map *int_map, printStringItems(virBufferPtr buf,
int32_t flags, const char *sep) const struct int_map *int_map,
int32_t flags,
const char *sep)
{ {
size_t i; size_t i;
unsigned int c = 0; unsigned int c = 0;
@ -799,7 +817,8 @@ printStringItems(virBufferPtr buf, const struct int_map *int_map,
static int static int
parseStateMatch(const char *statematch, int32_t *flags) parseStateMatch(const char *statematch,
int32_t *flags)
{ {
int rc = parseStringItems(stateMatchMap, statematch, flags, ','); int rc = parseStringItems(stateMatchMap, statematch, flags, ',');
@ -811,8 +830,10 @@ parseStateMatch(const char *statematch, int32_t *flags)
void void
virNWFilterPrintStateMatchFlags(virBufferPtr buf, const char *prefix, virNWFilterPrintStateMatchFlags(virBufferPtr buf,
int32_t flags, bool disp_none) const char *prefix,
int32_t flags,
bool disp_none)
{ {
if (!disp_none && (flags & RULE_FLAG_STATE_NONE)) if (!disp_none && (flags & RULE_FLAG_STATE_NONE))
return; return;
@ -824,7 +845,8 @@ virNWFilterPrintStateMatchFlags(virBufferPtr buf, const char *prefix,
static bool static bool
stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED,
union data *val,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
nwItemDesc *item) nwItemDesc *item)
{ {
@ -854,7 +876,6 @@ stateFormatter(virBufferPtr buf,
} }
static const struct int_map tcpFlags[] = { static const struct int_map tcpFlags[] = {
INTMAP_ENTRY(0x1, "FIN"), INTMAP_ENTRY(0x1, "FIN"),
INTMAP_ENTRY(0x2, "SYN"), INTMAP_ENTRY(0x2, "SYN"),
@ -869,7 +890,8 @@ static const struct int_map tcpFlags[] = {
static bool static bool
tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED,
union data *val,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
nwItemDesc *item) nwItemDesc *item)
{ {
@ -900,7 +922,8 @@ tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val,
static void static void
printTCPFlags(virBufferPtr buf, uint8_t flags) printTCPFlags(virBufferPtr buf,
uint8_t flags)
{ {
if (flags == 0) if (flags == 0)
virBufferAddLit(buf, "NONE"); virBufferAddLit(buf, "NONE");
@ -934,8 +957,10 @@ tcpFlagsFormatter(virBufferPtr buf,
return true; return true;
} }
static bool static bool
ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED,
union data *val,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
nwItemDesc *item) nwItemDesc *item)
{ {
@ -961,6 +986,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val,
return false; return false;
} }
static bool static bool
ipsetFormatter(virBufferPtr buf, ipsetFormatter(virBufferPtr buf,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
@ -971,9 +997,12 @@ ipsetFormatter(virBufferPtr buf,
return true; return true;
} }
static bool static bool
ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val, ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, nwItemDesc *item) union data *val,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
nwItemDesc *item)
{ {
const char *errmsg = NULL; const char *errmsg = NULL;
size_t idx = 0; size_t idx = 0;
@ -1007,6 +1036,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, union data *val
return false; return false;
} }
static bool static bool
ipsetFlagsFormatter(virBufferPtr buf, ipsetFlagsFormatter(virBufferPtr buf,
virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED,
@ -1026,6 +1056,7 @@ ipsetFlagsFormatter(virBufferPtr buf,
return true; return true;
} }
#define COMMON_MAC_PROPS(STRUCT) \ #define COMMON_MAC_PROPS(STRUCT) \
{\ {\
.name = SRCMACADDR,\ .name = SRCMACADDR,\
@ -1756,6 +1787,7 @@ static const virAttributes virAttr[] = {
PROTOCOL_ENTRY_LAST PROTOCOL_ENTRY_LAST
}; };
static int static int
virNWFilterRuleDetailsParse(xmlNodePtr node, virNWFilterRuleDetailsParse(xmlNodePtr node,
virNWFilterRuleDefPtr nwf, virNWFilterRuleDefPtr nwf,
@ -2024,8 +2056,6 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
} }
static virNWFilterIncludeDefPtr static virNWFilterIncludeDefPtr
virNWFilterIncludeParse(xmlNodePtr cur) virNWFilterIncludeParse(xmlNodePtr cur)
{ {
@ -2055,6 +2085,7 @@ virNWFilterIncludeParse(xmlNodePtr cur)
goto cleanup; goto cleanup;
} }
static void static void
virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr) virNWFilterRuleDefFixupIPSet(ipHdrDataDefPtr ipHdr)
{ {
@ -2129,6 +2160,7 @@ virNWFilterRuleValidate(virNWFilterRuleDefPtr rule)
return ret; return ret;
} }
static void static void
virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule) virNWFilterRuleDefFixup(virNWFilterRuleDefPtr rule)
{ {
@ -2464,6 +2496,7 @@ virNWFilterRuleParse(xmlNodePtr node)
goto cleanup; goto cleanup;
} }
static bool static bool
virNWFilterIsValidChainName(const char *chainname) virNWFilterIsValidChainName(const char *chainname)
{ {
@ -2484,6 +2517,7 @@ virNWFilterIsValidChainName(const char *chainname)
return true; return true;
} }
/* /*
* Test whether the name of the chain is supported. * Test whether the name of the chain is supported.
* It current has to have a prefix of either one of the strings found in * It current has to have a prefix of either one of the strings found in
@ -2541,6 +2575,7 @@ virNWFilterIsAllowedChain(const char *chainname)
return NULL; return NULL;
} }
static virNWFilterDefPtr static virNWFilterDefPtr
virNWFilterDefParseXML(xmlXPathContextPtr ctxt) virNWFilterDefParseXML(xmlXPathContextPtr ctxt)
{ {
@ -2731,9 +2766,10 @@ virNWFilterDefParseFile(const char *filename)
} }
int virNWFilterSaveXML(const char *configDir, int
virNWFilterDefPtr def, virNWFilterSaveXML(const char *configDir,
const char *xml) virNWFilterDefPtr def,
const char *xml)
{ {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
char *configFile = NULL; char *configFile = NULL;
@ -2760,8 +2796,9 @@ int virNWFilterSaveXML(const char *configDir,
} }
int virNWFilterSaveConfig(const char *configDir, int
virNWFilterDefPtr def) virNWFilterSaveConfig(const char *configDir,
virNWFilterDefPtr def)
{ {
int ret = -1; int ret = -1;
char *xml; char *xml;
@ -2790,6 +2827,7 @@ virNWFilterRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd)
callbackDrvArray[nCallbackDriver++] = cbd; callbackDrvArray[nCallbackDriver++] = cbd;
} }
void void
virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd) virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd)
{ {
@ -2806,6 +2844,7 @@ virNWFilterUnRegisterCallbackDriver(virNWFilterCallbackDriverPtr cbd)
} }
} }
void void
virNWFilterCallbackDriversLock(void) virNWFilterCallbackDriversLock(void)
{ {
@ -2815,6 +2854,7 @@ virNWFilterCallbackDriversLock(void)
callbackDrvArray[i]->vmDriverLock(); callbackDrvArray[i]->vmDriverLock();
} }
void void
virNWFilterCallbackDriversUnlock(void) virNWFilterCallbackDriversUnlock(void)
{ {
@ -2850,6 +2890,7 @@ virNWFilterInstFiltersOnAllVMs(void)
return 0; return 0;
} }
int int
virNWFilterTriggerVMFilterRebuild(void) virNWFilterTriggerVMFilterRebuild(void)
{ {
@ -2952,7 +2993,8 @@ virNWFilterDeleteDef(const char *configDir,
static void static void
virNWIPAddressFormat(virBufferPtr buf, virSocketAddrPtr ipaddr) virNWIPAddressFormat(virBufferPtr buf,
virSocketAddrPtr ipaddr)
{ {
char *output = virSocketAddrFormat(ipaddr); char *output = virSocketAddrFormat(ipaddr);
@ -3106,7 +3148,8 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
static int static int
virNWFilterRuleDefFormat(virBufferPtr buf, virNWFilterRuleDefPtr def) virNWFilterRuleDefFormat(virBufferPtr buf,
virNWFilterRuleDefPtr def)
{ {
size_t i; size_t i;
bool subelement = false; bool subelement = false;
@ -3145,7 +3188,8 @@ virNWFilterRuleDefFormat(virBufferPtr buf, virNWFilterRuleDefPtr def)
static int static int
virNWFilterEntryFormat(virBufferPtr buf, virNWFilterEntryPtr entry) virNWFilterEntryFormat(virBufferPtr buf,
virNWFilterEntryPtr entry)
{ {
if (entry->rule) if (entry->rule)
return virNWFilterRuleDefFormat(buf, entry->rule); return virNWFilterRuleDefFormat(buf, entry->rule);
@ -3192,8 +3236,9 @@ virNWFilterDefFormat(const virNWFilterDef *def)
} }
char *virNWFilterConfigFile(const char *dir, char *
const char *name) virNWFilterConfigFile(const char *dir,
const char *name)
{ {
char *ret = NULL; char *ret = NULL;
@ -3202,8 +3247,9 @@ char *virNWFilterConfigFile(const char *dir,
} }
int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB, int
void *opaque) virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
void *opaque)
{ {
if (initialized) if (initialized)
return -1; return -1;
@ -3220,7 +3266,8 @@ int virNWFilterConfLayerInit(virDomainObjListIterator domUpdateCB,
} }
void virNWFilterConfLayerShutdown(void) void
virNWFilterConfLayerShutdown(void)
{ {
if (!initialized) if (!initialized)
return; return;
@ -3233,7 +3280,8 @@ void virNWFilterConfLayerShutdown(void)
} }
bool virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule) bool
virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule)
{ {
if (rule->prtclType >= VIR_NWFILTER_RULE_PROTOCOL_TCP && if (rule->prtclType >= VIR_NWFILTER_RULE_PROTOCOL_TCP &&
rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_ALL) rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_ALL)
@ -3242,7 +3290,8 @@ bool virNWFilterRuleIsProtocolIPv4(virNWFilterRuleDefPtr rule)
} }
bool virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule) bool
virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule)
{ {
if (rule->prtclType >= VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6 && if (rule->prtclType >= VIR_NWFILTER_RULE_PROTOCOL_TCPoIPV6 &&
rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_ALLoIPV6) rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_ALLoIPV6)
@ -3251,7 +3300,8 @@ bool virNWFilterRuleIsProtocolIPv6(virNWFilterRuleDefPtr rule)
} }
bool virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule) bool
virNWFilterRuleIsProtocolEthernet(virNWFilterRuleDefPtr rule)
{ {
if (rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_IPV6) if (rule->prtclType <= VIR_NWFILTER_RULE_PROTOCOL_IPV6)
return true; return true;

14
src/conf/virnwfilterobj.c
View File

@ -100,7 +100,8 @@ virNWFilterObjFindByUUID(virNWFilterObjListPtr nwfilters,
virNWFilterObjPtr virNWFilterObjPtr
virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters, const char *name) virNWFilterObjFindByName(virNWFilterObjListPtr nwfilters,
const char *name)
{ {
size_t i; size_t i;
@ -187,8 +188,10 @@ virNWFilterTestUnassignDef(virNWFilterObjPtr nwfilter)
return rc; return rc;
} }
static bool static bool
virNWFilterDefEqual(const virNWFilterDef *def1, virNWFilterDefPtr def2, virNWFilterDefEqual(const virNWFilterDef *def1,
virNWFilterDefPtr def2,
bool cmpUUIDs) bool cmpUUIDs)
{ {
bool ret = false; bool ret = false;
@ -217,6 +220,7 @@ virNWFilterDefEqual(const virNWFilterDef *def1, virNWFilterDefPtr def2,
return ret; return ret;
} }
virNWFilterObjPtr virNWFilterObjPtr
virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters, virNWFilterObjAssignDef(virNWFilterObjListPtr nwfilters,
virNWFilterDefPtr def) virNWFilterDefPtr def)
@ -370,13 +374,15 @@ virNWFilterLoadAllConfigs(virNWFilterObjListPtr nwfilters,
} }
void virNWFilterObjLock(virNWFilterObjPtr obj) void
virNWFilterObjLock(virNWFilterObjPtr obj)
{ {
virMutexLock(&obj->lock); virMutexLock(&obj->lock);
} }
void virNWFilterObjUnlock(virNWFilterObjPtr obj) void
virNWFilterObjUnlock(virNWFilterObjPtr obj)
{ {
virMutexUnlock(&obj->lock); virMutexUnlock(&obj->lock);
} }