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, 41 insertions, 11 deletions

diff --git a/lib/prefix.h b/lib/prefix.h
index bc44244c..7944fd69 100644
--- a/lib/prefix.h
+++ b/lib/prefix.h
@@ -40,8 +40,8 @@ typedef const union sockunion* const_sockunion ;
 /* IPv4 and IPv6 unified prefix structure. */
 struct prefix
 {
-  u_char family;
-  u_char prefixlen;
+  sa_family_t   family;
+  u_char        prefixlen;
   union
   {
     u_char prefix;
@@ -61,36 +61,66 @@ struct prefix
 /* IPv4 prefix structure. */
 struct prefix_ipv4
 {
-  u_char family;
-  u_char prefixlen;
+  sa_family_t   family;
+  u_char        prefixlen;
   struct in_addr prefix __attribute__ ((aligned (8)));
 };
+CONFIRM(offsetof(struct prefix_ipv4, family)
+     == offsetof(struct prefix,      family)) ;
+CONFIRM(offsetof(struct prefix_ipv4, prefixlen)
+     == offsetof(struct prefix,      prefixlen)) ;
+CONFIRM(offsetof(struct prefix_ipv4, prefix)
+     == offsetof(struct prefix,      u.prefix4)) ;
+CONFIRM(sizeof(struct prefix_ipv4) <= sizeof(struct prefix)) ;
 
 /* IPv6 prefix structure. */
 #ifdef HAVE_IPV6
 struct prefix_ipv6
 {
-  u_char family;
-  u_char prefixlen;
+  sa_family_t   family;
+  u_char        prefixlen;
   struct in6_addr prefix __attribute__ ((aligned (8)));
 };
+CONFIRM(offsetof(struct prefix_ipv6, family)
+     == offsetof(struct prefix,      family)) ;
+CONFIRM(offsetof(struct prefix_ipv6, prefixlen)
+     == offsetof(struct prefix,      prefixlen)) ;
+CONFIRM(offsetof(struct prefix_ipv6, prefix)
+     == offsetof(struct prefix,      u.prefix6)) ;
+CONFIRM(sizeof(struct prefix_ipv6) <= sizeof(struct prefix)) ;
 #endif /* HAVE_IPV6 */
 
 struct prefix_ls
 {
-  u_char family;
-  u_char prefixlen;
+  sa_family_t   family;
+  u_char        prefixlen;
   struct in_addr id __attribute__ ((aligned (8)));
   struct in_addr adv_router;
 };
+CONFIRM(offsetof(struct prefix_ls,   family)
+     == offsetof(struct prefix,      family)) ;
+CONFIRM(offsetof(struct prefix_ls,   prefixlen)
+     == offsetof(struct prefix,      prefixlen)) ;
+CONFIRM(offsetof(struct prefix_ls,   id)
+     == offsetof(struct prefix,      u.lp.id)) ;
+CONFIRM(offsetof(struct prefix_ls,   adv_router)
+     == offsetof(struct prefix,      u.lp.adv_router)) ;
+CONFIRM(sizeof(struct prefix_ls)   <= sizeof(struct prefix)) ;
 
 /* Prefix for routing distinguisher. */
 struct prefix_rd
 {
-  u_char family;
-  u_char prefixlen;
-  u_char val[8] __attribute__ ((aligned (8)));
+  sa_family_t   family;
+  u_char        prefixlen;
+  u_char        val[8] __attribute__ ((aligned (8)));
 };
+CONFIRM(offsetof(struct prefix_rd,   family)
+     == offsetof(struct prefix,      family)) ;
+CONFIRM(offsetof(struct prefix_rd,   prefixlen)
+     == offsetof(struct prefix,      prefixlen)) ;
+CONFIRM(offsetof(struct prefix_rd,   val)
+     == offsetof(struct prefix,      u.val)) ;
+CONFIRM(sizeof(struct prefix_rd)   <= sizeof(struct prefix)) ;
 
 #ifndef INET_ADDRSTRLEN
 #define INET_ADDRSTRLEN 16