WIP

3 files changed, 2 insertions, 22 deletions

diff --git a/nest/route.h b/nest/route.h
index 6b40b381..377e0915 100644
--- a/nest/route.h
+++ b/nest/route.h
@@ -13,10 +13,6 @@
 #include "lib/resource.h"
 #include "lib/net.h"
 
-#ifdef CONFIG_WIREGUARD
-# include "sysdep/linux/wireguard.h"
-#endif /* CONFIG_WIREGUARD */
-
 struct ea_list;
 struct protocol;
 struct proto;
@@ -207,13 +203,6 @@ struct hostentry {
   byte dest;				/* Chosen route destination type (RTD_...) */
   byte nexthop_linkable;		/* Nexthop list is completely non-device */
   u32 igp_metric;			/* Chosen route IGP metric */
-#ifdef CONFIG_WIREGUARD
-  union {
-    struct {
-      wg_key pub_key;
-    } wg;
-  } u;
-#endif
 };
 
 typedef struct rte {
diff --git a/proto/bgp/attrs.c b/proto/bgp/attrs.c
index 1b245fbd..a27871bc 100644
--- a/proto/bgp/attrs.c
+++ b/proto/bgp/attrs.c
@@ -873,7 +873,7 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
   },
   [BA_TUNNEL_ENCAP] = {
     .name = "tunnel_encap",
-    .type = EAF_TYPE_OPAQUE,
+    .type = EAF_TYPE_TUNNEL_ENCAP,
     .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
     .export = bgp_export_tunnel_encap,
     .encode = bgp_encode_tunnel_encap,
@@ -888,15 +888,6 @@ static const struct bgp_attr_desc bgp_attr_table[] = {
     .decode = bgp_decode_mpls_label_stack,
     .format = bgp_format_mpls_label_stack,
   },
-  [BA_TUNNEL_ENCAP] = {
-    .name = "tunnel_encap",
-    .type = EAF_TYPE_TUNNEL_ENCAP,
-    .flags = BAF_OPTIONAL | BAF_TRANSITIVE,
-    .export = bgp_export_tunnel_encap,
-    .encode = bgp_encode_tunnel_encap,
-    .decode = bgp_decode_tunnel_encap,
-    .format = bgp_format_tunnel_encap,
-  },
 };
 
 static inline int
diff --git a/proto/wireguard/wireguard.c b/proto/wireguard/wireguard.c
index e6427f4b..f209665e 100644
--- a/proto/wireguard/wireguard.c
+++ b/proto/wireguard/wireguard.c
@@ -39,7 +39,7 @@ dump(void *ptr, size_t len)
 {
   unsigned char *data = ptr;
 
-  for (int i=0; i<len; i++) {
+  for (size_t i=0; i<len; i++) {
     fprintf(stderr, "%02x ", data[i]);
   }
   fprintf(stderr, "\n");