diff options
| author | David Lamparter <equinox@diac24.net> | 2009-10-04 16:21:49 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@diac24.net> | 2010-02-03 05:19:36 +0100 |
| commit | 446e7f9de21e049d37cd2cca035355b179819237 (patch) | |
| tree | 33fa8966f352bb9bc304c11145b02ba8114b3829 /bgpd | |
| parent | e78119339da91bedf0c6f8d9adfe828c60295161 (diff) | |
| download | quagga-446e7f9de21e049d37cd2cca035355b179819237.tar.bz2 quagga-446e7f9de21e049d37cd2cca035355b179819237.tar.xz | |
lib: add sockopt helper for setting IPV6_V6ONLY and use it
getaddrinfo returns a list of socket parameters for listening. it
will contain both IPv4 and IPv6 listening sockets. unless we use
IPV6_V6ONLY on the IPv6 ones, only the socket listed first will
work. if the IPv4 one came first, the IPv6 one would get an
"Address in use" error.
this functionality was already present for bgpd and its listening
sockets. as it is needed for vtys as well, make it a common helper.
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_network.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c index 9e3427d2..1a8587e9 100644 --- a/bgpd/bgp_network.c +++ b/bgpd/bgp_network.c @@ -383,14 +383,7 @@ bgp_listener (int sock, struct sockaddr *sa, socklen_t salen) setsockopt_ipv4_tos (sock, IPTOS_PREC_INTERNETCONTROL); #endif -#ifdef IPV6_V6ONLY - /* Want only IPV6 on ipv6 socket (not mapped addresses) */ - if (sa->sa_family == AF_INET6) { - int on = 1; - setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, - (void *) &on, sizeof (on)); - } -#endif + sockopt_v6only (sa->sa_family, sock); if (bgpd_privs.change (ZPRIVS_RAISE) ) zlog_err ("bgp_socket: could not raise privs"); |