aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaine Stump <laine@laine.org>2012-09-21 12:11:51 -0400
committerLaine Stump <laine@laine.org>2012-09-21 20:10:43 -0400
commit5cdcb75d459f2fe42255fef4338816f7088dd0b5 (patch)
tree4e429d89ac06e76b2d979d208b35097482891da0
parentnetwork: make virNetworkObjUpdate error detection/recovery better (diff)
downloadlibvirt-5cdcb75d459f2fe42255fef4338816f7088dd0b5.tar.gz
libvirt-5cdcb75d459f2fe42255fef4338816f7088dd0b5.tar.bz2
libvirt-5cdcb75d459f2fe42255fef4338816f7088dd0b5.zip
network: log error for unknown virNetworkUpdate command codes
Every level of the code for virNetworkUpdate was assuming that some other level was checking for validity of the "command" arg, but none actually were. The result was that an invalid command code would do nothing, but also report success. Since the command code isn't used until the very lowest level backend functions, that's where I put the check. I made a separate one-line function to log the error. The compiler would have combined the identical strings used by multiple calls if I'd just called virReportError directly in each location, but sending them all to the same string in the source guards against inadvertant divergence (which would lead to extra work for translators.)
-rw-r--r--src/conf/network_conf.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index 17b964335..a2d82d432 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -2260,6 +2260,12 @@ virNetworkDefUpdateNoSupport(virNetworkDefPtr def, const char *section)
_("can't update '%s' section of network '%s'"),
section, def->name);
}
+static void
+virNetworkDefUpdateUnknownCommand(unsigned int command)
+{
+ virReportError(VIR_ERR_NO_SUPPORT,
+ _("unrecognized network update command code %d"), command);
+}
static int
virNetworkDefUpdateCheckElementName(virNetworkDefPtr def,
@@ -2484,6 +2490,9 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def,
sizeof(*ipdef->hosts) * (ipdef->nhosts - ii - 1));
ipdef->nhosts--;
ignore_value(VIR_REALLOC_N(ipdef->hosts, ipdef->nhosts));
+ } else {
+ virNetworkDefUpdateUnknownCommand(command);
+ goto cleanup;
}
ret = 0;
@@ -2581,6 +2590,9 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def,
sizeof(*ipdef->ranges) * (ipdef->nranges - ii - 1));
ipdef->nranges--;
ignore_value(VIR_REALLOC_N(ipdef->ranges, ipdef->nranges));
+ } else {
+ virNetworkDefUpdateUnknownCommand(command);
+ goto cleanup;
}
ret = 0;
@@ -2701,6 +2713,9 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def,
sizeof(*def->portGroups) * (def->nPortGroups - ii - 1));
def->nPortGroups--;
ignore_value(VIR_REALLOC_N(def->portGroups, def->nPortGroups));
+ } else {
+ virNetworkDefUpdateUnknownCommand(command);
+ goto cleanup;
}
ret = 0;