From 8ebac84bc8d51e2404ce6d6dc5e35fb261830596 Mon Sep 17 00:00:00 2001
From: Maria Matejka <mq@ucw.cz>
Date: Wed, 20 Apr 2022 13:56:04 +0200
Subject: Moved advertising router info (FROM attribute) to eattrs

---
 filter/config.Y | 3 +--
 filter/data.h   | 3 +--
 filter/f-inst.c | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'filter')

diff --git a/filter/config.Y b/filter/config.Y
index dcfae788..e24233aa 100644
--- a/filter/config.Y
+++ b/filter/config.Y
@@ -762,8 +762,7 @@ symbol_value: CF_SYM_KNOWN
  ;
 
 static_attr:
-   FROM    { $$ = f_new_static_attr(T_IP,         SA_FROM,	0); }
- | GW      { $$ = f_new_static_attr(T_IP,         SA_GW,	0); }
+   GW      { $$ = f_new_static_attr(T_IP,         SA_GW,	0); }
  | NET     { $$ = f_new_static_attr(T_NET,	  SA_NET,	1); }
  | PROTO   { $$ = f_new_static_attr(T_STRING,     SA_PROTO,	1); }
  | SOURCE  { $$ = f_new_static_attr(T_ENUM_RTS,   SA_SOURCE,	1); }
diff --git a/filter/data.h b/filter/data.h
index 0e25ccd9..a0a164ed 100644
--- a/filter/data.h
+++ b/filter/data.h
@@ -22,8 +22,7 @@ struct f_val {
 #define fputip(a)   ({ ip_addr *ax = falloc(sizeof(*ax)); *ax = (a); ax; })
 
 enum f_sa_code {
-  SA_FROM = 1,
-  SA_GW,
+  SA_GW = 1,
   SA_NET,
   SA_PROTO,
   SA_SOURCE,
diff --git a/filter/f-inst.c b/filter/f-inst.c
index 9530d9ad..7158d22e 100644
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -533,7 +533,6 @@
 
       switch (sa.sa_code)
       {
-      case SA_FROM:	RESULT(sa.type, ip, rta->from); break;
       case SA_GW:	RESULT(sa.type, ip, rta->nh.gw); break;
       case SA_NET:	RESULT(sa.type, net, (*fs->rte)->net->n.addr); break;
       case SA_PROTO:	RESULT(sa.type, s, (*fs->rte)->src->proto->name); break;
@@ -563,10 +562,6 @@
 
       switch (sa.sa_code)
       {
-      case SA_FROM:
-	rta->from = v1.val.ip;
-	break;
-
       case SA_GW:
 	{
 	  ip_addr ip = v1.val.ip;
-- 
cgit v1.2.3