ROA code switchoff (9656dce7) · Commits · 戴 / Bird

conf/cf-lex.l

+0 −2

Original line number	Diff line number	Diff line
		@@ -674,8 +674,6 @@ cf_symbol_class_name(struct symbol *sym)
		return "filter";
		case SYM_TABLE:
		return "routing table";
		case SYM_ROA:
		return "ROA table";
		default:
		return "unknown type";
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ config_parse(struct config *c)
		sysdep_preconfig(c);
		protos_preconfig(c);
		rt_preconfig(c);
		roa_preconfig(c);
		/* roa_preconfig(c); */
		cf_parse();
		protos_postconfig(c);
		if (EMPTY_LIST(c->protos))
		@@ -266,7 +266,7 @@ config_do_commit(struct config *c, int type)
		force_restart \|= global_commit(c, old_config);
		DBG("rt_commit\n");
		rt_commit(c, old_config);
		roa_commit(c, old_config);
		/* roa_commit(c, old_config); */
		DBG("protos_commit\n");
		protos_commit(c, old_config, force_restart, type);

+0 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@ struct symbol {
		#define SYM_FUNCTION 3
		#define SYM_FILTER 4
		#define SYM_TABLE 5
		#define SYM_ROA 6

		#define SYM_VARIABLE 0x100 /* 0x100-0x1ff are variable types */
		#define SYM_CONSTANT 0x200 /* 0x200-0x2ff are variable types */

+2 −1

Original line number	Diff line number	Diff line
		@@ -284,7 +284,6 @@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UNSET, RETURN,
		DEFINED,
		ADD, DELETE, CONTAINS, RESET,
		PREPEND, FIRST, LAST, MATCH,
		ROA_CHECK,
		EMPTY,
		FILTER, WHERE, EVAL)

		@@ -761,8 +760,10 @@ term:
		\| DELETE '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'd'; }
		\| FILTER '(' term ',' term ')' { $$ = f_new_inst(); $$->code = P('C','a'); $$->a1.p = $3; $$->a2.p = $5; $$->aux = 'f'; }

		/*
		\| ROA_CHECK '(' SYM ')' { $$ = f_generate_roa_check($3, NULL, NULL); }
		\| ROA_CHECK '(' SYM ',' term ',' term ')' { $$ = f_generate_roa_check($3, $5, $7); }
		*/

		/* \| term '.' LEN { $$->code = P('P','l'); } */

+2 −1

Original line number	Diff line number	Diff line
		@@ -54,7 +54,7 @@ f_generate_complex(int operation, int operation_aux, struct f_inst *dyn, struct
		return set_dyn;
		}


		#if 0
		struct f_inst *
		f_generate_roa_check(struct symbol sym, struct f_inst prefix, struct f_inst *asn)
		{
		@@ -71,6 +71,7 @@ f_generate_roa_check(struct symbol sym, struct f_inst prefix, struct f_inst *a

		return &ret->i;
		}
		#endif

		char *
		filter_name(struct filter *filter)