Commit 5b208e29 authored by Jan Moskyto Matejka's avatar Jan Moskyto Matejka
Browse files

Removing (struct rta)->cast. Never used.

parent 4e276a89

filter/config.Y

+1 −2
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN, 
	SET, STRING, BGPMASK, BGPPATH, CLIST, ECLIST, LCLIST,

	IF, THEN, ELSE, CASE,

	TRUE, FALSE, RT, RO, UNKNOWN, GENERIC,

	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, CAST, DEST, IFNAME, IFINDEX,

	FROM, GW, NET, MASK, PROTO, SOURCE, SCOPE, DEST, IFNAME, IFINDEX,

	PREFERENCE,

	ROA_CHECK, ASN,

	LEN, MAXLEN,
@@ -854,7 +854,6 @@ static_attr: 
 | PROTO   { $$ = f_new_inst(); $$->aux = T_STRING;     $$->a2.i = SA_PROTO; }

 | SOURCE  { $$ = f_new_inst(); $$->aux = T_ENUM_RTS;   $$->a2.i = SA_SOURCE; }

 | SCOPE   { $$ = f_new_inst(); $$->aux = T_ENUM_SCOPE; $$->a2.i = SA_SCOPE;	$$->a1.i = 1; }

 | CAST    { $$ = f_new_inst(); $$->aux = T_ENUM_RTC;   $$->a2.i = SA_CAST; }

 | DEST    { $$ = f_new_inst(); $$->aux = T_ENUM_RTD;   $$->a2.i = SA_DEST;	$$->a1.i = 1; }

 | IFNAME  { $$ = f_new_inst(); $$->aux = T_STRING;     $$->a2.i = SA_IFNAME; }

 | IFINDEX { $$ = f_new_inst(); $$->aux = T_INT;        $$->a2.i = SA_IFINDEX; }

filter/filter.c

+0 −1
Original line number Diff line number Diff line
@@ -905,7 +905,6 @@ interpret(struct f_inst *what) 
      case SA_PROTO:	res.val.s = rta->src->proto->name; break;

      case SA_SOURCE:	res.val.i = rta->source; break;

      case SA_SCOPE:	res.val.i = rta->scope; break;

      case SA_CAST:	res.val.i = rta->cast; break;

      case SA_DEST:	res.val.i = rta->dest; break;

      case SA_IFNAME:	res.val.s = rta->nh.iface ? rta->nh.iface->name : ""; break;

      case SA_IFINDEX:	res.val.i = rta->nh.iface ? rta->nh.iface->index : 0; break;

filter/filter.h

+3 −4
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ void val_format(struct f_val v, buffer *buf); 
#define SA_PROTO	 4

#define SA_SOURCE	 5

#define SA_SCOPE	 6

#define SA_CAST		 7

#define SA_DEST    	 8

#define SA_IFNAME  	 9

#define SA_IFINDEX    	10

nest/config.Y

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, FLUSH, AS) 
CF_ENUM(T_ENUM_RTS, RTS_, DUMMY, 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_RTC, RTC_, UNICAST, BROADCAST, MULTICAST, ANYCAST)

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

CF_ENUM(T_ENUM_ROA, ROA_, UNKNOWN, VALID, INVALID)

nest/route.h

+4 −7
Original line number Diff line number Diff line
@@ -358,13 +358,10 @@ typedef struct rta { 
  struct hostentry *hostentry;		/* Hostentry for recursive next-hops */

  ip_addr from;				/* Advertising router */

  u32 igp_metric;			/* IGP metric to next hop (for iBGP routes) */

  u32 bf[0];

  u32 source:6;				/* Route source (RTS_...) */

  u32 scope:6;				/* Route scope (SCOPE_... -- see ip.h) */

  u32 cast:6;				/* Casting type (RTC_...) */

  u32 dest:6;				/* Route destination type (RTD_...) */

//  u32 eflags:8;				/* Flags (RTAF_...) */

  u32 aflags:8;

  u8 source;				/* Route source (RTS_...) */

  u8 scope;				/* Route scope (SCOPE_... -- see ip.h) */

  u8 dest;				/* Route destination type (RTD_...) */

  u8 aflags;

  struct nexthop nh;			/* Next hop */

} rta;

CRA Git | Maintained and supported by SUSTech CRA and CCSE