[acassen/keepalived] 5e611c: Fix socket setup code for IPv4 multicast

Alexandre Cassen <[email protected]>
Newsgroups gmane.linux.keepalived.devel
Message-ID <563f86a05c176_563f3ffd5e0fd2a07203b@hookshot-fe6-cp1-prd.iad.github.net.mail> 
  Branch: refs/heads/master
  Home:   https://github.com/acassen/keepalived
  Commit: 5e611cb5538ca961077b2d868e6dca5a00b4de23
      https://github.com/acassen/keepalived/commit/5e611cb5538ca961077b2d868e6dca5a00b4de23
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Fix socket setup code for IPv4 multicast

if_setsockopt_mcast_if was only doing anything for IPv6 interfaces.
Make it work also for IPv4 interfaces, and then don't need to
call if_setsockopt_bindtodevice for multicast.

Is it still necessary to call it for unicast?

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


  Commit: 60217b63242bee37b1c97a04644be6eb5e18b4c4
      https://github.com/acassen/keepalived/commit/60217b63242bee37b1c97a04644be6eb5e18b4c4
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M configure
    M configure.in
    M keepalived/include/ipvswrapper.h
    M keepalived/include/vrrp_if.h
    A keepalived/include/vrrp_if_config.h
    M keepalived/vrrp/Makefile.in
    A keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_netlink.c
    M keepalived/vrrp/vrrp_vmac.c

  Log Message:
  -----------
  Set (and restore) interface parameters

In order to receive and send multicasts on the correct interfaces
various parameters need to be set via the /proc/sys/net/ipv4/conf
interface. This patch sets them as needed, and restores any
changes on the underlying interface on exit.

If a user currently sets any parameters by scripts, that will
override these changes and still work, but this change in general
will make it unnecessary to change any parameters with scripts.

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


  Commit: cdb75d4fe12d2dff35d3bc99f31416dd1b78c8d2
      https://github.com/acassen/keepalived/commit/cdb75d4fe12d2dff35d3bc99f31416dd1b78c8d2
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Leave VRRP multicast group by ifindex

Since we know the interface index, use that instead of the address
since it is more efficient. Also, in the unlikely event that the
interface doesn't have an address, then this avoids a problem.

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


  Commit: 62e8455ffb7c9441deb367e32681ba18e1425a3f
      https://github.com/acassen/keepalived/commit/62e8455ffb7c9441deb367e32681ba18e1425a3f
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/include/vrrp.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_daemon.c

  Log Message:
  -----------
  Don't delete vmac interfaces before dropping multicast membership

Further to commit afea07bd94384c8ac8125e8cdbfd18bc4a46b14e, the
dropping multicast memberships were failing, since the vmac
interfaces had already been deleted. This patch keeps the vmac
interfaces until after the IP_DROP_MEMBERSHIP ioctls. Separating
the sending of the VRRP priority 0 messages from the shutdown
of the vrrp instances is necessary since vrrp_dispatcher_release
closes the sockets that are needed for sending the messages.

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


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

  Changed paths:
    M keepalived/vrrp/vrrp.c

  Log Message:
  -----------
  Don't open vrrp_send_socket if address family is wrong

open_vrrp_send_socket was opening a socket, and then checking that
the address family was valid. Checking that the address family is
valid at the beginning of the function streamlines the code.

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


  Commit: b71116f0bb80119401f2867c5c6dbc085a74791f
      https://github.com/acassen/keepalived/commit/b71116f0bb80119401f2867c5c6dbc085a74791f
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/include/vrrp_if.h
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Stop m'cast packets being queued (and not received) on send socket

If there are other vrrp instances on the same network, their
multicast packets are queued to our vrrp send socket, but since we
don't receive on that socket, the messages just get queued in the
kernel (run netstat -anp | grep keepalived to see the queued
packets increasing).

This patch clears the IP_MULTICAST_ALL option, to stop these
packets being queued.

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


  Commit: 8a8bcd7bf26d39214576612787faf7c44fb22a97
      https://github.com/acassen/keepalived/commit/8a8bcd7bf26d39214576612787faf7c44fb22a97
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_data.c

  Log Message:
  -----------
  Fix typos in log messages

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


  Commit: a02e2ec77826504c32299d86c6d06cb4231b41a9
      https://github.com/acassen/keepalived/commit/a02e2ec77826504c32299d86c6d06cb4231b41a9
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/include/vrrp.h

  Log Message:
  -----------
  Fix RFC reference

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


  Commit: e379e52f611de0297d80abc6eabe4552601493c8
      https://github.com/acassen/keepalived/commit/e379e52f611de0297d80abc6eabe4552601493c8
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_parser.c

  Log Message:
  -----------
  Fix vrrp parser error message

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


  Commit: 8a9940ded805dc324f8c963d22861e1f60e6f927
      https://github.com/acassen/keepalived/commit/8a9940ded805dc324f8c963d22861e1f60e6f927
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_data.c

  Log Message:
  -----------
  Add interface index to vrrp dump data

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


  Commit: d93175a71c53e5475bab4b2e436fa8c5dd18922c
      https://github.com/acassen/keepalived/commit/d93175a71c53e5475bab4b2e436fa8c5dd18922c
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Don't specify source address in IP_ADD_MEMBERSHIP ioctl

If ifindex is specified, any source address given is ignored.

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


  Commit: ef90067f3d6ac5f2efe341b04dd59a04f0911e7f
      https://github.com/acassen/keepalived/commit/ef90067f3d6ac5f2efe341b04dd59a04f0911e7f
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp_vmac.c

  Log Message:
  -----------
  If fail to remove vmac i/f, don't report success after fail message

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


  Commit: 01305d887f9e6d128bddd5a0511406ac4e90eb8a
      https://github.com/acassen/keepalived/commit/01305d887f9e6d128bddd5a0511406ac4e90eb8a
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M configure
    M configure.in

  Log Message:
  -----------
  Help vim's formatting to work in configure.in

The single "'" in a comment confuses vim, and the screen formatting
gets confused. Adding a second "'" in a C comment sorts vim out.

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


  Commit: 21a7e9742c0dc78505febae6e0caa7e1abc4dbc5
      https://github.com/acassen/keepalived/commit/21a7e9742c0dc78505febae6e0caa7e1abc4dbc5
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_if.c

  Log Message:
  -----------
  Don't explicitly drop IGMP membership before interface deletion

The kernel will send IGMP leave group messages when an interface
is deleted, so there is no need for us to do so. Experimentation
has shown that explicity doing IGMP_DROP_MEMBERSHIP doesn't make
it any more likely the IGMP leave group messages will be sent.

Adding the 1 second sleep significantly increases the likelihood
of the IGMP messages being sent, but is doesn't guarantee it.
Extending the sleep time doesn't improve the chances.

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


  Commit: de58eb085aaddc007937f50fda88685623e3b91a
      https://github.com/acassen/keepalived/commit/de58eb085aaddc007937f50fda88685623e3b91a
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/check/check_http.c
    M keepalived/vrrp/vrrp.c

  Log Message:
  -----------
  Fix compiler warnings

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


  Commit: 90f8d7101e074a50dacbfcd3d4a90de7c48f6afc
      https://github.com/acassen/keepalived/commit/90f8d7101e074a50dacbfcd3d4a90de7c48f6afc
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Make git ignore autom4te.cache

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


  Commit: 445976b7ef193a749f58b92174440f231f0337c6
      https://github.com/acassen/keepalived/commit/445976b7ef193a749f58b92174440f231f0337c6
  Author: Quentin Armitage <[email protected]>
  Date:   2015-11-06 (Fri, 06 Nov 2015)

  Changed paths:
    M keepalived/vrrp/vrrp.c

  Log Message:
  -----------
  Fix tense in comment

The comment confused me since the tense was wrong, so I thought
it worthwhile correcting to avoid anyone else being confused.

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


  Commit: a459cc1a8adb45868e8da65ea18c5d6188e2c2b2
      https://github.com/acassen/keepalived/commit/a459cc1a8adb45868e8da65ea18c5d6188e2c2b2
  Author: Alexandre Cassen <[email protected]>
  Date:   2015-11-08 (Sun, 08 Nov 2015)

  Changed paths:
    M .gitignore
    M configure
    M configure.in
    M keepalived/check/check_http.c
    M keepalived/include/ipvswrapper.h
    M keepalived/include/vrrp.h
    M keepalived/include/vrrp_if.h
    A keepalived/include/vrrp_if_config.h
    M keepalived/vrrp/Makefile.in
    M keepalived/vrrp/vrrp.c
    M keepalived/vrrp/vrrp_daemon.c
    M keepalived/vrrp/vrrp_data.c
    M keepalived/vrrp/vrrp_if.c
    A keepalived/vrrp/vrrp_if_config.c
    M keepalived/vrrp/vrrp_netlink.c
    M keepalived/vrrp/vrrp_parser.c
    M keepalived/vrrp/vrrp_vmac.c

  Log Message:
  -----------
  Merge pull request #194 from pqarmitage/vrrp

Fix socket and interface setup and closedown code for IPv4 multicast


Compare: https://github.com/acassen/keepalived/compare/23e0ae079c38...a459cc1a8adb

------------------------------------------------------------------------------

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