BGP: protocol specific state information cleanup

diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 3dba149e5e523334862aa63a34d4bece341142c0..42d36228310083d8f649dd6a2d0e7143dff21c4c 100644 (file)
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -1303,11 +1303,6 @@ struct ea_class ea_bgp_close_bmp = {
   .type = T_OPAQUE,
 };
 
-struct ea_class ea_bgp_close_bmp_set = {
-  .name = "bgp_close_bmp_set",
-  .type = T_INT,
-};
-
 struct ea_class ea_bgp_as4_session = {
   .name = "bgp_as4_session",
   .type = T_INT,
@@ -1346,7 +1341,7 @@ bgp_register_attrs(void)
   EA_REGISTER_ALL(
       &ea_bgp_rem_id, &ea_bgp_rem_as, &ea_bgp_loc_as, &ea_bgp_rem_ip, &ea_bgp_peer_type, &ea_bgp_afi,
       &ea_bgp_in_conn_local_open_msg, &ea_bgp_out_conn_local_open_msg, &ea_bgp_in_conn_remote_open_msg,
-      &ea_bgp_out_conn_remote_open_msg, &ea_bgp_close_bmp, &ea_bgp_close_bmp_set, &ea_bgp_as4_session,
+      &ea_bgp_out_conn_remote_open_msg, &ea_bgp_close_bmp, &ea_bgp_as4_session,
       &ea_bgp_state_startup, &ea_bgp_in_conn_state, &ea_bgp_out_conn_state,
       &ea_bgp_in_conn_sk, &ea_bgp_out_conn_sk, &ea_bgp_as4_in_conn, &ea_bgp_as4_out_conn
       );

diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 1fae5a4269c2264e3a8c677654f1bd693fd93815..e381a73cb0118db2d66c0d9160e13d7ac38b14b3 100644 (file)
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -837,30 +837,20 @@ bgp_conn_leave_established_state(struct bgp_conn *conn, struct bgp_proto *p)
   if (p->p.proto_state == PS_UP)
     bgp_stop(p, 0, NULL, 0);
 
-#ifdef CONFIG_BMP
-  struct {
-    struct closing_bgp closing_struct;
-    byte data[conn->notify_size];
-  } to_ea;
-
-  to_ea.closing_struct = (struct closing_bgp) {
-    .err_class = p->last_error_class,
-    .err_code = conn->notify_code,
-    .err_subcode = conn->notify_subcode,
-    .length = conn->notify_size,
+  uint adsz;
+  struct bgp_session_close_ad *bscad = alloca(adsz = sizeof *bscad + conn->notify_size);
+  *bscad = (struct bgp_session_close_ad) {
+    .ad.length = adsz - sizeof(adata),
+    .last_error_class = p->last_error_class,
+    .notify_code = conn->notify_code,
+    .notify_subcode = conn->notify_subcode,
   };
-  memcpy(to_ea.data, conn->notify_data, conn->notify_size);
+  memcpy(bscad->data, conn->notify_data, conn->notify_size);
 
-  ea_set_attr(&p->p.ea_state, EA_LITERAL_STORE_ADATA(&ea_bgp_close_bmp, 0, &to_ea.closing_struct, sizeof(to_ea)));
-  ea_set_attr(&p->p.ea_state, EA_LITERAL_EMBEDDED(&ea_bgp_close_bmp_set, 0, 1));
+  ea_set_attr(&p->p.ea_state, EA_LITERAL_DIRECT_ADATA(&ea_bgp_close_bmp, 0, &bscad->ad));
   p->p.ea_state = ea_lookup(p->p.ea_state, 0, EALS_CUSTOM);
 
   proto_announce_state_later(&p->p, p->p.ea_state);
-
-  //bmp_peer_down(p, p->last_error_class,
-       //      conn->notify_code, conn->notify_subcode,
-       //      conn->notify_data, conn->notify_size);
-#endif
 }
 
 void
@@ -1274,21 +1264,24 @@ bgp_setup_sk(struct bgp_conn *conn, sock *s)
   s->fast_rx = 1;
   conn->sk = s;
 
-  struct bgp_conn_sk_ea sk_ea = {
+  struct bgp_conn_sk_ad sk_ad = {
+    .ad = { .length = sizeof sk_ad - sizeof sk_ad.ad },
     .saddr = s->saddr,
     .daddr = s->daddr,
     .sport = s->sport,
-    .dport = s->dport
+    .dport = s->dport,
   };
 
   ea_list *attr = conn->bgp->p.ea_state;
+
   if (conn == &conn->bgp->incoming_conn)
-    ea_set_attr(&attr, EA_LITERAL_STORE_ADATA(&ea_bgp_in_conn_sk, 0, (byte*)(&sk_ea), sizeof(sk_ea)));
+    ea_set_attr(&attr, EA_LITERAL_DIRECT_ADATA(&ea_bgp_in_conn_sk, 0, &sk_ad.ad));
   else
   {
     ASSERT_DIE(conn == &conn->bgp->outgoing_conn);
-    ea_set_attr(&attr, EA_LITERAL_STORE_ADATA(&ea_bgp_out_conn_sk, 0, (byte*)(&sk_ea), sizeof(sk_ea)));
+    ea_set_attr(&attr, EA_LITERAL_DIRECT_ADATA(&ea_bgp_out_conn_sk, 0, &sk_ad.ad));
   }
+
   conn->bgp->p.ea_state = ea_lookup(conn->bgp->p.ea_state, 0, EALS_CUSTOM);
   proto_announce_state_later(&conn->bgp->p, attr);
 }
@@ -1994,9 +1987,12 @@ bgp_init(struct proto_config *CF)
   /* Add MPLS channel */
   proto_configure_mpls_channel(P, CF, RTS_BGP);
 
-  PST_LOCKED(ts)
-    bgp_state_to_eattr(P, ts->states[P->id]);
+  ea_set_attr(&p->p.ea_state, EA_LITERAL_STORE_ADATA(&ea_bgp_rem_ip, 0, &cf->remote_ip, sizeof(ip_addr)));
+  ea_set_attr(&p->p.ea_state, EA_LITERAL_EMBEDDED(&ea_bgp_peer_type, 0, cf->peer_type));
+  ea_set_attr(&p->p.ea_state, EA_LITERAL_EMBEDDED(&ea_bgp_loc_as, 0, cf->local_as));
+  ea_set_attr(&p->p.ea_state, EA_LITERAL_EMBEDDED(&ea_bgp_rem_as, 0, cf->remote_as));
 
+  proto_announce_state_later(&p->p, p->p.ea_state);
   return P;
 }
 
@@ -2463,11 +2459,6 @@ bgp_reconfigure(struct proto *P, struct proto_config *CF)
   /* We should update our copy of configuration ptr as old configuration will be freed */
   p->cf = new;
 
-  ea_list *eal = proto_get_state(p->p.id);
-  ea_set_attr(&eal, EA_LITERAL_EMBEDDED(&ea_bgp_peer_type, 0, p->cf->peer_type));
-  p->p.ea_state = ea_lookup(p->p.ea_state, 0, EALS_CUSTOM);
-  proto_announce_state_later(&p->p, eal);
-
   /* Check whether existing connections are compatible with required capabilities */
   struct bgp_conn *ci = &p->incoming_conn;
   if (((ci->state == BS_OPENCONFIRM) || (ci->state == BS_ESTABLISHED)) && !bgp_check_capabilities(ci))
@@ -2674,27 +2665,6 @@ bgp_get_status(struct proto *P, byte *buf)
     bsprintf(buf, "%-14s%s%s", bgp_state_dsc(p), err1, err2);
 }
 
-int
-bgp_state_to_eattr(struct proto *P, struct ea_list *state)
-{
-  struct bgp_proto *p = (struct bgp_proto *) P;
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_rem_id, 0, p->remote_id));
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_rem_ip, 0, &p->remote_ip, sizeof(ip_addr)));
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_peer_type, 0, p->cf->peer_type));
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_loc_as, 0, p->local_as));
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_rem_as, 0, p->remote_as));
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_as4_session, 0, p->as4_session));
-
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_in_conn_local_open_msg, 0, NULL, 0));
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_in_conn_remote_open_msg, 0, NULL, 0));
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_out_conn_local_open_msg, 0, NULL, 0));
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_out_conn_remote_open_msg, 0, NULL, 0));
-
-  ea_set_attr(&state, EA_LITERAL_STORE_ADATA(&ea_bgp_close_bmp, 0, NULL, 0));
-  ea_set_attr(&state, EA_LITERAL_EMBEDDED(&ea_bgp_close_bmp_set, 0, 0));
-  return 1;
-}
-
 static void
 bgp_show_afis(int code, char *s, u32 *afis, uint count)
 {

diff --git a/proto/bgp/bgp.h b/proto/bgp/bgp.h
index 2e38a29a6a45482ff3278da7b9324e47ebc9e3a0..e3293bab9d685a6a30870b414d4e5d2d481a5386 100644 (file)
--- a/proto/bgp/bgp.h
+++ b/proto/bgp/bgp.h
@@ -319,18 +319,19 @@ struct bgp_conn {
   uint hold_time, keepalive_time, send_hold_time;      /* Times calculated from my and neighbor's requirements */
 };
 
-struct bgp_conn_sk_ea {
+struct bgp_conn_sk_ad {
+  adata ad;
   ip_addr saddr;
   ip_addr daddr;
   int sport;
   int dport;
 };
 
-struct closing_bgp {
-  int err_class;
-  int err_code;
-  int err_subcode;
-  int length;
+struct bgp_session_close_ad {
+  adata ad;
+  int notify_code;
+  int notify_subcode;
+  u8 last_error_class;
   byte data[0];
 };