External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-name the "flipflop" variable to "command_idx"

Browse Source
This commit is contained in:
Mark McLoughlin 2008-01-10 13:50:46 +00:00
parent cc83cda045
commit 9d04c25ab2
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Jan 10 13:50:11 GMT 2008 Mark McLoughlin <markmc@redhat.com>
* src/iptables.c: Re-name the "flipflop" variable to "command_idx"
Thu Jan 10 13:49:01 GMT 2008 Mark McLoughlin <markmc@redhat.com> Thu Jan 10 13:49:01 GMT 2008 Mark McLoughlin <markmc@redhat.com>
* src/iptables.c: make use of virFileMakePath(), * src/iptables.c: make use of virFileMakePath(),

18
src/iptables.c
View File

@ -57,7 +57,7 @@ typedef struct
{ {
char *rule; char *rule;
char **argv; char **argv;
int flipflop; int command_idx;
} iptRule; } iptRule;
typedef struct typedef struct
@ -153,7 +153,7 @@ static int
iptRulesAppend(iptRules *rules, iptRulesAppend(iptRules *rules,
char *rule, char *rule,
char **argv, char **argv,
int flipflop) int command_idx)
{ {
iptRule *r; iptRule *r;
@ -169,7 +169,7 @@ iptRulesAppend(iptRules *rules,
rules->rules[rules->nrules].rule = rule; rules->rules[rules->nrules].rule = rule;
rules->rules[rules->nrules].argv = argv; rules->rules[rules->nrules].argv = argv;
rules->rules[rules->nrules].flipflop = flipflop; rules->rules[rules->nrules].command_idx = command_idx;
rules->nrules++; rules->nrules++;
@ -343,7 +343,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...)
char **argv; char **argv;
char *rule = NULL, *p; char *rule = NULL, *p;
const char *s; const char *s;
int n, rulelen, flipflop; int n, rulelen, command_idx;
n = 1 + /* /sbin/iptables */ n = 1 + /* /sbin/iptables */
2 + /* --table foo */ 2 + /* --table foo */
@ -377,7 +377,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...)
if (!(argv[n++] = strdup(rules->table))) if (!(argv[n++] = strdup(rules->table)))
goto error; goto error;
flipflop = n; command_idx = n;
if (!(argv[n++] = strdup(action == ADD ? "--insert" : "--delete"))) if (!(argv[n++] = strdup(action == ADD ? "--insert" : "--delete")))
goto error; goto error;
@ -420,7 +420,7 @@ iptablesAddRemoveRule(iptRules *rules, int action, const char *arg, ...)
goto error; goto error;
if (action == ADD) { if (action == ADD) {
retval = iptRulesAppend(rules, rule, argv, flipflop); retval = iptRulesAppend(rules, rule, argv, command_idx);
rule = NULL; rule = NULL;
argv = NULL; argv = NULL;
} else { } else {
@ -500,14 +500,14 @@ iptRulesReload(iptRules *rules)
iptRule *rule = &rules->rules[i]; iptRule *rule = &rules->rules[i];
char *orig; char *orig;
orig = rule->argv[rule->flipflop]; orig = rule->argv[rule->command_idx];
rule->argv[rule->flipflop] = (char *) "--delete"; rule->argv[rule->command_idx] = (char *) "--delete";
if (virRun(NULL, rule->argv, NULL) < 0) if (virRun(NULL, rule->argv, NULL) < 0)
qemudLog(QEMUD_WARN, "Failed to remove iptables rule '%s' from chain '%s' in table '%s': %s", qemudLog(QEMUD_WARN, "Failed to remove iptables rule '%s' from chain '%s' in table '%s': %s",
rule->rule, rules->chain, rules->table, strerror(errno)); rule->rule, rules->chain, rules->table, strerror(errno));
rule->argv[rule->flipflop] = orig; rule->argv[rule->command_idx] = orig;
} }
if ((retval = iptablesAddRemoveChain(rules, REMOVE)) || if ((retval = iptablesAddRemoveChain(rules, REMOVE)) ||