This code no longer needs siphash.h and also cleanup some leftover

prototypes and members that were not removed in the previous RB tree
conversions.
OK benno@ tb@

diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 3a85ce3..3778d99 100644 (file)
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde.h,v 1.268 2022/08/31 14:29:36 claudio Exp $ */
+/*     $OpenBSD: rde.h,v 1.269 2022/09/01 13:19:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -217,7 +217,6 @@ struct rde_aspath {
        RB_ENTRY(rde_aspath)             entry;
        struct attr                     **others;
        struct aspath                   *aspath;
-       uint64_t                         hash;
        int                              refcnt;
        uint32_t                         flags;         /* internally used */
        uint32_t                         med;           /* multi exit disc */
@@ -434,7 +433,6 @@ int          attr_optadd(struct rde_aspath *, uint8_t, uint8_t,
 struct attr    *attr_optget(const struct rde_aspath *, uint8_t);
 void            attr_copy(struct rde_aspath *, const struct rde_aspath *);
 int             attr_compare(struct rde_aspath *, struct rde_aspath *);
-uint64_t        attr_hash(struct rde_aspath *);
 void            attr_freeall(struct rde_aspath *);
 void            attr_free(struct rde_aspath *, struct attr *);
 #define                 attr_optlen(x) \

diff --git a/usr.sbin/bgpd/rde_attr.c b/usr.sbin/bgpd/rde_attr.c
index 4216de0..56f6523 100644 (file)
--- a/usr.sbin/bgpd/rde_attr.c
+++ b/usr.sbin/bgpd/rde_attr.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde_attr.c,v 1.130 2022/08/31 14:29:36 claudio Exp $ */
+/*     $OpenBSD: rde_attr.c,v 1.131 2022/09/01 13:19:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -24,7 +24,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <siphash.h>
 
 #include "bgpd.h"
 #include "rde.h"

diff --git a/usr.sbin/bgpd/rde_community.c b/usr.sbin/bgpd/rde_community.c
index d7d5aea..40f25ae 100644 (file)
--- a/usr.sbin/bgpd/rde_community.c
+++ b/usr.sbin/bgpd/rde_community.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde_community.c,v 1.8 2022/08/29 16:44:47 claudio Exp $ */
+/*     $OpenBSD: rde_community.c,v 1.9 2022/09/01 13:19:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
@@ -21,7 +21,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <siphash.h>
 
 #include "bgpd.h"
 #include "rde.h"

diff --git a/usr.sbin/bgpd/rde_rib.c b/usr.sbin/bgpd/rde_rib.c
index 494cf38..0798ee9 100644 (file)
--- a/usr.sbin/bgpd/rde_rib.c
+++ b/usr.sbin/bgpd/rde_rib.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde_rib.c,v 1.247 2022/08/30 18:50:21 claudio Exp $ */
+/*     $OpenBSD: rde_rib.c,v 1.248 2022/09/01 13:19:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org>
@@ -22,7 +22,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <siphash.h>
 #include <time.h>
 
 #include "bgpd.h"
@@ -640,7 +639,7 @@ path_lookup(struct rde_aspath *aspath)
 }
 
 /*
- * Link this aspath into the global hash table.
+ * Link this aspath into the global table.
  * The asp had to be alloced with path_get.
  */
 static void
@@ -679,7 +678,6 @@ struct rde_aspath *
 path_copy(struct rde_aspath *dst, const struct rde_aspath *src)
 {
        dst->aspath = aspath_copy(src->aspath);
-       dst->hash = 0;          /* not linked so no hash and no refcnt */
        dst->refcnt = 0;
        dst->flags = src->flags & ~F_ATTR_LINKED;
 

diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c
index 2a0758f..6fca7b2 100644 (file)
--- a/usr.sbin/bgpd/rde_update.c
+++ b/usr.sbin/bgpd/rde_update.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde_update.c,v 1.146 2022/08/17 15:15:26 claudio Exp $ */
+/*     $OpenBSD: rde_update.c,v 1.147 2022/09/01 13:19:11 claudio Exp $ */
 
 /*
  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -22,7 +22,6 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <siphash.h>
 #include <stdio.h>
 
 #include "bgpd.h"