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

1 files changed, 5 insertions, 4 deletions

diff --git a/lib/smux.c b/lib/smux.c
index df02dd44..cd3d2edf 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -38,6 +38,7 @@
 #include <lib/version.h>
 #include "memory.h"
 #include "sockunion.h"
+#include "sockopt.h"
 #include "smux.h"
 
 #define min(A,B) ((A) < (B) ? (A) : (B))
@@ -215,8 +216,8 @@ smux_socket (void)
       sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
       if (sock < 0)
 	continue;
-      sockopt_reuseaddr (sock);
-      sockopt_reuseport (sock);
+      setsockopt_reuseaddr (sock);
+      setsockopt_reuseport (sock);
       ret = connect (sock, res->ai_addr, res->ai_addrlen);
       if (ret < 0)
 	{
@@ -251,8 +252,8 @@ smux_socket (void)
 
   serv.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
 
-  sockopt_reuseaddr (sock);
-  sockopt_reuseport (sock);
+  setsockopt_reuseaddr (sock);
+  setsockopt_reuseport (sock);
 
   ret = connect (sock, (struct sockaddr *) &serv, sizeof (struct sockaddr_in));
   if (ret < 0)