Temporary integrated OSPF commit.

1 files changed, 395 insertions, 347 deletions

diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h
index e705b88b..34c26b47 100644
--- a/proto/ospf/ospf.h
+++ b/proto/ospf/ospf.h
@@ -2,6 +2,8 @@
  *	BIRD -- OSPF
  *
  *	(c) 1999--2005 Ondrej Filip <feela@network.cz>
+ *	(c) 2009--2014 Ondrej Zajicek <santiago@crfreenet.org>
+ *	(c) 2009--2014 CZ.NIC z.s.p.o.
  *
  *	Can be freely distributed and used under the terms of the GNU GPL.
  */
@@ -9,23 +11,6 @@
 #ifndef _BIRD_OSPF_H_
 #define _BIRD_OSPF_H_
 
-#define MAXNETS 10
-#define OSPF_MIN_PKT_SIZE 256
-#define OSPF_MAX_PKT_SIZE 65535
-
-#ifdef LOCAL_DEBUG
-#define OSPF_FORCE_DEBUG 1
-#else
-#define OSPF_FORCE_DEBUG 0
-#endif
-#define OSPF_TRACE(flags, msg, args...) do { if ((p->debug & flags) || OSPF_FORCE_DEBUG) \
-  log(L_TRACE "%s: " msg, p->name , ## args ); } while(0)
-
-#define OSPF_PACKET(dumpfn, buffer, msg, args...) \
-do { if ((p->debug & D_PACKETS) || OSPF_FORCE_DEBUG) \
-{ log(L_TRACE "%s: " msg, p->name, ## args ); dumpfn(p, buffer); } } while(0)
-
-
 #include "nest/bird.h"
 
 #include "lib/checksum.h"
@@ -44,33 +29,72 @@ do { if ((p->debug & D_PACKETS) || OSPF_FORCE_DEBUG) \
 #include "conf/conf.h"
 #include "lib/string.h"
 
-#define OSPF_PROTO 89
 
-#ifndef IPV6
-#define OSPFv2 1
-#define OSPF_VERSION 2
-#define OSPF_VLINK_MTU 576			/* RFC 2328 A.1 */
-#define AllSPFRouters ipa_from_u32(0xe0000005)	/* 224.0.0.5 */
-#define AllDRouters ipa_from_u32(0xe0000006)	/* 224.0.0.6 */
+#ifdef LOCAL_DEBUG
+#define OSPF_FORCE_DEBUG 1
+#else
+#define OSPF_FORCE_DEBUG 0
+#endif
+
+
+#define IP4_MIN_MTU		576
+#define IP6_MIN_MTU		1280
+
+#define IP4_OSPF_ALL_ROUTERS	ipa_build4(224, 0, 0, 5)
+#define IP4_OSPF_DES_ROUTERS	ipa_build4(224, 0, 0, 6)
+
+#define IP6_OSPF_ALL_ROUTERS	ipa_build6(0xFF020000, 0, 0, 5)
+#define IP6_OSPF_DES_ROUTERS	ipa_build6(0xFF020000, 0, 0, 6)
+
+#ifdef IPV6
+#define ip4_addr u32
+#define ip6_addr ip_addr
+#define _MI6(x1,x2,x3,x4) _MI(x1, x2, x3, x4)
+#define ipa_is_link_local(x) ipa_has_link_scope(x)
+#define ipa_from_u32(x) _MI6(0,0,0xffff,x)
+#define ipa_to_u32(x) _I3(x)
+#define ipa_build4(a,b,c,d) IPA_NONE
+#define ipa_build6(a,b,c,d) _MI6(a,b,c,d)
+#define OSPF_IS_V2 0
 #else
-#define OSPFv3 1
-#define OSPF_VERSION 3
-#define OSPF_VLINK_MTU 1280			/* RFC 5340 A.1 */
-#define AllSPFRouters _MI(0xFF020000, 0, 0, 5)	/* FF02::5 */
-#define AllDRouters   _MI(0xFF020000, 0, 0, 6)	/* FF02::6 */
+#define ip4_addr u32
+#define ip6_addr ip_addr
+#define _I0(X) 0
+#define _I1(X) 0
+#define _I2(X) 0
+#define _I3(X) 0
+#define _MI6(x1,x2,x3,x4) IPA_NONE
+#define ipa_is_link_local(x) 0
+#define ipa_build4(a,b,c,d) _MI(((a) << 24) | ((b) << 16) | ((c) << 8) | (d))
+#define ipa_build6(a,b,c,d) IPA_NONE
+#define OSPF_IS_V2 1
 #endif
 
+// FIXME: MAX_PREFIX_LENGTH
+
+#define OSPF_TRACE(flags, msg, args...) \
+do { if ((p->p.debug & flags) || OSPF_FORCE_DEBUG) \
+  log(L_TRACE "%s: " msg, p->p.name , ## args ); } while(0)
+
+#define OSPF_PACKET(dumpfn, buffer, msg, args...) \
+do { if ((p->p.debug & D_PACKETS) || OSPF_FORCE_DEBUG) \
+  { log(L_TRACE "%s: " msg, p->p.name, ## args ); dumpfn(p, buffer); } } while(0)
+
+
+#define OSPF_PROTO 89
 
 #define LSREFRESHTIME 1800	/* 30 minutes */
 #define MINLSINTERVAL 5
 #define MINLSARRIVAL 1
 #define LSINFINITY 0xffffff
 
-#define DEFAULT_OSPFTICK 1
-#define DEFAULT_RFC1583 0	/* compatibility with rfc1583 */
-#define DEFAULT_STUB_COST 1000
-#define DEFAULT_ECMP_LIMIT 16
-#define DEFAULT_TRANSINT 40
+#define OSPF_DEFAULT_TICK 1
+#define OSPF_DEFAULT_STUB_COST 1000
+#define OSPF_DEFAULT_ECMP_LIMIT 16
+#define OSPF_DEFAULT_TRANSINT 40
+
+#define OSPF_MIN_PKT_SIZE 256
+#define OSPF_MAX_PKT_SIZE 65535
 
 #define OSPF_VLINK_ID_OFFSET 0x80000000
 
@@ -79,10 +103,12 @@ struct ospf_config
 {
   struct proto_config c;
   unsigned tick;
+  byte ospf2;
   byte rfc1583;
   byte stub_router;
   byte merge_external;
   byte abr;
+  byte asbr;
   int ecmp;
   list area_list;		/* list of struct ospf_area_config */
   list vlink_list;		/* list of struct ospf_iface_patt */
@@ -100,32 +126,34 @@ struct area_net_config
 {
   node n;
   struct prefix px;
-  int hidden;
   u32 tag;
+  u8 hidden;
 };
 
 struct area_net
 {
   struct fib_node fn;
-  int hidden;
-  int active;
-  u32 metric;
+  u32 metric;			/* With possible LSA_EXT3_EBIT for NSSA area nets */
   u32 tag;
+  u8 hidden;
+  u8 active;
 };
 
 struct ospf_stubnet_config
 {
   node n;
   struct prefix px;
-  int hidden, summary;
   u32 cost;
+  u8 hidden;
+  u8 summary;
 };
 
 struct ospf_area_config
 {
   node n;
   u32 areaid;
-  u32 default_cost;		/* Cost of default route for stub areas */
+  u32 default_cost;		/* Cost of default route for stub areas
+				   (With possible LSA_EXT3_EBIT for NSSA areas) */
   u8 type;			/* Area type (standard, stub, NSSA), represented
 				   by option flags (OPT_E, OPT_N) */
   u8 summary;			/* Import summaries to this stub/NSSA area, valid for ABR */
@@ -139,38 +167,57 @@ struct ospf_area_config
 };
 
 
-/* Option flags */
-
-#define OPT_E	0x02
-#define OPT_N	0x08
-#define OPT_DC	0x20
-
-#ifdef OSPFv2
-#define OPT_P	0x08		/* flags P and N share position, see NSSA RFC */
-#define OPT_EA	0x10
-
-/* VEB flags are are stored independently in 'u16 options' */
-#define OPT_RT_B  (0x01 << 8)
-#define OPT_RT_E  (0x02 << 8)
-#define OPT_RT_V  (0x04 << 8)
-#define OPT_RT_NT (0x10 << 8)
-#endif
-
-#ifdef OSPFv3
-#define OPT_V6	0x01
-#define OPT_R	0x10
+/* Generic option flags */
+#define OPT_V6	0x01		/* OSPFv3, LSA relevant for IPv6 routing calculation */
+#define OPT_E	0x02		/* Related to AS-external LSAs */
+#define OPT_MC	0x04		/* Related to MOSPF, not used and obsolete */
+#define OPT_N	0x08		/* Related to NSSA */
+#define OPT_P	0x08		/* OSPFv2, flags P and N share position, see NSSA RFC */
+#define OPT_EA	0x10		/* OSPFv2, external attributes, not used and obsolete */
+#define OPT_R	0x10		/* OSPFv3, originator is active router */
+#define OPT_DC	0x20		/* Related to demand circuits, not used */
 
-/* VEB flags are are stored together with options in 'u32 options' */
+/* Router-LSA VEB flags are are stored together with links (OSPFv2) or options (OSPFv3) */
 #define OPT_RT_B  (0x01 << 24)
 #define OPT_RT_E  (0x02 << 24)
 #define OPT_RT_V  (0x04 << 24)
 #define OPT_RT_NT (0x10 << 24)
 
+/* Prefix flags, specific for OSPFv3 */
 #define OPT_PX_NU 0x01
 #define OPT_PX_LA 0x02
 #define OPT_PX_P  0x08
 #define OPT_PX_DN 0x10
-#endif
+
+
+/* OSPF interface types */
+#define OSPF_IT_BCAST	0
+#define OSPF_IT_NBMA	1
+#define OSPF_IT_PTP	2
+#define OSPF_IT_PTMP	3
+#define OSPF_IT_VLINK	4
+#define OSPF_IT_UNDEF	5
+
+/* OSPF interface states */
+#define OSPF_IS_DOWN	0	/* Not active */
+#define OSPF_IS_LOOP	1	/* Iface with no link */
+#define OSPF_IS_WAITING	2	/* Waiting for Wait timer */
+#define OSPF_IS_PTP	3	/* PTP operational */
+#define OSPF_IS_DROTHER	4	/* I'm on BCAST or NBMA and I'm not DR */
+#define OSPF_IS_BACKUP	5	/* I'm BDR */
+#define OSPF_IS_DR	6	/* I'm DR */
+
+
+/* Default values for interface parameters */
+#define COST_D 10
+#define RXMTINT_D 5
+#define INFTRANSDELAY_D 1
+#define PRIORITY_D 1
+#define HELLOINT_D 10
+#define POLLINT_D 20
+#define DEADC_D 4
+#define WAIT_DMH 4		
+  /* Value of Wait timer - not found it in RFC * - using 4*HELLO */
 
 
 struct ospf_iface
@@ -199,82 +246,50 @@ struct ospf_iface
 				   transmit a Link State Update Packet over this
 				   interface.  LSAs contained in the update */
   u16 helloint;			/* number of seconds between hello sending */
-
-#ifdef OSPFv2
   list *passwords;
-  u16 autype;
   u32 csn;                      /* Last used crypt seq number */
   bird_clock_t csn_use;         /* Last time when packet with that CSN was sent */
-#endif
-
-  ip_addr all_routers;		/*  */
-  ip_addr drip;			/* Designated router */
-  ip_addr bdrip;		/* Backup DR */
-  u32 drid;
-  u32 bdrid;
+  ip_addr all_routers;		/* Multicast (or broadcast) address for all routers */
+  ip_addr des_routers;		/* Multicast (or NULL) address for designated routers */
+  ip_addr drip;			/* Designated router IP */
+  ip_addr bdrip;		/* Backup DR IP */
+  u32 drid;			/* DR Router ID */
+  u32 bdrid;			/* BDR Router ID */
   s16 rt_pos_beg;		/* Position of iface in Router-LSA, begin, inclusive */
   s16 rt_pos_end;		/* Position of iface in Router-LSA, end, exclusive */
-
-#ifdef OSPFv3
   s16 px_pos_beg;		/* Position of iface in Rt Prefix-LSA, begin, inclusive */
   s16 px_pos_end;		/* Position of iface in Rt Prefix-LSA, end, exclusive */
-
   u32 dr_iface_id;		/* if drid is valid, this is iface_id of DR (for connecting network) */
   u8 instance_id;		/* Used to differentiate between more OSPF
 				   instances on one interface */
-#endif
-
-  u8 type;			/* OSPF view of type */
-#define OSPF_IT_BCAST 0
-#define OSPF_IT_NBMA 1
-#define OSPF_IT_PTP 2
-#define OSPF_IT_PTMP 3
-#define OSPF_IT_VLINK 4
-#define OSPF_IT_UNDEF 5
+  u8 autype;			/* Authentication type (OSPF_AUTH_*) */
+  u8 type;			/* OSPF view of type (OSPF_IT_*) */
   u8 strictnbma;		/* Can I talk with unknown neighbors? */
   u8 stub;			/* Inactive interface */
-  u8 state;			/* Interface state machine */
-#define OSPF_IS_DOWN 0		/* Not working */
-#define OSPF_IS_LOOP 1		/* Iface with no link */
-#define OSPF_IS_WAITING 2	/* Waiting for Wait timer */
-#define OSPF_IS_PTP 3		/* PTP operational */
-#define OSPF_IS_DROTHER 4	/* I'm on BCAST or NBMA and I'm not DR */
-#define OSPF_IS_BACKUP 5	/* I'm BDR */
-#define OSPF_IS_DR 6		/* I'm DR */
+  u8 state;			/* Interface state machine (OSPF_IS_*) */
   timer *wait_timer;		/* WAIT timer */
   timer *hello_timer;		/* HELLOINT timer */
   timer *poll_timer;		/* Poll Interval - for NBMA */
-/* Default values for interface parameters */
-#define COST_D 10
-#define RXMTINT_D 5
-#define INFTRANSDELAY_D 1
-#define PRIORITY_D 1
-#define HELLOINT_D 10
-#define POLLINT_D 20
-#define DEADC_D 4
-#define WAIT_DMH 4		
-  /* Value of Wait timer - not found it in RFC * - using 4*HELLO */
 
-  struct top_hash_entry *net_lsa;	/* Originated network LSA */
-  int orignet;				/* Schedule network LSA origination */
-#ifdef OSPFv3
-  int origlink;				/* Schedule link LSA origination */
   struct top_hash_entry *link_lsa;	/* Originated link LSA */
+  struct top_hash_entry *net_lsa;	/* Originated network LSA */
   struct top_hash_entry *pxn_lsa;	/* Originated prefix LSA */
-#endif
-  int fadj;				/* Number of full adjacent neigh */
+  u8 update_link_lsa;
+  u8 update_net_lsa;
+  int fadj;			/* Number of fully adjacent neighbors */
   list nbma_list;
   u8 priority;			/* A router priority for DR election */
   u8 ioprob;
 #define OSPF_I_OK 0		/* Everything OK */
 #define OSPF_I_SK 1		/* Socket open failed */
 #define OSPF_I_LL 2		/* Missing link-local address (OSPFv3) */
-  u8 sk_dr; 			/* Socket is a member of DRouters group */
-  u8 marked;			/* Used in OSPF reconfigure */
+  u8 sk_dr; 			/* Socket is a member of designated routers group */
+  u8 marked;			/* Used in OSPF reconfigure, 2 for force restart */
   u16 rxbuf;			/* Buffer size */
   u16 tx_length;		/* Soft TX packet length limit, usually MTU */
   u8 check_link;		/* Whether iface link change is used */
   u8 ecmp_weight;		/* Weight used for ECMP */
+  u8 link_lsa_suppression;	/* Suppression of Link-LSA origination */
   u8 ptp_netmask;		/* Send real netmask for P2P */
   u8 check_ttl;			/* Check incoming packets for TTL 255 */
   u8 bfd;			/* Use BFD on iface */
@@ -296,42 +311,20 @@ union ospf_auth
 
 
 /* Packet types */
-#define HELLO_P 1		/* Hello */
-#define DBDES_P 2		/* Database description */
-#define LSREQ_P 3		/* Link state request */
-#define LSUPD_P 4		/* Link state update */
-#define LSACK_P 5		/* Link state acknowledgement */
+#define HELLO_P		1	/* Hello */
+#define DBDES_P		2	/* Database description */
+#define LSREQ_P		3	/* Link state request */
+#define LSUPD_P		4	/* Link state update */
+#define LSACK_P		5	/* Link state acknowledgement */
 
 /* Area IDs */
-#define BACKBONE 0
-
-
-struct immsb
-{
-#ifdef CPU_BIG_ENDIAN
-  u8 padding:5;
-  u8 i:1;
-  u8 m:1;
-  u8 ms:1;
-#else
-  u8 ms:1;
-  u8 m:1;
-  u8 i:1;
-  u8 padding:5;
-#endif
-};
-
-union imms
-{
-  u8 byte;
-  struct immsb bit;
-};
-#define DBDES_MS 1
-#define DBDES_M 2
-#define DBDES_I 4
+#define BACKBONE	0
 
+#define DBDES_I		4	/* Init bit */
+#define DBDES_M		2	/* More bit */
+#define DBDES_MS	1	/* Master/Slave bit */
+#define DBDES_IMMS	(DBDES_I | DBDES_M | DBDES_MS)
 
-#ifdef OSPFv2
 
 struct ospf_packet
 {
@@ -341,57 +334,11 @@ struct ospf_packet
   u32 routerid;
   u32 areaid;
   u16 checksum;
-  u16 autype;
-  union ospf_auth u;
+  u8 instance_id;		/* See RFC 6549 */
+  u8 autype;			/* Undefined for OSPFv3 */
 };
 
 
-#else /* OSPFv3 packet descriptions */
-
-struct ospf_packet
-{
-  u8 version;
-  u8 type;
-  u16 length;
-  u32 routerid;
-  u32 areaid;
-  u16 checksum;
-  u8 instance_id;
-  u8 zero;
-};
-
-
-#endif
-
-
-
-
-struct ospf_lsa_header
-{
-  u16 age;			/* LS Age */
-#define LSA_MAXAGE 3600		/* 1 hour */
-#define LSA_CHECKAGE 300	/* 5 minutes */
-#define LSA_MAXAGEDIFF 900	/* 15 minutes */
-
-#ifdef OSPFv2
-  u8 options;
-  u8 type;
-
-#define LSA_T_RT	1
-#define LSA_T_NET	2
-#define LSA_T_SUM_NET	3
-#define LSA_T_SUM_RT	4
-#define LSA_T_EXT	5
-#define LSA_T_NSSA	7
-
-#define LSA_SCOPE_AREA	0x2000
-#define LSA_SCOPE_AS	0x4000
-
-#define LSA_SCOPE(lsa)	(((lsa)->type == LSA_T_EXT) ? LSA_SCOPE_AS : LSA_SCOPE_AREA)
-
-#else /* OSPFv3 */
-  u16 type;
-
 #define LSA_T_RT	0x2001
 #define LSA_T_NET	0x2002
 #define LSA_T_SUM_NET	0x2003
@@ -401,6 +348,8 @@ struct ospf_lsa_header
 #define LSA_T_LINK	0x0008
 #define LSA_T_PREFIX	0x2009
 
+#define LSA_T_V2_MASK	0x00ff
+
 #define LSA_UBIT	0x8000
 
 #define LSA_SCOPE_LINK	0x0000
@@ -408,91 +357,93 @@ struct ospf_lsa_header
 #define LSA_SCOPE_AS	0x4000
 #define LSA_SCOPE_RES	0x6000
 #define LSA_SCOPE_MASK	0x6000
+#define LSA_SCOPE(type)	((type) & LSA_SCOPE_MASK)
 
-#define LSA_SCOPE(lsa)	((lsa)->type & LSA_SCOPE_MASK)
-#endif
+
+#define LSA_MAXAGE	3600	/* 1 hour */
+#define LSA_CHECKAGE	300	/* 5 minutes */
+#define LSA_MAXAGEDIFF	900	/* 15 minutes */
+
+#define LSA_ZEROSEQNO	((s32) 0x80000000)
+#define LSA_INITSEQNO	((s32) 0x80000001)
+#define LSA_MAXSEQNO	((s32) 0x7fffffff)
+
+#define LSA_METRIC_MASK  0x00FFFFFF
+#define LSA_OPTIONS_MASK 0x00FFFFFF
+
+
+#define LSART_PTP	1
+#define LSART_NET	2
+#define LSART_STUB	3
+#define LSART_VLNK	4
+
+#define LSA_RT2_LINKS	0x0000FFFF
+
+#define LSA_SUM2_TOS	0xFF000000
+
+#define LSA_EXT2_TOS	0x7F000000
+#define LSA_EXT2_EBIT	0x80000000
+
+#define LSA_EXT3_EBIT	0x4000000
+#define LSA_EXT3_FBIT	0x2000000
+#define LSA_EXT3_TBIT	0x1000000
+
+
+struct ospf_lsa_header
+{
+  u16 age;			/* LS Age */
+  u16 type_raw;			/* Type, mixed with options on OSPFv2 */
 
   u32 id;
   u32 rt;			/* Advertising router */
   s32 sn;			/* LS Sequence number */
-#define LSA_INITSEQNO ((s32) 0x80000001)
-#define LSA_MAXSEQNO ((s32) 0x7fffffff)
   u16 checksum;
   u16 length;
 };
 
 
-#define LSART_PTP 1
-#define LSART_NET 2
-#define LSART_STUB 3
-#define LSART_VLNK 4
+/* In OSPFv2, options are embedded in higher half of type_raw */
+static inline u8 lsa_get_options(struct ospf_lsa_header *lsa)
+{ return lsa->type_raw >> 8; }
 
+static inline void lsa_set_options(struct ospf_lsa_header *lsa, u16 options)
+{ lsa->type_raw = (lsa->type_raw & 0xff) | (options << 8); }
 
-#ifdef OSPFv2
 
 struct ospf_lsa_rt
 {
-#ifdef CPU_BIG_ENDIAN
-  u16 options;	/* VEB flags only */
-  u16 links;
-#else
-  u16 links;
-  u16 options;	/* VEB flags only */
-#endif
+  u32 options;	/* VEB flags, mixed with link count for OSPFv2 and options for OSPFv3 */
 };
 
-struct ospf_lsa_rt_link
+struct ospf_lsa_rt2_link
 {
   u32 id;
   u32 data;
 #ifdef CPU_BIG_ENDIAN
   u8 type;
-  u8 padding;
+  u8 no_tos;
   u16 metric;
 #else
   u16 metric;
-  u8 padding;
+  u8 no_tos;
   u8 type;
 #endif
 };
 
-struct ospf_lsa_net
-{
-  ip_addr netmask;
-  u32 routers[];
-};
-
-struct ospf_lsa_sum
-{
-  ip_addr netmask;
-  u32 metric;
-};
-
-struct ospf_lsa_ext
-{
-  ip_addr netmask;
-  u32 metric;
-  ip_addr fwaddr;
-  u32 tag;
-};
-
-#define LSA_SUM_TOS  0xFF000000
-#define LSA_EXT_TOS  0x7F000000
-#define LSA_EXT_EBIT 0x80000000
-
-/* Endianity swap for lsa->type */
-#define ntoht(x) x
-#define htont(x) x
-
-
-#else  /* OSPFv3 */
-
-struct ospf_lsa_rt
+struct ospf_lsa_rt2_tos
 {
-  u32 options;
+#ifdef CPU_BIG_ENDIAN
+  u8 tos;
+  u8 padding;
+  u16 metric;
+#else
+  u16 metric;
+  u8 padding;
+  u8 tos;
+#endif
 };
 
-struct ospf_lsa_rt_link
+struct ospf_lsa_rt3_link
 {
 #ifdef CPU_BIG_ENDIAN
   u8 type;
@@ -508,35 +459,58 @@ struct ospf_lsa_rt_link
   u32 id;	/* Neighbor router ID */
 };
 
+
 struct ospf_lsa_net
 {
-  u32 options;
+  u32 optx;	/* Netmask for OSPFv2, options for OSPFv3 */
   u32 routers[];
 };
 
-struct ospf_lsa_sum_net
+struct ospf_lsa_sum2
+{
+  u32 netmask;
+  u32 metric;
+};
+
+struct ospf_lsa_sum3_net
 {
   u32 metric;
   u32 prefix[];
 };
 
-struct ospf_lsa_sum_rt
+struct ospf_lsa_sum3_rt
 {
   u32 options;
   u32 metric;
   u32 drid;
 };
 
-struct ospf_lsa_ext
+struct ospf_lsa_ext2
+{
+  u32 netmask;
+  u32 metric;
+  u32 fwaddr;
+  u32 tag;
+};
+
+struct ospf_lsa_ext3
 {
   u32 metric;
   u32 rest[];
 };
 
+struct ospf_lsa_ext_local
+{
+  ip_addr ip, fwaddr;
+  int pxlen;
+  u32 metric, ebit, fbit, tag, propagate;
+  u8 pxopts;
+};
+
 struct ospf_lsa_link
 {
   u32 options;
-  ip_addr lladdr;
+  ip6_addr lladdr;
   u32 pxcount;
   u32 rest[];
 };
@@ -555,25 +529,6 @@ struct ospf_lsa_prefix
   u32 rest[];
 };
 
-#define LSA_EXT_EBIT 0x4000000
-#define LSA_EXT_FBIT 0x2000000
-#define LSA_EXT_TBIT 0x1000000
-
-/* Endianity swap for lsa->type */
-#define ntoht(x) ntohs(x)
-#define htont(x) htons(x)
-
-#endif
-
-#define METRIC_MASK  0x00FFFFFF
-#define OPTIONS_MASK 0x00FFFFFF
-
-static inline unsigned
-lsa_rt_count(struct ospf_lsa_header *lsa)
-{
-  return (lsa->length - sizeof(struct ospf_lsa_header) - sizeof(struct ospf_lsa_rt))
-    / sizeof(struct ospf_lsa_rt_link);
-}
 
 static inline unsigned
 lsa_net_count(struct ospf_lsa_header *lsa)
@@ -582,8 +537,12 @@ lsa_net_count(struct ospf_lsa_header *lsa)
     / sizeof(u32);
 }
 
+/* In ospf_area->rtr we store paths to routers, but we use RID (and not IP address)
+   as index, so we need to encapsulate RID to IP address */
+
+#define ipa_from_rid(x) ipa_from_u32(x)
+#define ipa_to_rid(x) ipa_to_u32(x)
 
-#ifdef OSPFv3
 
 #define IPV6_PREFIX_SPACE(x) ((((x) + 63) / 32) * 4)
 #define IPV6_PREFIX_WORDS(x) (((x) + 63) / 32)
@@ -645,21 +604,12 @@ put_ipv6_addr(u32 *buf, ip_addr addr)
   return buf + 4;
 }
 
-#endif
-
-
 
 struct ospf_lsreq_header
 {
   u32 type;
   u32 id;
-  u32 rt;			/* Advertising router */
-};
-
-struct l_lsr_head
-{
-  node n;
-  struct ospf_lsreq_header lsh;
+  u32 rt;
 };
 
 
@@ -678,31 +628,38 @@ struct ospf_neighbor
 #define NEIGHBOR_LOADING 6
 #define NEIGHBOR_FULL 7
   timer *inactim;		/* Inactivity timer */
-  union imms imms;		/* I, M, Master/slave received */
+  u8 imms;			/* I, M, Master/slave received */
+  u8 myimms;			/* I, M Master/slave */
   u32 dds;			/* DD Sequence number being sent */
   u32 ddr;			/* last Dat Des packet received */
-  union imms myimms;		/* I, M Master/slave */
+
   u32 rid;			/* Router ID */
   ip_addr ip;			/* IP of it's interface */
   u8 priority;			/* Priority */
   u8 adj;			/* built adjacency? */
   u32 options;			/* Options received */
 
-  /* dr and bdr store IP address in OSPFv2 and router ID in OSPFv3,
-     we use the same type to simplify handling */
+  /* Entries dr and bdr store IP addresses in OSPFv2 and router IDs in
+     OSPFv3, we use the same type to simplify handling */
   u32 dr;			/* Neigbour's idea of DR */
   u32 bdr;			/* Neigbour's idea of BDR */
-
-#ifdef OSPFv3
   u32 iface_id;			/* ID of Neighbour's iface connected to common network */
-#endif
 
-  siterator dbsi;		/* Database summary list iterator */
-  slist lsrql;			/* Link state request */
-  struct top_graph *lsrqh;	/* LSA graph */
-  siterator lsrqi;
-  slist lsrtl;			/* Link state retransmission list */
-  siterator lsrti;
+  /* Database summary list iterator, controls initial dbdes exchange.
+   * Advances in the LSA list as dbdes packets are sent.
+   */
+  siterator dbsi;		/* iterator of po->lsal */
+
+  /* Link state request list, controls initial LSA exchange.
+   * Entries added when received in dbdes packets, removed as sent in lsreq packets.
+   */
+  slist lsrql;			/* slist of struct top_hash_entry from n->lsrqh */
+  struct top_graph *lsrqh;
+
+  /* Link state retransmission list, controls LSA retransmission during flood.
+   * Entries added as sent in lsupd packets, removed when received in lsack packets.
+   */
+  slist lsrtl;			/* slist of struct top_hash_entry from n->lsrth */
   struct top_graph *lsrth;
   timer *rxmt_timer;		/* RXMT timer */
   list ackl[2];
@@ -750,12 +707,12 @@ struct ospf_area
   struct fib net_fib;		/* Networks to advertise or not */
   struct fib enet_fib;		/* External networks for NSSAs */
   u32 options;			/* Optional features */
-  byte origrt;			/* Rt lsa origination scheduled? */
-  byte trcap;			/* Transit capability? */
-  byte marked;			/* Used in OSPF reconfigure */
-  byte translate;		/* Translator state (TRANS_*), for NSSA ABR  */
+  u8 update_rt_lsa;		/* Rt lsa origination scheduled? */
+  u8 trcap;			/* Transit capability? */
+  u8 marked;			/* Used in OSPF reconfigure */
+  u8 translate;			/* Translator state (TRANS_*), for NSSA ABR  */
   timer *translator_timer;	/* For NSSA translator switch */
-  struct proto_ospf *po;
+  struct ospf_proto *po;
   struct fib rtr;		/* Routing tables for routers */
 };
 
@@ -763,9 +720,9 @@ struct ospf_area
 #define TRANS_ON	1
 #define TRANS_WAIT	2	/* Waiting before the end of translation */
 
-struct proto_ospf
+struct ospf_proto
 {
-  struct proto proto;
+  struct proto p;
   timer *disp_timer;		/* OSPF proto dispatcher */
   unsigned tick;
   struct top_graph *gr;		/* LSA graph */
@@ -775,11 +732,13 @@ struct proto_ospf
   list iface_list;		/* Interfaces we really use */
   list area_list;
   int areano;			/* Number of area I belong to */
+  int padj;			/* Number of neighbors in Exchange or Loading state */
   struct fib rtf;		/* Routing table */
+  byte ospf2;			/* OSPF v2 or v3 */
   byte rfc1583;			/* RFC1583 compatibility */
   byte stub_router;		/* Do not forward transit traffic */
   byte merge_external;		/* Should i merge external routes? */
-  byte ebit;			/* Did I originate any ext lsa? */
+  byte asbr;			/* May i originate any ext/NSSA lsa? */
   byte ecmp;			/* Maximal number of nexthops in ECMP route, or 0 */
   struct ospf_area *backbone;	/* If exists */
   void *lsab;			/* LSA buffer used when originating router LSAs */
@@ -813,7 +772,8 @@ struct ospf_iface_patt
   u16 rx_buffer;
 
 #define OSPF_RXBUF_MINSIZE 256	/* Minimal allowed size */
-  u16 autype;			/* Not really used in OSPFv3 */
+  u8 instance_id;
+  u8 autype;			/* Not really used in OSPFv3 */
 #define OSPF_AUTH_NONE 0
 #define OSPF_AUTH_SIMPLE 1
 #define OSPF_AUTH_CRYPT 2
@@ -821,51 +781,15 @@ struct ospf_iface_patt
   u8 strictnbma;
   u8 check_link;
   u8 ecmp_weight;
+  u8 link_lsa_suppression;
   u8 real_bcast;		/* Not really used in OSPFv3 */
   u8 ptp_netmask;		/* bool + 2 for unspecified */
   u8 ttl_security;		/* bool + 2 for TX only */
   u8 bfd;
   u8 bsd_secondary;
-
-#ifdef OSPFv2
   list *passwords;
-#endif
-
-#ifdef OSPFv3
-  u8 instance_id;
-#endif
 };
 
-int ospf_import_control(struct proto *p, rte **new, ea_list **attrs,
-			struct linpool *pool);
-struct ea_list *ospf_make_tmp_attrs(struct rte *rt, struct linpool *pool);
-void ospf_store_tmp_attrs(struct rte *rt, struct ea_list *attrs);
-void schedule_rt_lsa(struct ospf_area *oa);
-void schedule_rtcalc(struct proto_ospf *po);
-void schedule_net_lsa(struct ospf_iface *ifa);
-
-struct ospf_area *ospf_find_area(struct proto_ospf *po, u32 aid);
-static inline struct ospf_area *ospf_main_area(struct proto_ospf *po)
-{ return (po->areano == 1) ? HEAD(po->area_list) : po->backbone; }
-
-static inline int oa_is_stub(struct ospf_area *oa)
-{ return (oa->options & (OPT_E | OPT_N)) == 0; }
-static inline int oa_is_ext(struct ospf_area *oa)
-{ return oa->options & OPT_E; }
-static inline int oa_is_nssa(struct ospf_area *oa)
-{ return oa->options & OPT_N; }
-
-
-#ifdef OSPFv3
-void schedule_link_lsa(struct ospf_iface *ifa);
-#else
-static inline void schedule_link_lsa(struct ospf_iface *ifa UNUSED) {}
-#endif
-
-void ospf_sh_neigh(struct proto *p, char *iff);
-void ospf_sh(struct proto *p);
-void ospf_sh_iface(struct proto *p, char *iff);
-void ospf_sh_state(struct proto *p, int verbose, int reachable);
 
 #define SH_ROUTER_SELF 0xffffffff
 
@@ -878,24 +802,148 @@ struct lsadb_show_data {
   u32 router;		/* Advertising router, 0 -> all */
 };
 
-void ospf_sh_lsadb(struct lsadb_show_data *ld);
-
 
 #define EA_OSPF_METRIC1	EA_CODE(EAP_OSPF, 0)
 #define EA_OSPF_METRIC2	EA_CODE(EAP_OSPF, 1)
 #define EA_OSPF_TAG	EA_CODE(EAP_OSPF, 2)
 #define EA_OSPF_ROUTER_ID EA_CODE(EAP_OSPF, 3)
 
+
+/* ospf.c */
+void schedule_rtcalc(struct ospf_proto *p);
+
+static inline void ospf_notify_rt_lsa(struct ospf_area *oa)
+{ oa->update_rt_lsa = 1; }
+
+static inline void ospf_notify_net_lsa(struct ospf_iface *ifa)
+{ ifa->update_net_lsa = 1; }
+
+static inline void ospf_notify_link_lsa(struct ospf_iface *ifa)
+{ ifa->update_link_lsa = 1; }
+
+
+static inline int ospf_is_v2(struct ospf_proto *p)
+{ return p->ospf2; }
+
+static inline int ospf_is_v3(struct ospf_proto *p)
+{ return ! p->ospf2; }
+
+static inline int ospf_get_version(struct ospf_proto *p)
+{ return ospf_is_v2(p) ? 2 : 3; }
+
+struct ospf_area *ospf_find_area(struct ospf_proto *p, u32 aid);
+
+static inline struct ospf_area *ospf_main_area(struct ospf_proto *p)
+{ return (p->areano == 1) ? HEAD(p->area_list) : p->backbone; }
+
+static inline int oa_is_stub(struct ospf_area *oa)
+{ return (oa->options & (OPT_E | OPT_N)) == 0; }
+
+static inline int oa_is_ext(struct ospf_area *oa)
+{ return oa->options & OPT_E; }
+
+static inline int oa_is_nssa(struct ospf_area *oa)
+{ return oa->options & OPT_N; }
+
+void ospf_sh_neigh(struct proto *P, char *iff);
+void ospf_sh(struct proto *P);
+void ospf_sh_iface(struct proto *P, char *iff);
+void ospf_sh_state(struct proto *P, int verbose, int reachable);
+
+void ospf_sh_lsadb(struct lsadb_show_data *ld);
+
+/* iface.c */
+void ospf_iface_chstate(struct ospf_iface *ifa, u8 state);
+void ospf_iface_sm(struct ospf_iface *ifa, int event);
+struct ospf_iface *ospf_iface_find(struct ospf_proto *p, struct iface *what);
+void ospf_if_notify(struct proto *P, uint flags, struct iface *iface);
+void ospf_ifa_notify2(struct proto *P, uint flags, struct ifa *a);
+void ospf_ifa_notify3(struct proto *P, uint flags, struct ifa *a);
+void ospf_iface_info(struct ospf_iface *ifa);
+void ospf_iface_new(struct ospf_area *oa, struct ifa *addr, struct ospf_iface_patt *ip);
+void ospf_iface_new_vlink(struct ospf_proto *p, struct ospf_iface_patt *ip);
+void ospf_iface_remove(struct ospf_iface *ifa);
+void ospf_iface_shutdown(struct ospf_iface *ifa);
+int ospf_iface_assure_bufsize(struct ospf_iface *ifa, uint plen);
+int ospf_iface_reconfigure(struct ospf_iface *ifa, struct ospf_iface_patt *new);
+void ospf_reconfigure_ifaces(struct ospf_proto *p);
+void ospf_open_vlink_sk(struct ospf_proto *p);
+struct nbma_node *find_nbma_node_(list *nnl, ip_addr ip);
+
+static inline struct nbma_node * find_nbma_node(struct ospf_iface *ifa, ip_addr ip)
+{ return find_nbma_node_(&ifa->nbma_list, ip); }
+
+/* neighbor.c */
+struct ospf_neighbor *ospf_neighbor_new(struct ospf_iface *ifa);
+void ospf_neigh_sm(struct ospf_neighbor *n, int event);
+void ospf_dr_election(struct ospf_iface *ifa);
+struct ospf_neighbor *find_neigh(struct ospf_iface *ifa, u32 rid);
+struct ospf_neighbor *find_neigh_by_ip(struct ospf_iface *ifa, ip_addr ip);
+void ospf_neigh_remove(struct ospf_neighbor *n);
+void ospf_neigh_update_bfd(struct ospf_neighbor *n, int use_bfd);
+void ospf_sh_neigh_info(struct ospf_neighbor *n);
+
+/* packet.c */
+void ospf_pkt_fill_hdr(struct ospf_iface *ifa, void *buf, u8 h_type);
+uint ospf_pkt_maxsize(struct ospf_iface *ifa);
+int ospf_rx_hook(sock * sk, int size);
+// void ospf_tx_hook(sock * sk);
+void ospf_err_hook(sock * sk, int err);
+void ospf_verr_hook(sock *sk, int err);
+void ospf_send_to(struct ospf_iface *ifa, ip_addr ip);
+void ospf_send_to_agt(struct ospf_iface *ifa, u8 state);
+void ospf_send_to_bdr(struct ospf_iface *ifa);
+
+static inline void ospf_send_to_all(struct ospf_iface *ifa)
+{ ospf_send_to(ifa, ifa->all_routers); }
+
+static inline void ospf_send_to_des(struct ospf_iface *ifa)
+{
+  if (ipa_nonzero(ifa->des_routers))
+    ospf_send_to(ifa, ifa->des_routers);
+  else
+    ospf_send_to_bdr(ifa);
+}
+
+static inline uint ospf_pkt_hdrlen(struct ospf_proto *p)
+{ return ospf_is_v2(p) ? (sizeof(struct ospf_packet) + sizeof(union ospf_auth)) : sizeof(struct ospf_packet); }
+
+static inline void * ospf_tx_buffer(struct ospf_iface *ifa)
+{ return ifa->sk->tbuf; }
+
+/* hello.c */
+#define OHS_HELLO    0
+#define OHS_POLL     1
+#define OHS_SHUTDOWN 2
+
+void ospf_send_hello(struct ospf_iface *ifa, int kind, struct ospf_neighbor *dirn);
+void ospf_receive_hello(struct ospf_packet *pkt, struct ospf_iface *ifa, struct ospf_neighbor *n, ip_addr faddr);
+
+/* dbdes.c */
+void ospf_send_dbdes(struct ospf_neighbor *n, int next);
+void ospf_receive_dbdes(struct ospf_packet *pkt, struct ospf_iface *ifa, struct ospf_neighbor *n);
+
+/* lsreq.c */
+void ospf_send_lsreq(struct ospf_proto *p, struct ospf_neighbor *n);
+void ospf_receive_lsreq(struct ospf_packet *pkt, struct ospf_iface *ifa, struct ospf_neighbor *n);
+
+/* lsupd.c */
+void ospf_dump_lsahdr(struct ospf_proto *p, struct ospf_lsa_header *lsa_n);
+void ospf_dump_common(struct ospf_proto *p, struct ospf_packet *pkt);
+int ospf_lsupd_flood(struct ospf_proto *p, struct top_hash_entry *en, struct ospf_neighbor *from);
+int ospf_send_lsupd(struct ospf_proto *p, struct top_hash_entry **lsa_list, uint lsa_count, struct ospf_neighbor *n);
+void ospf_rxmt_lsupd(struct ospf_proto *p, struct ospf_neighbor *n);
+void ospf_receive_lsupd(struct ospf_packet *pkt, struct ospf_iface *ifa, struct ospf_neighbor *n);
+
+/* lsack.c */
+void ospf_enqueue_lsack(struct ospf_neighbor *n, struct ospf_lsa_header *h_n, int queue);
+void ospf_reset_lsack_queue(struct ospf_neighbor *n);
+void ospf_lsack_send(struct ospf_neighbor *n, int queue);
+void ospf_receive_lsack(struct ospf_packet *pkt, struct ospf_iface *ifa, struct ospf_neighbor *n);
+
+
 #include "proto/ospf/rt.h"
-#include "proto/ospf/hello.h"
-#include "proto/ospf/packet.h"
-#include "proto/ospf/iface.h"
-#include "proto/ospf/neighbor.h"
 #include "proto/ospf/topology.h"
-#include "proto/ospf/dbdes.h"
-#include "proto/ospf/lsreq.h"
-#include "proto/ospf/lsupd.h"
-#include "proto/ospf/lsack.h"
 #include "proto/ospf/lsalib.h"
 
 #endif /* _BIRD_OSPF_H_ */