Hello community, here is the log from the commit of package booth for openSUSE:Factory checked in at 2017-06-23 09:18:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/booth (Old) and /work/SRC/openSUSE:Factory/.booth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "booth" Fri Jun 23 09:18:37 2017 rev:42 rq:505692 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/booth/booth.changes 2017-06-12 15:33:55.739690404 +0200 +++ /work/SRC/openSUSE:Factory/.booth.new/booth.changes 2017-06-23 09:18:58.593248682 +0200 @@ -1,0 +2,10 @@ +Thu Jun 22 15:32:53 UTC 2017 - [email protected] + +- Clinet commands: fixed local IP addresses for booth grant, list, and peers + commands (bsc#1045067) + * bug-1045067_booth-fix-booth-grant-cmd.patch +- Patch bug-1039727_booth-build.patch merged to upstream: + * Build: create and set working directory (bsc#1039727) +- Upstream version cs: 766d61881b2cb576645821322edda0edea04828d + +------------------------------------------------------------------- Old: ---- booth.tar.bz2 bug-1039727_booth-build.patch New: ---- booth-1.0+20170619.766d618.tar.bz2 bug-1045067_booth-fix-booth-grant-cmd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ booth.spec ++++++ --- /var/tmp/diff_new_pack.PqgEjY/_old 2017-06-23 09:19:00.676954248 +0200 +++ /var/tmp/diff_new_pack.PqgEjY/_new 2017-06-23 09:19:00.680953683 +0200 @@ -20,6 +20,9 @@ %bcond_with glue +# local commit: +%global commit 1.0+20170619.766d618 + %global uname hacluster %global gname haclient @@ -34,9 +37,9 @@ License: GPL-2.0+ Group: Productivity/Clustering/HA Url: https://github.com/ClusterLabs/booth -Source: booth.tar.bz2 +Source: %{name}-%{commit}.tar.bz2 Source1: %{name}-rpmlintrc -Patch1: bug-1039727_booth-build.patch +Patch1: bug-1045067_booth-fix-booth-grant-cmd.patch BuildRequires: asciidoc BuildRequires: autoconf BuildRequires: automake @@ -74,7 +77,7 @@ the Cluster Ticket Manager for Pacemaker. %prep -%setup -q -n %{name} +%setup -q -n %{name}-%{commit} %patch1 -p1 %build ++++++ bug-1045067_booth-fix-booth-grant-cmd.patch ++++++ diff --git a/src/transport.c b/src/transport.c index b3e4432..7793926 100644 --- a/src/transport.c +++ b/src/transport.c @@ -237,16 +237,38 @@ int _find_myself(int family, struct booth_site **mep, int fuzzy_allowed) BOOTH_IPADDR_LEN); } - /* First try with exact addresses, then optionally with subnet matching. */ + /* Try to find the exact address or the address with subnet matching. + * The function find_address will be called for each address received + * from NLMSG_DATA above. + * The exact match will be prefered. If no exact match is found, + * the function find_address will try to return another, most similar + * address (with the longest possible number of same bytes). */ if (ifa->ifa_prefixlen > address_bits_matched) { find_address(ipaddr, ifa->ifa_family, ifa->ifa_prefixlen, fuzzy_allowed, &me, &address_bits_matched); + if (me) { log_debug("found myself at %s (%d bits matched)", site_string(me), address_bits_matched); } } + /* If the previous NLMSG_DATA calls have already allowed us + * to find an address with address_bits_matched matching bits, + * then no other better non-exact address can bo found. + * But we can still try to find an exact match, so let us + * call the function find_address with disabled searching of + * similar addresses (fuzzy_allowed == 0) */ + else if (ifa->ifa_prefixlen == address_bits_matched) { + find_address(ipaddr, + ifa->ifa_family, ifa->ifa_prefixlen, + 0 /* fuzzy_allowed */, &me, &address_bits_matched); + + if (me) { + log_debug("found myself at %s (exact match)", + site_string(me)); + } + } } h = NLMSG_NEXT(h, status); }
