[acassen/keepalived] 8ca545: Tidy up logged messages if ipset initialisation fa...

Alexandre Cassen <[email protected]>
Newsgroups gmane.linux.keepalived.devel
Message-ID <580cc6a256a84_1d223f94591ed138710b6@hookshot-fe3-cp1-prd.iad.github.net.mail>
  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: 8ca545ed88f839ff08e4bc81f3580d7dd722bb67
      https://github.com/acassen/keepalived/commit/8ca545ed88f839ff08e4bc81f3580d7dd722bb67
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M keepalived/vrrp/vrrp_ipset.c
    M keepalived/vrrp/vrrp_iptables.c

  Log Message:
  -----------
  Tidy up logged messages if ipset initialisation fails

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


  Commit: 8b33de77fc20e2cf02e76c6e973a3196ab358c13
      https://github.com/acassen/keepalived/commit/8b33de77fc20e2cf02e76c6e973a3196ab358c13
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Streamline MII polling

We only need to read 2 MII registers, and not 32 as was previously being
done.

This commit also uses the <linux/mii.h> header file for field and
register definitions.

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


  Commit: 5de5a666700b4abee4a13766f55ddbe3342e0f5f
      https://github.com/acassen/keepalived/commit/5de5a666700b4abee4a13766f55ddbe3342e0f5f
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-12 (Wed, 12 Oct 2016)

  Changed paths:
    M lib/bitops.h

  Log Message:
  -----------
  Simplify bitops.h code

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


  Commit: e023f42b44e50c5768d09100136cb9a3a8d9bc21
      https://github.com/acassen/keepalived/commit/e023f42b44e50c5768d09100136cb9a3a8d9bc21
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M configure
    M configure.ac
    M genhash/http.c
    M genhash/layer4.c
    M genhash/main.c
    M genhash/ssl.c
    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/check/libipvs.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/process.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    M keepalived/include/check_api.h
    M keepalived/include/check_data.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_tcp.h
    M keepalived/include/global_data.h
    M keepalived/include/ip_vs.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/layer4.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_data.h
    M keepalived/include/vrrp_if.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_iptables_calls.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_netlink.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_track.h
    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_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_iptables.c
    M keepalived/vrrp/vrrp_iptables_calls.c
    M keepalived/vrrp/vrrp_ndisc.c
    M keepalived/vrrp/vrrp_netlink.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_vmac.c
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/memory.c
    M lib/notify.c
    M lib/notify.h
    M lib/parser.c
    M lib/rttables.c
    M lib/rttables.h
    M lib/scheduler.c
    M lib/scheduler.h
    M lib/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h

  Log Message:
  -----------
  Resolve warnings generated with compiler option -Dconversion

Most of the warnings were resolved by changing the data types of some
variables. Others required casting, particularly where kernel interfaces
are involved.

There were a few instances discovered that were errors, for example comparing
an unsigned int against -1, and assigning a 16 bit value to a uint8_t.

This commit also adds configure options --enable-conversion-checks and
--enable-force-conversion-checks, the former adds compiler option -Dconversion
unless the compiler is an old version that throws up false warnings. Option
--enable-force-conversion-checks adds -Dconversion even if the compiler throws
up known false warnings.

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


  Commit: 4b7ea475008702f320e05ae0e9fa0cef0fe5ffa4
      https://github.com/acassen/keepalived/commit/4b7ea475008702f320e05ae0e9fa0cef0fe5ffa4
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS

  Log Message:
  -----------
  Fix some minor errors/typos in doc/keepalived.conf.SYNOPSIS

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


  Commit: 13e835473c8c1cf0562756943ba21d6390f26240
      https://github.com/acassen/keepalived/commit/13e835473c8c1cf0562756943ba21d6390f26240
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M doc/samples/keepalived.conf.SMTP_CHECK

  Log Message:
  -----------
  Fix keyword error in sample configuration

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


  Commit: 403917b0354f836898f6b2611be23abef2da8ff1
      https://github.com/acassen/keepalived/commit/403917b0354f836898f6b2611be23abef2da8ff1
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M genhash/main.c

  Log Message:
  -----------
  Fix typo in genhash error message

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


  Commit: d57bfc13990f9c21e58343ae50165ed95e0bd36c
      https://github.com/acassen/keepalived/commit/d57bfc13990f9c21e58343ae50165ed95e0bd36c
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M keepalived/check/check_data.c
    M keepalived/check/ipvswrapper.c

  Log Message:
  -----------
  Fix address ranges for virtual server groups

The handling of address ranges was only written for IPv4 addresses, and
only worked on little endian systems.

This commit enables IPv6 address ranges to work, and also should now
work on big endian systems (but I don't have access to a big endian system
to test it). Validation is added to ensure that the end of the range is after
the start of the range, and that the value of the range end does not exceed
255 (for IPv4) of ffff (for IPv6).

There is also some optimisation of the code, so that netmask is not set (since
it isn't used by the kernel), and the port is set once only, before the loop
through the addresses.

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


  Commit: b588541426fa4608546aa8d07a3f07fbcd99a400
      https://github.com/acassen/keepalived/commit/b588541426fa4608546aa8d07a3f07fbcd99a400
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-15 (Sat, 15 Oct 2016)

  Changed paths:
    M lib/parser.h

  Log Message:
  -----------
  Fix typo in comment

xcf733520 <[email protected]> reported the typo by email

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


  Commit: 238d9dd3193a54f25547db047da5100a17cece19
      https://github.com/acassen/keepalived/commit/238d9dd3193a54f25547db047da5100a17cece19
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-16 (Sun, 16 Oct 2016)

  Changed paths:
    M configure
    M configure.ac

  Log Message:
  -----------
  Add --enable-Werror configure option

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


  Commit: 3939d96e09708e673c1a51b0550a003d285376eb
      https://github.com/acassen/keepalived/commit/3939d96e09708e673c1a51b0550a003d285376eb
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_parser.c

  Log Message:
  -----------
  Add promote_secondaries keyword for vrrp_instance block

If two IPv4 VIP addresses are in the same CIDR, and the primary
address is removed, then by default any other address in the same CIDR is
also removed. To stop this happening, the promote_secondaries flag
needs to be set on the interface.

Commit e5526cf added setting the promote_secondaries option on
VMAC interfaces, and stated that adding the option for non-VMAC
interfaces would be added later. This commit now adds a
promote_secondaries configuration option in order to set the flag
on the interface.

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


  Commit: c4510e60e2e039838b3973ce2a2e8193f1f5a516
      https://github.com/acassen/keepalived/commit/c4510e60e2e039838b3973ce2a2e8193f1f5a516
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M doc/KEEPALIVED-MIB.txt
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_print.c
    M keepalived/vrrp/vrrp_snmp.c

  Log Message:
  -----------
  Add reporting of promote_secondaries configuration setting

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


  Commit: 03f525f75e319d5fae0de1c4f1295381a6575462
      https://github.com/acassen/keepalived/commit/03f525f75e319d5fae0de1c4f1295381a6575462
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M keepalived/core/main.c
    M lib/parser.c
    M lib/parser.h

  Log Message:
  -----------
  Add conditional configuration feature

It is usually the case that the configurations for keepalived for
systems operating together are virtually identical, and only differ
in vrrp instance priorities, router id, and unicast addresses if
those are being used.

It is a nuisance to have to edit one file for each server to make
identical changes, so this commit adds the facility for conditional
configuration entries.

Any line starting with the '@' character is a conditional line.
Immediately following the '@' character is a config id. The line is
only included in the configuration if the config id matches the
argument passed to keepalived with the -i option on the command line.

For example, consider the following configuration snippet:

global_defs
{
@main	router_id main_router
@backup router_id backup_router
}

If keepalived is started with -i main, then the router id will be
main_router, if started with -i backup, then backup_router. If
keepalived is started without the -i option, or -i anything else,
then the above snippet will not configure any router id.

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


  Commit: f5d9202b1d473823686a934e38d16ead9de84fbd
      https://github.com/acassen/keepalived/commit/f5d9202b1d473823686a934e38d16ead9de84fbd
  Author: Quentin Armitage <[email protected]>
  Date:   2016-10-21 (Fri, 21 Oct 2016)

  Changed paths:
    M keepalived/core/main.c

  Log Message:
  -----------
  Fix building with --disable-vrrp

Issue #446 identified that keepalived would fail to build with the
--disable-vrrp option. This is now resolved.

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


  Commit: 66c870aae79c2a0b02c46ae7bfdc05483a951d4c
      https://github.com/acassen/keepalived/commit/66c870aae79c2a0b02c46ae7bfdc05483a951d4c
  Author: Alexandre Cassen <[email protected]>
  Date:   2016-10-23 (Sun, 23 Oct 2016)

  Changed paths:
    M configure
    M configure.ac
    M doc/KEEPALIVED-MIB.txt
    M doc/keepalived.conf.SYNOPSIS
    M doc/man/man5/keepalived.conf.5
    M doc/samples/keepalived.conf.SMTP_CHECK
    M genhash/http.c
    M genhash/layer4.c
    M genhash/main.c
    M genhash/ssl.c
    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/check/libipvs.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/process.c
    M keepalived/core/smtp.c
    M keepalived/core/snmp.c
    M keepalived/include/check_api.h
    M keepalived/include/check_data.h
    M keepalived/include/check_http.h
    M keepalived/include/check_misc.h
    M keepalived/include/check_smtp.h
    M keepalived/include/check_tcp.h
    M keepalived/include/global_data.h
    M keepalived/include/ip_vs.h
    M keepalived/include/ipvswrapper.h
    M keepalived/include/ipwrapper.h
    M keepalived/include/layer4.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_data.h
    M keepalived/include/vrrp_if.h
    M keepalived/include/vrrp_if_config.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_iptables_calls.h
    M keepalived/include/vrrp_ndisc.h
    M keepalived/include/vrrp_netlink.h
    M keepalived/include/vrrp_scheduler.h
    M keepalived/include/vrrp_track.h
    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_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_ndisc.c
    M keepalived/vrrp/vrrp_netlink.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_vmac.c
    M lib/bitops.h
    M lib/html.c
    M lib/html.h
    M lib/list.c
    M lib/list.h
    M lib/memory.c
    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/timer.c
    M lib/timer.h
    M lib/utils.c
    M lib/utils.h

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

Resolve compiler warning generated by -Dconversion


Compare: https://github.com/acassen/keepalived/compare/b1303887f66f...66c870aae79c

------------------------------------------------------------------------------
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
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.