[acassen/keepalived] 8c44f2: Merge pull request #694 from pqarmitage/fixes

pqarmitage <[email protected]> Wed, 22 Nov 2017 04:57:22 -0800
Newsgroups gmane.linux.keepalived.devel
Message-ID <5a1574328b6aa_216e3fc4e6f15c441465c7@hookshot-fe6-cp1-prd.iad.github.net.mail>
  Branch: refs/heads/beta
  Home:   https://github.com/acassen/keepalived
  Commit: 8c44f2160c6a6a8c0b830fbea3ce527cc068a206
      https://github.com/acassen/keepalived/commit/8c44f2160c6a6a8c0b830fbea3ce527cc068a206
  Author: pqarmitage <[email protected]>
  Date:   2017-11-01 (Wed, 01 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived.spec.in

  Log Message:
  -----------
  Merge pull request #694 from pqarmitage/fixes

Attempt to fix mock builds


  Commit: be28d3bf80cf796bb9c76ca8be095a40c2756b3f
      https://github.com/acassen/keepalived/commit/be28d3bf80cf796bb9c76ca8be095a40c2756b3f
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-04 (Sat, 04 Nov 2017)

  Changed paths:
    M keepalived/core/main.c

  Log Message:
  -----------
  If a vrrp or checker process fails to terminate, send it SIGKILL

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 1cf44fe051645fd897c5697996ae1141e4f63d2c
      https://github.com/acassen/keepalived/commit/1cf44fe051645fd897c5697996ae1141e4f63d2c
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_ipaddress.c

  Log Message:
  -----------
  For parsing of broadcast + and broadcast -

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 6a71251d046189278853bc665c16af7c769c06e2
      https://github.com/acassen/keepalived/commit/6a71251d046189278853bc665c16af7c769c06e2
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-06 (Mon, 06 Nov 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_ipaddress.c

  Log Message:
  -----------
  Merge branch 'fixes' into beta


  Commit: d2c73247be46361b5c1c5b0aad8109d1baf5ea17
      https://github.com/acassen/keepalived/commit/d2c73247be46361b5c1c5b0aad8109d1baf5ea17
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M keepalived/check/check_daemon.c
    M keepalived/vrrp/vrrp_daemon.c

  Log Message:
  -----------
  Stop reporting vrrp/checker child didn't terminate after seg fault

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: a7efefdf3c428a98e7c762ce38dfbf75e0244838
      https://github.com/acassen/keepalived/commit/a7efefdf3c428a98e7c762ce38dfbf75e0244838
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M lib/list.h

  Log Message:
  -----------
  Simplify iterating lists

There are many places in the code where lists are iterated, and
it needed something like:

if (!LIST_ISEMPTY(l)) {
  for (e = LIST_HEAD(l); e; ELEMENT_NEXT(e)) {
		var = ELEMENT_DATA(e);
          ...
  }
}

First, by modifying LIST_HEAD() to be:

  #define LIST_HEAD(L)   (!(L) ? NULL : (L)->head)

the iterating can be simplified to:

for (e = LIST_HEAD(l); e; ELEMENT_NEXT(e)) {
	var = ELEMENT_DATA(e);
  ...
}

Since this occurs so frequently, define new macros LIST_FOREACH and
LIST_FOREACH_NEXT, so that the above code can be simplifed to

LIST_FOREACH(l, var, e) {
  ...
}

and for the case where entries may be removed from the list while
iterating it:

if (!LIST_ISEMPTY(l)) {
	for (e = LIST_HEAD(l); e; e = next) {
		next = e->next;
		var = ELEMENT_DATA(e);
		...
	}
}

becomes

LIST_FOREACH_NEXT(l, var, e, next) {
	...
}

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 0cc9fe8e8337c99ac89a3d9df8cb8a641b9765d0
      https://github.com/acassen/keepalived/commit/0cc9fe8e8337c99ac89a3d9df8cb8a641b9765d0
  Author: pqarmitage <[email protected]>
  Date:   2017-11-07 (Tue, 07 Nov 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_ipaddress.c

  Log Message:
  -----------
  Merge pull request #699 from pqarmitage/fixes

Fix parsing of broadcast + and broadcast -


  Commit: bba2607e80bb830d8336c21667fb0912caec34f0
      https://github.com/acassen/keepalived/commit/bba2607e80bb830d8336c21667fb0912caec34f0
  Author: Dmitry Poroh <[email protected]>
  Date:   2017-11-17 (Fri, 17 Nov 2017)

  Changed paths:
    M keepalived/check/check_http.c

  Log Message:
  -----------
  check_http.c: http_get_check_compare crash fixed in case of absense of digest


  Commit: 4954b09a3a9dc9592aa63fce88e1bb6dc0c804d9
      https://github.com/acassen/keepalived/commit/4954b09a3a9dc9592aa63fce88e1bb6dc0c804d9
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M configure
    M configure.ac

  Log Message:
  -----------
  Add -pie linker option

Since -fPIE is specified for the compiler, -pie should be specified
for the linker.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: a6c7527486d8c3a397f5e83f6f0e0ae269dc9430
      https://github.com/acassen/keepalived/commit/a6c7527486d8c3a397f5e83f6f0e0ae269dc9430
  Author: pqarmitage <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M configure
    M configure.ac

  Log Message:
  -----------
  Merge pull request #702 from pqarmitage/fixes

Add -pie linker option


  Commit: 02962949dbb018778a94f62afb87ca2c83e78c3b
      https://github.com/acassen/keepalived/commit/02962949dbb018778a94f62afb87ca2c83e78c3b
  Author: pqarmitage <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M keepalived/check/check_http.c

  Log Message:
  -----------
  Merge pull request #701 from poroh/master

check_http.c: http_get_check_compare crash fixed in case of absense o…


  Commit: f1c9bce9428979bd0b21874ee0e91e3a7ff9f511
      https://github.com/acassen/keepalived/commit/f1c9bce9428979bd0b21874ee0e91e3a7ff9f511
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-18 (Sat, 18 Nov 2017)

  Changed paths:
    M keepalived/check/check_http.c

  Log Message:
  -----------
  Merge branch 'fixes' into beta


  Commit: 6cdd015ce6cc91954ee09869d815bf38d33148a8
      https://github.com/acassen/keepalived/commit/6cdd015ce6cc91954ee09869d815bf38d33148a8
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M lib/config.h.in
    M lib/parser.c

  Log Message:
  -----------
  Fix use S_PATH and fchdir()

S_PATH wasn't defined until Linux 2.6.39 and fchdir() doesn't work
with S_PATH until Linux 3.5 (according to open(2) man page).

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: c092ab94ca9e71ed3e79ee8dd20f5b31e2ce135c
      https://github.com/acassen/keepalived/commit/c092ab94ca9e71ed3e79ee8dd20f5b31e2ce135c
  Author: pqarmitage <[email protected]>
  Date:   2017-11-21 (Tue, 21 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M lib/config.h.in
    M lib/parser.c

  Log Message:
  -----------
  Merge pull request #704 from pqarmitage/fixes

Fix use of S_PATH and fchdir()


  Commit: a67f4240e44d9dd46d0262b9de1e30b0e7d89d51
      https://github.com/acassen/keepalived/commit/a67f4240e44d9dd46d0262b9de1e30b0e7d89d51
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M configure
    M configure.ac

  Log Message:
  -----------
  Fix typo introduced in commit 6cdd015ce

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: e941d1b2d075bbdca56e9d0d4ee5c6ac26a68126
      https://github.com/acassen/keepalived/commit/e941d1b2d075bbdca56e9d0d4ee5c6ac26a68126
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in

  Log Message:
  -----------
  Fix building with Linux versions between 2.6.39 and 3.3

Linux 2.6.39 introduced ipsets, but the kernel had some omissions
from linux/netfilter/ipset/ip_set.h header file, so the libipset
provided version needed to be used.

Note: RedHat backported ipsets to at least 2.6.32, so the problem
applied to earlier versions of RedHat Linux and Centos.

Signed-off-by: Quentin Armitage <[email protected]>


  Commit: 98942db0edf49d4e1952e61c059e4c92f44ffa32
      https://github.com/acassen/keepalived/commit/98942db0edf49d4e1952e61c059e4c92f44ffa32
  Author: pqarmitage <[email protected]>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in

  Log Message:
  -----------
  Merge pull request #705 from pqarmitage/fixes

Fix building on Linux version 2.6.39 to 3.3


  Commit: ead3030aa45cb9da80681194e864014aafedaffa
      https://github.com/acassen/keepalived/commit/ead3030aa45cb9da80681194e864014aafedaffa
  Author: Quentin Armitage <[email protected]>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in
    M lib/parser.c

  Log Message:
  -----------
  Merge branch 'fixes' into beta


  Commit: 24553566149d5ea2a9bab3f44e18078a9333e4f8
      https://github.com/acassen/keepalived/commit/24553566149d5ea2a9bab3f44e18078a9333e4f8
  Author: pqarmitage <[email protected]>
  Date:   2017-11-22 (Wed, 22 Nov 2017)

  Changed paths:
    M configure
    M configure.ac
    M keepalived/check/check_daemon.c
    M keepalived/check/check_http.c
    M keepalived/core/main.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_ipaddress.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M lib/config.h.in
    M lib/list.h
    M lib/parser.c

  Log Message:
  -----------
  Merge pull request #706 from pqarmitage/beta

Mainly merges from master and some new list iteration macros


Compare: https://github.com/acassen/keepalived/compare/e79c3414cf37...24553566149d

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot

_______________________________________________
Keepalived-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/keepalived-devel