Commit 3660f19d authored by Maria Matejka's avatar Maria Matejka
Browse files

Dropping the RTS_DUMMY temporary route storage. 

Kernel route sync is done by other ways now and this code is not used
currently.
parent c507fb41

doc/bird.sgml

+1 −1
Original line number Diff line number Diff line
@@ -1691,7 +1691,7 @@ Common route attributes are: 


	<tag><label id="rta-source"><m/enum/ source</tag>

	what protocol has told me about this route. Possible values:

	<cf/RTS_DUMMY/, <cf/RTS_STATIC/, <cf/RTS_INHERIT/, <cf/RTS_DEVICE/,

	<cf/RTS_STATIC/, <cf/RTS_INHERIT/, <cf/RTS_DEVICE/,

	<cf/RTS_RIP/, <cf/RTS_OSPF/, <cf/RTS_OSPF_IA/, <cf/RTS_OSPF_EXT1/,

	<cf/RTS_OSPF_EXT2/, <cf/RTS_BGP/, <cf/RTS_PIPE/, <cf/RTS_BABEL/.

filter/test.conf

+0 −1
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ bt_test_suite(t_ip_set, "Testing sets of ip address"); 


function t_enum()

{

	bt_assert(format(RTS_DUMMY)  = "(enum 30)0");

	bt_assert(format(RTS_STATIC) = "(enum 30)1");

	bt_assert(format(NET_IP4) = "(enum 36)1");

	bt_assert(format(NET_VPN6) = "(enum 36)4");

nest/config.Y

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ CF_KEYWORDS(CHECK, LINK) 
/* For r_args_channel */

CF_KEYWORDS(IPV4, IPV4_MC, IPV4_MPLS, IPV6, IPV6_MC, IPV6_MPLS, IPV6_SADR, VPN4, VPN4_MC, VPN4_MPLS, VPN6, VPN6_MC, VPN6_MPLS, ROA4, ROA6, FLOW4, FLOW6, MPLS, PRI, SEC)



CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,

CF_ENUM(T_ENUM_RTS, RTS_, STATIC, INHERIT, DEVICE, STATIC_DEVICE, REDIRECT,

	RIP, OSPF, OSPF_IA, OSPF_EXT1, OSPF_EXT2, BGP, PIPE, BABEL)

CF_ENUM(T_ENUM_SCOPE, SCOPE_, HOST, LINK, SITE, ORGANIZATION, UNIVERSE, UNDEFINED)

CF_ENUM(T_ENUM_RTD, RTD_, UNICAST, BLACKHOLE, UNREACHABLE, PROHIBIT)

nest/route.h

+0 −1
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ typedef struct rta { 
  struct nexthop nh;			/* Next hop */

} rta;



#define RTS_DUMMY 0			/* Dummy route to be removed soon */

#define RTS_STATIC 1			/* Normal static route */

#define RTS_INHERIT 2			/* Route inherited from kernel */

#define RTS_DEVICE 3			/* Device route */

nest/rt-attr.c

+1 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ 
const adata null_adata;		/* adata of length 0 */



const char * const rta_src_names[RTS_MAX] = {

  [RTS_DUMMY]		= "",

  [RTS_STATIC]		= "static",

  [RTS_INHERIT]		= "inherit",

  [RTS_DEVICE]		= "device",
@@ -1260,7 +1259,7 @@ rta_do_cow(rta *o, linpool *lp) 
void

rta_dump(rta *a)

{

  static char *rts[] = { "RTS_DUMMY", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",

  static char *rts[] = { "", "RTS_STATIC", "RTS_INHERIT", "RTS_DEVICE",

			 "RTS_STAT_DEV", "RTS_REDIR", "RTS_RIP",

			 "RTS_OSPF", "RTS_OSPF_IA", "RTS_OSPF_EXT1",

			 "RTS_OSPF_EXT2", "RTS_BGP", "RTS_PIPE", "RTS_BABEL" };

CRA Git | Maintained and supported by SUSTech CRA and CCSE