External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Remove unused variables from ebtablesContext

Browse Source 
The input_filter and nat_postrouting variables were never
used to create any firewall rules.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2014-03-07 16:54:28 +00:00
parent c383e13a37
commit ca3dafef41
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/util/virebtables.c
View File

@ -86,9 +86,7 @@ VIR_ONCE_GLOBAL_INIT(virEbTables)
struct _ebtablesContext struct _ebtablesContext
{ {
ebtRules *input_filter;
ebtRules *forward_filter; ebtRules *forward_filter;
ebtRules *nat_postrouting;
}; };
enum { enum {
@ -324,34 +322,21 @@ ebtablesContextNew(const char *driver)
{ {
bool success = false; bool success = false;
ebtablesContext *ctx = NULL; ebtablesContext *ctx = NULL;
char *input_chain = NULL;
char *forward_chain = NULL; char *forward_chain = NULL;
char *nat_chain = NULL;
if (VIR_ALLOC(ctx) < 0) if (VIR_ALLOC(ctx) < 0)
return NULL; return NULL;
if (virAsprintf(&input_chain, "libvirt_%s_INPUT", driver) < 0 || if (virAsprintf(&forward_chain, "libvirt_%s_FORWARD", driver) < 0)
virAsprintf(&forward_chain, "libvirt_%s_FORWARD", driver) < 0 ||
virAsprintf(&nat_chain, "libvirt_%s_POSTROUTING", driver) < 0) {
goto cleanup;
}
if (!(ctx->input_filter = ebtRulesNew("filter", input_chain)))
goto cleanup; goto cleanup;
if (!(ctx->forward_filter = ebtRulesNew("filter", forward_chain))) if (!(ctx->forward_filter = ebtRulesNew("filter", forward_chain)))
goto cleanup; goto cleanup;
if (!(ctx->nat_postrouting = ebtRulesNew("nat", nat_chain)))
goto cleanup;
success = true; success = true;
cleanup: cleanup:
VIR_FREE(input_chain);
VIR_FREE(forward_chain); VIR_FREE(forward_chain);
VIR_FREE(nat_chain);
if (!success) { if (!success) {
ebtablesContextFree(ctx); ebtablesContextFree(ctx);
@ -372,12 +357,8 @@ ebtablesContextFree(ebtablesContext *ctx)
{ {
if (!ctx) if (!ctx)
return; return;
if (ctx->input_filter)
ebtRulesFree(ctx->input_filter);
if (ctx->forward_filter) if (ctx->forward_filter)
ebtRulesFree(ctx->forward_filter); ebtRulesFree(ctx->forward_filter);
if (ctx->nat_postrouting)
ebtRulesFree(ctx->nat_postrouting);
VIR_FREE(ctx); VIR_FREE(ctx);
} }