ok
Claudio Jeker([email protected]) on 2022.09.01 12:48:32 +0200:
> bgpd no longer needs siphash.h and also remove a hash member and a
> prototype which are now unused.
>
> --
> :wq Claudio
>
> Index: rde.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/rde.h,v
> retrieving revision 1.268
> diff -u -p -r1.268 rde.h
> --- rde.h 31 Aug 2022 14:29:36 -0000 1.268
> +++ rde.h 1 Sep 2022 09:55:49 -0000
> @@ -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 *, u
> 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) \
> Index: rde_attr.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/rde_attr.c,v
> retrieving revision 1.130
> diff -u -p -r1.130 rde_attr.c
> --- rde_attr.c 31 Aug 2022 14:29:36 -0000 1.130
> +++ rde_attr.c 1 Sep 2022 09:56:55 -0000
> @@ -24,7 +24,6 @@
> #include <limits.h>
> #include <stdlib.h>
> #include <string.h>
> -#include <siphash.h>
>
> #include "bgpd.h"
> #include "rde.h"
> Index: rde_community.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/rde_community.c,v
> retrieving revision 1.8
> diff -u -p -r1.8 rde_community.c
> --- rde_community.c 29 Aug 2022 16:44:47 -0000 1.8
> +++ rde_community.c 1 Sep 2022 09:56:57 -0000
> @@ -21,7 +21,6 @@
> #include <limits.h>
> #include <stdlib.h>
> #include <string.h>
> -#include <siphash.h>
>
> #include "bgpd.h"
> #include "rde.h"
> Index: rde_rib.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/rde_rib.c,v
> retrieving revision 1.247
> diff -u -p -r1.247 rde_rib.c
> --- rde_rib.c 30 Aug 2022 18:50:21 -0000 1.247
> +++ rde_rib.c 1 Sep 2022 09:57:02 -0000
> @@ -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;
>
> Index: rde_update.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/bgpd/rde_update.c,v
> retrieving revision 1.146
> diff -u -p -r1.146 rde_update.c
> --- rde_update.c 17 Aug 2022 15:15:26 -0000 1.146
> +++ rde_update.c 1 Sep 2022 09:57:06 -0000
> @@ -22,7 +22,6 @@
> #include <limits.h>
> #include <stdlib.h>
> #include <string.h>
> -#include <siphash.h>
> #include <stdio.h>
>
> #include "bgpd.h"
>
