External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-07 18:35:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

nwfilter: don't log error if firewalld is disabled, improve diagnostics

Browse Source 
The original patch to support firewalld in nwfilter wasn't personally
checking the exit status of firewall-cmd, but was instead sending NULL
in the *exitstatus arg, which meant that virCommandWait would log an
error just for the exit status being non-0 (and a "more scary than
useful" error at that).

We don't want to treat this as an error, though, just as a reason to
use standard (ip|eb)tables commands instead of firewall-cmd.

This patch modifies the virCommandRun in the nwfilter code to request
status back from the caller. This avoids virCommandWait logging an
error message, and allows the caller to do as it likes after examining
the status.

The VIR_DEBUG() logged when firewalld is enabled has also been
reworded and changed to a VIR_INFO, and a similar VIR_INFO has been
added in the case that firewalld is *not* found+enabled.
This commit is contained in:
Laine Stump 2012-08-24 01:38:19 -04:00
parent 46dc643232
commit e1602a76bd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nwfilter/nwfilter_ebiptables_driver.c
View File

@ -4140,6 +4140,7 @@ ebiptablesDriverInitWithFirewallD(void)
virBuffer buf = VIR_BUFFER_INITIALIZER;
char *firewall_cmd_path;
char *output = NULL;
int status;
int ret = -1;
if (!virNWFilterDriverIsWatchingFirewallD())
@ -4155,9 +4156,11 @@ ebiptablesDriverInitWithFirewallD(void)
"%s",
CMD_STOPONERR(1));
if (ebiptablesExecCLI(&buf, NULL, &output) == 0 &&
strlen(output) == 0) {
VIR_DEBUG("Using firewall-cmd in nwfilter_ebiptables_driver.");
if (ebiptablesExecCLI(&buf, &status, &output) < 0 ||
status != 0) {
VIR_INFO("firewalld support disabled for nwfilter");
} else {
VIR_INFO("firewalld support enabled for nwfilter");
ignore_value(virAsprintf(&ebtables_cmd_path,
"%s --direct --passthrough eb",