Commit 3b3b0910 authored by Ondrej Zajicek (work)'s avatar Ondrej Zajicek (work)
Browse files

Babel: More changes and bugfixes 

Several changes and bugfixes in Babel, namely:

- Exported route parameters stored directly in route table entry
- Exported non-babel routes no longer stored in per-entry route list
- Route update, selection and retraction simplified and fixed
- Route feasibility is evalualated per update and stored with route
- Unreachable route handling fixed, based on hold interval
- Added 'show babel routes' command

Overall, it fixes some issues with proper propagation of triggered
updates, making Babel convergence after topology change almost
instant.
parent dbf1ed26

nest/route.h

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ typedef struct rte { 
#endif

#ifdef CONFIG_BABEL

    struct {

      u16 seqno;			/* Babel seqno */

      u16 metric;			/* Babel metric */

      u64 router_id;			/* Babel router id */

    } babel;

proto/babel/babel.c

+283 −279

File changed.

Preview size limit exceeded, changes collapsed.

proto/babel/babel.h

+22 −14
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
 *	BIRD -- The Babel protocol

 *

 *	Copyright (c) 2015--2016 Toke Hoiland-Jorgensen

 * 	(c) 2016--2017 Ondrej Zajicek <santiago@crfreenet.org>

 *	(c) 2016--2017 CZ.NIC z.s.p.o.

 *

 *	Can be freely distributed and used under the terms of the GNU GPL.

 *
@@ -37,11 +39,11 @@ 
#define BABEL_HELLO_LIMIT		12

#define BABEL_UPDATE_INTERVAL_FACTOR	4

#define BABEL_IHU_INTERVAL_FACTOR	3

#define BABEL_HOLD_TIME_FACTOR		4	/* How long we keep unreachable route relative to update interval */

#define BABEL_IHU_EXPIRY_FACTOR(X)	((btime)(X)*7/2)	/* 3.5 */

#define BABEL_HELLO_EXPIRY_FACTOR(X)	((btime)(X)*3/2)	/* 1.5 */

#define BABEL_ROUTE_EXPIRY_FACTOR(X)	((btime)(X)*7/2)	/* 3.5 */

#define BABEL_ROUTE_REFRESH_INTERVAL	(2 S_)	/* Time before route expiry to send route request */

#define BABEL_HOLD_TIME			(10 S_)	/* Expiry time for our own routes */

#define BABEL_ROUTE_REFRESH_FACTOR(X)	((btime)(X)*5/2)	/* 2.5 */

#define BABEL_SEQNO_REQUEST_RETRY	4

#define BABEL_SEQNO_REQUEST_EXPIRY	(2 S_)

#define BABEL_GARBAGE_INTERVAL		(300 S_)
@@ -105,8 +107,8 @@ enum babel_ae_type { 


struct babel_config {

  struct proto_config c;



  list iface_list;              /* Patterns configured -- keep it first; see babel_reconfigure why */

  list iface_list;			/* List of iface configs (struct babel_iface_config) */

  uint hold_time;			/* Time to hold stale entries and unreachable routes */

};



struct babel_iface_config {
@@ -220,15 +222,14 @@ struct babel_route { 
  struct babel_entry    *e;

  struct babel_neighbor *neigh;



  u8 feasible;

  u16 seqno;

  u16 advert_metric;

  u16 metric;

  u16 old_metric;

  u16 advert_metric;

  u64 router_id;

  ip_addr next_hop;

  btime refresh_time;

  btime expires;

  btime expiry_interval;

};



struct babel_seqno_request {
@@ -242,19 +243,25 @@ struct babel_seqno_request { 
};



struct babel_entry {

  struct babel_route *selected_in;

  struct babel_route *selected_out;

  struct babel_route *selected;



  btime updated;



  list requests;

  list sources;				/* Source entries for this prefix (struct babel_source). */

  list routes;				/* Routes for this prefix (struct babel_route) */

  list sources;				/* Source entries for this prefix (struct babel_source). */

  list requests;



  u8 valid;				/* Entry validity state (BABEL_ENTRY_*) */

  u8 unreachable;			/* Unreachable route is announced */

  u16 seqno;				/* Outgoing seqno */

  u16 metric;				/* Outgoing metric */

  u64 router_id;			/* Outgoing router ID */

  btime updated;			/* Last change of outgoing rte, for triggered updates */



  struct fib_node n;

};



/* Stores forwarded seqno requests for duplicate suppression. */

#define BABEL_ENTRY_DUMMY	0	/* No outgoing route */

#define BABEL_ENTRY_VALID	1	/* Valid outgoing route */

#define BABEL_ENTRY_STALE	2	/* Stale outgoing route, waiting for GC */





/*
@@ -346,6 +353,7 @@ void babel_handle_seqno_request(union babel_msg *msg, struct babel_iface *ifa); 
void babel_show_interfaces(struct proto *P, char *iff);

void babel_show_neighbors(struct proto *P, char *iff);

void babel_show_entries(struct proto *P);

void babel_show_routes(struct proto *P);



/* packets.c */

void babel_enqueue(union babel_msg *msg, struct babel_iface *ifa);

proto/babel/config.Y

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
 *	BIRD -- Babel Configuration

 *

 *	Copyright (c) 2015-2016 Toke Hoiland-Jorgensen

 * 	(c) 2016--2017 Ondrej Zajicek <santiago@crfreenet.org>

 *	(c) 2016--2017 CZ.NIC z.s.p.o.

 *

 *	Can be freely distributed and used under the terms of the GNU GPL.

 */
@@ -32,6 +34,7 @@ babel_proto_start: proto_start BABEL 
{

  this_proto = proto_config_new(&proto_babel, $1);

  init_list(&BABEL_CFG->iface_list);

  BABEL_CFG->hold_time = 1 S_;

};



babel_proto_item:
@@ -84,6 +87,8 @@ babel_iface_finish: 
  if (!BABEL_IFACE->update_interval)

    BABEL_IFACE->update_interval = MIN_(BABEL_IFACE->hello_interval*BABEL_UPDATE_INTERVAL_FACTOR, BABEL_MAX_INTERVAL);

  BABEL_IFACE->ihu_interval = MIN_(BABEL_IFACE->hello_interval*BABEL_IHU_INTERVAL_FACTOR, BABEL_MAX_INTERVAL);



  BABEL_CFG->hold_time = MAX_(BABEL_CFG->hold_time, BABEL_IFACE->update_interval*BABEL_HOLD_TIME_FACTOR);

};
@@ -131,6 +136,9 @@ CF_CLI(SHOW BABEL NEIGHBORS, optsym opttext, [<name>] [\"<interface>\"], [[Show 
CF_CLI(SHOW BABEL ENTRIES, optsym opttext, [<name>], [[Show information about Babel prefix entries]])

{ babel_show_entries(proto_get_named($4, &proto_babel)); };



CF_CLI(SHOW BABEL ROUTES, optsym opttext, [<name>], [[Show information about Babel route entries]])

{ babel_show_routes(proto_get_named($4, &proto_babel)); };



CF_CODE



CF_END

proto/babel/packets.c

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
 *	BIRD -- The Babel protocol

 *

 *	Copyright (c) 2015--2016 Toke Hoiland-Jorgensen

 * 	(c) 2016--2017 Ondrej Zajicek <santiago@crfreenet.org>

 *	(c) 2016--2017 CZ.NIC z.s.p.o.

 *

 *	Can be freely distributed and used under the terms of the GNU GPL.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE