diff options
| author | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 15:06:06 +0100 |
|---|---|---|
| committer | Chris Hall <chris.hall@highwayman.com> | 2011-08-12 15:06:06 +0100 |
| commit | cec1fae79110dffa900c0c5f38c3d3b48f5b0db6 (patch) | |
| tree | 408055322e19098b98766168624f1b96865ac73b /zebra | |
| parent | 228e06bad624a33090da4a09f32f8fed84a7e15c (diff) | |
| parent | 7bd8653ef788a6395b07583d6766be8950598342 (diff) | |
| download | quagga-ex18p.tar.bz2 quagga-ex18p.tar.xz | |
Merge branch 'euro_ix' of /git/quagga.euro-ix into pipeworkex18p
Merge with euro_ix branch v0.99.18ex17.
Update version to: 0.99.18ex18p
Of particular note:
* includes support for GTSM:
neighbor ... ttl-security hops X
no neighbor ... ttl-security hops X
where X is 1-254. For usual case of immediately connected
peer, X == 1.
Cannot set ttl-security while ebgp-multihop is set, and
vice-versa.
If underlying O/S does not support GTSM, then will set ttl
as per ebgp-multihop.
In passing, have fixed various bugs in the main Quagga branch.
* initial support for draft-ietf-idr-optional-transitive
Does not yet support "neighbor-complete" flag.
* main Quagga now uses TCP_CORK and permanent non-blocking
Do not beleive TCP_CORK to be necessary for euro_ix code...
which has a different buffering strategy.
The euro_ix code already runs sockets permanently non-blocking.
* various fixes to attribute intern/unintern
Trying to remove memory leaks. Nobody seems convinced that
this has been perfected, yet.
* fixes for ospfd and ospf6d issues.
Up to date with master branch up to:
commit 538cb284864c17de66152a5236db4cd80e3e7639
Merge: 036a6e6 8ced4e8
Author: Paul Jakma <paul@quagga.net>
Date: Fri Jul 29 18:21:50 2011 +0100
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/irdp_main.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_routemap.c | 11 | ||||
| -rw-r--r-- | zebra/zserv.c | 4 |
3 files changed, 8 insertions, 11 deletions
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index c297979c..0658c397 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -29,7 +29,7 @@ */ /* - * Thanks to Jens Låås at Swedish University of Agricultural Sciences + * Thanks to Jens L��s at Swedish University of Agricultural Sciences * for reviewing and tests. */ @@ -108,7 +108,7 @@ irdp_sock_init (void) return ret; }; - ret = setsockopt_ifindex (AF_INET, sock, 1); + ret = setsockopt_pktinfo (AF_INET, sock, 1); if (ret < 0) { zlog_warn ("IRDP: can't do irdp sockopt %s", safe_strerror(errno)); close(sock); diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c index 808dcf74..b3111b8e 100644 --- a/zebra/zebra_routemap.c +++ b/zebra/zebra_routemap.c @@ -642,17 +642,14 @@ route_set_src (void *rule, struct prefix *prefix, static void * route_set_src_compile (const char *arg) { - sa_family_t family; union g_addr src, *psrc; - if (inet_pton(AF_INET, arg, &src.ipv4) > 0) - family = AF_INET; + if (inet_pton(AF_INET, arg, &src.ipv4) != 1 #ifdef HAVE_IPV6 - else if (inet_pton(AF_INET6, arg, &src.ipv6) > 0) - family = AF_INET6; + && inet_pton(AF_INET6, arg, &src.ipv6) != 1 #endif /* HAVE_IPV6 */ - else - return NULL; + ) + return NULL; psrc = XMALLOC (MTYPE_ROUTE_MAP_COMPILED, sizeof (union g_addr)); *psrc = src; diff --git a/zebra/zserv.c b/zebra/zserv.c index dc3d432b..398b74c8 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1360,8 +1360,8 @@ zebra_serv () #endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */ addr.sin_addr.s_addr = htonl (INADDR_LOOPBACK); - sockopt_reuseaddr (accept_sock); - sockopt_reuseport (accept_sock); + setsockopt_reuseaddr (accept_sock); + setsockopt_reuseport (accept_sock); if ( zserv_privs.change(ZPRIVS_RAISE) ) zlog (NULL, LOG_ERR, "Can't raise privileges"); |