From: Martin Kletzander Date: Wed, 3 Jun 2015 10:46:36 +0000 (+0200) Subject: util: Clear output broadcast address before filling it in X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=99cc11b924548ae58b60e80e14467387baf61e42;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git util: Clear output broadcast address before filling it in Since commit 55ace7c4789c8a7408139460f4b639cee00e5125, the sockettest fails without VIR_TEST_DEBUG set. The problem is found by test number 42 (co-incidence?), which tests range '192.168.122.1' - '192.168.122.255' in network '192.168.122.0/24'. That is supposed to fail because the end address is equal to the broadcast address. When comparing these two in 'virSocketAddrEqual(end, &broadcast)', there is a check for sin_addr as well as for sin_port. That port, however, is different when we do not enable test debugging. With the testing enabled, the port is 0 (correctly initialized), but without that it has a random number there. And that's because the structure is not initialized anywhere. By zeroing the structure before filling in the info, we make sure we return only the address and not any information that was not requested. And the test work once again. Signed-off-by: Martin Kletzander --- diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 34f2af31b..81539b373 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -505,6 +505,8 @@ virSocketAddrBroadcast(const virSocketAddr *addr, const virSocketAddr *netmask, virSocketAddrPtr broadcast) { + memset(broadcast, 0, sizeof(*broadcast)); + if ((addr->data.stor.ss_family != AF_INET) || (netmask->data.stor.ss_family != AF_INET)) { broadcast->data.stor.ss_family = AF_UNSPEC;