[acassen/keepalived] 470250: Tidy up some code alignment

pqarmitage <[email protected]> Wed, 20 Dec 2017 01:02:08 -0800
Newsgroups gmane.linux.keepalived.devel
Message-ID <5a3a2710b996c_73a42ac69d093c04486de@hookshot-fe-cace476.cp1-iad.github.net.mail>
  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: 4702508b65648a327f56a2c4a3556a6c33e24fb8
      https://github.com/acassen/keepalived/commit/4702508b65648a327f56a2c4a3556a6c33e24fb8
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/check/check_http.c

  Log Message:
  -----------
  Tidy up some code alignment

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


  Commit: 50b4dcde94008427ca07b6d29dff8e9732afe527
      https://github.com/acassen/keepalived/commit/50b4dcde94008427ca07b6d29dff8e9732afe527
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/check/check_ssl.c

  Log Message:
  -----------
  Update openssl use to stop using deprecated functions

openssl from version 1.1 deprecated certain functions that keepalived
was using. This commit ceases using those functions if the version
of openssl is >= 1.1.

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


  Commit: 287f4b14a7cfc1c7ef09aab8ccc50a3eeda17824
      https://github.com/acassen/keepalived/commit/287f4b14a7cfc1c7ef09aab8ccc50a3eeda17824
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/check/check_daemon.c
    M keepalived/core/main.c
    M keepalived/vrrp/vrrp_daemon.c
    M lib/parser.c
    M lib/utils.c
    M lib/utils.h

  Log Message:
  -----------
  Fix some issues identified by valgrind

Some file descriptors weren't being closed at exit, and also one
or two mallocs weren't being freed.

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


  Commit: 50846ff61e08c853bba37efc738d8878902a0b26
      https://github.com/acassen/keepalived/commit/50846ff61e08c853bba37efc738d8878902a0b26
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/core/main.c
    M keepalived/core/namespaces.c
    M keepalived/vrrp/vrrp_iproute.c

  Log Message:
  -----------
  Set pointer to NULL after FREE_PTR() unless exiting

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


  Commit: c88744a016768d9728fb13b1c96a47e24ab91f10
      https://github.com/acassen/keepalived/commit/c88744a016768d9728fb13b1c96a47e24ab91f10
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_sync.c

  Log Message:
  -----------
  Allow sync groups with only 1 member, but issue a warning

Issue #594 complained that sync groups with only one member were
not allowed.

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


  Commit: 71db8a916bc17aa75ec7bf4cb56b9a5f763429ad
      https://github.com/acassen/keepalived/commit/71db8a916bc17aa75ec7bf4cb56b9a5f763429ad
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M genhash/ssl.c
    M keepalived/check/check_ssl.c

  Log Message:
  -----------
  Fix building with LibreSSL version of OpenSSL

Unfortunately LibreSSL updates OPENSSL_VERSION_NUMBER, and its value
is higher that OpenSSL's latest version. When checking the version
number we need to check that we are not using LibreSSL (by checking
whether LIBRESSL_VERSION_NUMBER is defined).

LibreSSL also hasn't implemented the new functions that OpenSSL has
provided to replace functions that are deprecated or it is recommended
should not be used, and so if using LibreSSL the old functions need
to be used.

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


  Commit: d2c559caf2c43a00006d5ec3f019873c3b95b358
      https://github.com/acassen/keepalived/commit/d2c559caf2c43a00006d5ec3f019873c3b95b358
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M genhash/ssl.c

  Log Message:
  -----------
  Update genhash to stop using deprecated functions openssl functions

Commit 50b4dcde updated keepalived, but forgot to update genhash, so this
patch now updates genhash/ssl.c to match keepalived/check/check_ssl.c

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


  Commit: 7549c8865eb1c426eb527878e843b55446e660f2
      https://github.com/acassen/keepalived/commit/7549c8865eb1c426eb527878e843b55446e660f2
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M keepalived/vrrp/vrrp_iproute.c

  Log Message:
  -----------
  Fix an error in clearing freed pointer commit

Commit 50846ff6 (Set pointer to NULL after FREE_PTR() unless exiting)
had one error in respect of which pointer was cleared after a FREE_PTR.

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


  Commit: 6e40f09bda593dd713e79358fea58dff21ae886e
      https://github.com/acassen/keepalived/commit/6e40f09bda593dd713e79358fea58dff21ae886e
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-19 (Tue, 19 Dec 2017)

  Changed paths:
    M genhash/http.c
    M genhash/include/http.h
    M genhash/include/layer4.h
    M genhash/include/main.h
    M genhash/include/sock.h
    M genhash/include/ssl.h
    M genhash/layer4.c
    M genhash/main.c
    M genhash/sock.c
    M genhash/ssl.c

  Log Message:
  -----------
  Remove last few Subversion source file version Id strings.

Some of the genhash source code still had Subversion Id strings,
and these are now removed.

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


  Commit: ed09eb8a41f45d119442fb65a17b4248b6b290e5
      https://github.com/acassen/keepalived/commit/ed09eb8a41f45d119442fb65a17b4248b6b290e5
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    A utils/update_source_copyright_year

  Log Message:
  -----------
  Add copyright update script

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


  Commit: 140db593eb32f7e50d446d72d58ddec0c5bbe65a
      https://github.com/acassen/keepalived/commit/140db593eb32f7e50d446d72d58ddec0c5bbe65a
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M Makefile.am
    M doc/man/man1/genhash.1
    M genhash/Makefile.am
    M genhash/http.c
    M genhash/include/hash.h
    M genhash/include/http.h
    M genhash/include/layer4.h
    M genhash/include/main.h
    M genhash/include/sock.h
    M genhash/include/ssl.h
    M genhash/layer4.c
    M genhash/main.c
    M genhash/sock.c
    M genhash/ssl.c
    M keepalived/Makefile.am
    M keepalived/check/check_api.c
    M keepalived/check/check_daemon.c
    M keepalived/check/check_data.c
    M keepalived/check/check_dns.c
    M keepalived/check/check_http.c
    M keepalived/check/check_misc.c
    M keepalived/check/check_parser.c
    M keepalived/check/check_smtp.c
    M keepalived/check/check_snmp.c
    M keepalived/check/check_ssl.c
    M keepalived/check/check_tcp.c
    M keepalived/check/ipvswrapper.c
    M keepalived/check/ipwrapper.c
    M keepalived/core/Makefile.am
    M keepalived/core/daemon.c
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/core/layer4.c
    M keepalived/core/main.c
    M keepalived/core/namespaces.c
    M keepalived/core/pidfile.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    M keepalived/include/check_api.h
    M keepalived/include/check_daemon.h
    M keepalived/include/check_data.h
    M keepalived/include/check_dns.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_parser.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_snmp.h
    M keepalived/include/check_ssl.h
    M keepalived/include/check_tcp.h
    M keepalived/include/daemon.h
    M keepalived/include/global_data.h
    M keepalived/include/global_parser.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/keepalived_netlink.h
    M keepalived/include/layer4.h
    M keepalived/include/main.h
    M keepalived/include/pidfile.h
    M keepalived/include/smtp.h
    M keepalived/include/snmp.h
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_arp.h
    M keepalived/include/vrrp_daemon.h
    M keepalived/include/vrrp_data.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.h
    M keepalived/include/vrrp_index.h
    M keepalived/include/vrrp_ip_rule_route_parser.h
    M keepalived/include/vrrp_ipaddress.h
    M keepalived/include/vrrp_iproute.h
    M keepalived/include/vrrp_iprule.h
    M keepalived/include/vrrp_ipsecah.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/include/vrrp_iptables.h
    M keepalived/include/vrrp_iptables_calls.h
    M keepalived/include/vrrp_json.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_notify.h
    M keepalived/include/vrrp_parser.h
    M keepalived/include/vrrp_print.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_snmp.h
    M keepalived/include/vrrp_sync.h
    M keepalived/include/vrrp_track.h
    M keepalived/include/vrrp_vmac.h
    M keepalived/vrrp/Makefile.am
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_arp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_dbus.c
    M keepalived/vrrp/vrrp_if.c
    M keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_index.c
    M keepalived/vrrp/vrrp_ip_rule_route_parser.c
    M keepalived/vrrp/vrrp_ipaddress.c
    M keepalived/vrrp/vrrp_iproute.c
    M keepalived/vrrp/vrrp_iprule.c
    M keepalived/vrrp/vrrp_ipsecah.c
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M keepalived/vrrp/vrrp_json.c
    M keepalived/vrrp/vrrp_ndisc.c
    M keepalived/vrrp/vrrp_notify.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_sync.c
    M keepalived/vrrp/vrrp_track.c
    M keepalived/vrrp/vrrp_vmac.c
    M lib/Makefile.am
    M lib/bitops.h
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/logger.c
    M lib/logger.h
    M lib/memory.c
    M lib/memory.h
    M lib/notify.c
    M lib/notify.h
    M lib/parser.c
    M lib/parser.h
    M lib/rttables.c
    M lib/rttables.h
    M lib/scheduler.c
    M lib/scheduler.h
    M lib/signals.c
    M lib/signals.h
    M lib/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h
    M lib/vector.c
    M lib/vector.h

  Log Message:
  -----------
  Copyright update

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


  Commit: a3e256943dcc0ea7dbda1308d539de40b84f966f
      https://github.com/acassen/keepalived/commit/a3e256943dcc0ea7dbda1308d539de40b84f966f
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M genhash/include/hash.h

  Log Message:
  -----------
  Remove outdated Version comment

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


  Commit: c3f9ac8541211dd6522f7c16cc491b51f64e2945
      https://github.com/acassen/keepalived/commit/c3f9ac8541211dd6522f7c16cc491b51f64e2945
  Author: Quentin Armitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M utils/update_source_copyright_year

  Log Message:
  -----------
  Fix update copyright script

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


  Commit: 2fe3f8ecfbf68344e27ae89c35b58e30f15ee1ef
      https://github.com/acassen/keepalived/commit/2fe3f8ecfbf68344e27ae89c35b58e30f15ee1ef
  Author: pqarmitage <[email protected]>
  Date:   2017-12-20 (Wed, 20 Dec 2017)

  Changed paths:
    M Makefile.am
    M doc/man/man1/genhash.1
    M genhash/Makefile.am
    M genhash/http.c
    M genhash/include/hash.h
    M genhash/include/http.h
    M genhash/include/layer4.h
    M genhash/include/main.h
    M genhash/include/sock.h
    M genhash/include/ssl.h
    M genhash/layer4.c
    M genhash/main.c
    M genhash/sock.c
    M genhash/ssl.c
    M keepalived/Makefile.am
    M keepalived/check/check_api.c
    M keepalived/check/check_daemon.c
    M keepalived/check/check_data.c
    M keepalived/check/check_dns.c
    M keepalived/check/check_http.c
    M keepalived/check/check_misc.c
    M keepalived/check/check_parser.c
    M keepalived/check/check_smtp.c
    M keepalived/check/check_snmp.c
    M keepalived/check/check_ssl.c
    M keepalived/check/check_tcp.c
    M keepalived/check/ipvswrapper.c
    M keepalived/check/ipwrapper.c
    M keepalived/core/Makefile.am
    M keepalived/core/daemon.c
    M keepalived/core/global_data.c
    M keepalived/core/global_parser.c
    M keepalived/core/layer4.c
    M keepalived/core/main.c
    M keepalived/core/namespaces.c
    M keepalived/core/pidfile.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    M keepalived/include/check_api.h
    M keepalived/include/check_daemon.h
    M keepalived/include/check_data.h
    M keepalived/include/check_dns.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_parser.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_snmp.h
    M keepalived/include/check_ssl.h
    M keepalived/include/check_tcp.h
    M keepalived/include/daemon.h
    M keepalived/include/global_data.h
    M keepalived/include/global_parser.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/keepalived_netlink.h
    M keepalived/include/layer4.h
    M keepalived/include/main.h
    M keepalived/include/pidfile.h
    M keepalived/include/smtp.h
    M keepalived/include/snmp.h
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_arp.h
    M keepalived/include/vrrp_daemon.h
    M keepalived/include/vrrp_data.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.h
    M keepalived/include/vrrp_index.h
    M keepalived/include/vrrp_ip_rule_route_parser.h
    M keepalived/include/vrrp_ipaddress.h
    M keepalived/include/vrrp_iproute.h
    M keepalived/include/vrrp_iprule.h
    M keepalived/include/vrrp_ipsecah.h
    M keepalived/include/vrrp_ipset.h
    M keepalived/include/vrrp_iptables.h
    M keepalived/include/vrrp_iptables_calls.h
    M keepalived/include/vrrp_json.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_notify.h
    M keepalived/include/vrrp_parser.h
    M keepalived/include/vrrp_print.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_snmp.h
    M keepalived/include/vrrp_sync.h
    M keepalived/include/vrrp_track.h
    M keepalived/include/vrrp_vmac.h
    M keepalived/vrrp/Makefile.am
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_arp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_dbus.c
    M keepalived/vrrp/vrrp_if.c
    M keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_index.c
    M keepalived/vrrp/vrrp_ip_rule_route_parser.c
    M keepalived/vrrp/vrrp_ipaddress.c
    M keepalived/vrrp/vrrp_iproute.c
    M keepalived/vrrp/vrrp_iprule.c
    M keepalived/vrrp/vrrp_ipsecah.c
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M keepalived/vrrp/vrrp_json.c
    M keepalived/vrrp/vrrp_ndisc.c
    M keepalived/vrrp/vrrp_notify.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_scheduler.c
    M keepalived/vrrp/vrrp_snmp.c
    M keepalived/vrrp/vrrp_sync.c
    M keepalived/vrrp/vrrp_track.c
    M keepalived/vrrp/vrrp_vmac.c
    M lib/Makefile.am
    M lib/bitops.h
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/logger.c
    M lib/logger.h
    M lib/memory.c
    M lib/memory.h
    M lib/notify.c
    M lib/notify.h
    M lib/parser.c
    M lib/parser.h
    M lib/rttables.c
    M lib/rttables.h
    M lib/scheduler.c
    M lib/scheduler.h
    M lib/signals.c
    M lib/signals.h
    M lib/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h
    M lib/vector.c
    M lib/vector.h
    A utils/update_source_copyright_year

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

Cosmetic tidying of code, update use of OpenSSL, copyright updates


Compare: https://github.com/acassen/keepalived/compare/cc6a394018c0...2fe3f8ecfbf6

------------------------------------------------------------------------------
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