mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
nwfilter: change two-state int parameters to bool
This commit is contained in:
parent
85f9178160
commit
817a67b925
@ -248,9 +248,9 @@ static int
|
|||||||
printVar(virNWFilterVarCombIterPtr vars,
|
printVar(virNWFilterVarCombIterPtr vars,
|
||||||
char *buf, int bufsize,
|
char *buf, int bufsize,
|
||||||
nwItemDescPtr item,
|
nwItemDescPtr item,
|
||||||
int *done)
|
bool *done)
|
||||||
{
|
{
|
||||||
*done = 0;
|
*done = false;
|
||||||
|
|
||||||
if ((item->flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) {
|
if ((item->flags & NWFILTER_ENTRY_ITEM_FLAG_HAS_VAR)) {
|
||||||
const char *val;
|
const char *val;
|
||||||
@ -271,7 +271,7 @@ printVar(virNWFilterVarCombIterPtr vars,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
*done = 1;
|
*done = true;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@ -283,7 +283,7 @@ _printDataType(virNWFilterVarCombIterPtr vars,
|
|||||||
nwItemDescPtr item,
|
nwItemDescPtr item,
|
||||||
bool asHex, bool directionIn)
|
bool asHex, bool directionIn)
|
||||||
{
|
{
|
||||||
int done;
|
bool done;
|
||||||
char *data;
|
char *data;
|
||||||
uint8_t ctr;
|
uint8_t ctr;
|
||||||
virBuffer vb = VIR_BUFFER_INITIALIZER;
|
virBuffer vb = VIR_BUFFER_INITIALIZER;
|
||||||
@ -971,7 +971,7 @@ static int
|
|||||||
iptablesHandleSrcMacAddr(virBufferPtr buf,
|
iptablesHandleSrcMacAddr(virBufferPtr buf,
|
||||||
virNWFilterVarCombIterPtr vars,
|
virNWFilterVarCombIterPtr vars,
|
||||||
nwItemDescPtr srcMacAddr,
|
nwItemDescPtr srcMacAddr,
|
||||||
int directionIn,
|
bool directionIn,
|
||||||
bool *srcmacskipped)
|
bool *srcmacskipped)
|
||||||
{
|
{
|
||||||
char macaddr[VIR_MAC_STRING_BUFLEN];
|
char macaddr[VIR_MAC_STRING_BUFLEN];
|
||||||
@ -1008,7 +1008,7 @@ iptablesHandleIpHdr(virBufferPtr buf,
|
|||||||
virBufferPtr afterStateMatch,
|
virBufferPtr afterStateMatch,
|
||||||
virNWFilterVarCombIterPtr vars,
|
virNWFilterVarCombIterPtr vars,
|
||||||
ipHdrDataDefPtr ipHdr,
|
ipHdrDataDefPtr ipHdr,
|
||||||
int directionIn,
|
bool directionIn,
|
||||||
bool *skipRule, bool *skipMatch,
|
bool *skipRule, bool *skipMatch,
|
||||||
virBufferPtr prefix)
|
virBufferPtr prefix)
|
||||||
{
|
{
|
||||||
@ -1204,7 +1204,7 @@ static int
|
|||||||
iptablesHandlePortData(virBufferPtr buf,
|
iptablesHandlePortData(virBufferPtr buf,
|
||||||
virNWFilterVarCombIterPtr vars,
|
virNWFilterVarCombIterPtr vars,
|
||||||
portDataDefPtr portData,
|
portDataDefPtr portData,
|
||||||
int directionIn)
|
bool directionIn)
|
||||||
{
|
{
|
||||||
char portstr[20];
|
char portstr[20];
|
||||||
const char *sport = "--sport";
|
const char *sport = "--sport";
|
||||||
@ -1270,7 +1270,7 @@ err_exit:
|
|||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
iptablesEnforceDirection(int directionIn,
|
iptablesEnforceDirection(bool directionIn,
|
||||||
virNWFilterRuleDefPtr rule,
|
virNWFilterRuleDefPtr rule,
|
||||||
virBufferPtr buf)
|
virBufferPtr buf)
|
||||||
{
|
{
|
||||||
@ -1313,7 +1313,7 @@ iptablesEnforceDirection(int directionIn,
|
|||||||
* pointed to by res, != 0 otherwise.
|
* pointed to by res, != 0 otherwise.
|
||||||
*/
|
*/
|
||||||
static int
|
static int
|
||||||
_iptablesCreateRuleInstance(int directionIn,
|
_iptablesCreateRuleInstance(bool directionIn,
|
||||||
const char *chainPrefix,
|
const char *chainPrefix,
|
||||||
virNWFilterDefPtr nwfilter,
|
virNWFilterDefPtr nwfilter,
|
||||||
virNWFilterRuleDefPtr rule,
|
virNWFilterRuleDefPtr rule,
|
||||||
@ -1801,7 +1801,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
|
|||||||
bool isIPv6)
|
bool isIPv6)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
int directionIn = 0;
|
bool directionIn = false;
|
||||||
char chainPrefix[2];
|
char chainPrefix[2];
|
||||||
bool maySkipICMP, inout = false;
|
bool maySkipICMP, inout = false;
|
||||||
char *matchState = NULL;
|
char *matchState = NULL;
|
||||||
@ -1809,7 +1809,7 @@ iptablesCreateRuleInstanceStateCtrl(virNWFilterDefPtr nwfilter,
|
|||||||
|
|
||||||
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
|
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
|
||||||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
|
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
|
||||||
directionIn = 1;
|
directionIn = true;
|
||||||
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1926,7 +1926,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter,
|
|||||||
bool isIPv6)
|
bool isIPv6)
|
||||||
{
|
{
|
||||||
int rc;
|
int rc;
|
||||||
int directionIn = 0;
|
bool directionIn = false;
|
||||||
char chainPrefix[2];
|
char chainPrefix[2];
|
||||||
bool needState = true;
|
bool needState = true;
|
||||||
bool maySkipICMP, inout = false;
|
bool maySkipICMP, inout = false;
|
||||||
@ -1944,7 +1944,7 @@ iptablesCreateRuleInstance(virNWFilterDefPtr nwfilter,
|
|||||||
|
|
||||||
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
|
if ((rule->tt == VIR_NWFILTER_RULE_DIRECTION_IN) ||
|
||||||
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
|
(rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT)) {
|
||||||
directionIn = 1;
|
directionIn = true;
|
||||||
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
inout = (rule->tt == VIR_NWFILTER_RULE_DIRECTION_INOUT);
|
||||||
if (inout)
|
if (inout)
|
||||||
needState = false;
|
needState = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user