On Mon, Jan 20, 2020 at 05:03:34PM +0100, Denis Fondras wrote:
> No need to pass peerid to lsa_snap()
>
> While at it, remove unused variable.
ok iremi@ with a small comment below.
>
> Index: rde.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ospf6d/rde.c,v
> retrieving revision 1.82
> diff -u -p -r1.82 rde.c
> --- rde.c 2 Jan 2020 10:16:46 -0000 1.82
> +++ rde.c 20 Jan 2020 09:23:01 -0000
> @@ -345,7 +345,7 @@ rde_dispatch_imsg(int fd, short event, v
> if (nbr == NULL)
> break;
>
> - lsa_snap(nbr, imsg.hdr.peerid);
> + lsa_snap(nbr);
>
> imsg_compose_event(iev_ospfe, IMSG_DB_END,
> imsg.hdr.peerid,
> 0, -1, NULL, 0);
> Index: rde.h
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ospf6d/rde.h,v
> retrieving revision 1.23
> diff -u -p -r1.23 rde.h
> --- rde.h 22 Dec 2019 11:19:06 -0000 1.23
> +++ rde.h 20 Jan 2020 09:23:01 -0000
> @@ -159,7 +159,7 @@ struct vertex *lsa_find_tree(struct lsa_
> u_int32_t lsa_find_lsid(struct lsa_tree *, u_int16_t, u_int32_t,
> int (*)(struct lsa *, struct lsa *), struct lsa *);
> u_int16_t lsa_num_links(struct vertex *);
> -void lsa_snap(struct rde_nbr *, u_int32_t);
> +void lsa_snap(struct rde_nbr *);
> void lsa_dump(struct lsa_tree *, int, pid_t);
> void lsa_merge(struct rde_nbr *, struct lsa *, struct vertex *);
> void lsa_remove_invalid_sums(struct area *);
> Index: rde_lsdb.c
> ===================================================================
> RCS file: /cvs/src/usr.sbin/ospf6d/rde_lsdb.c,v
> retrieving revision 1.41
> diff -u -p -r1.41 rde_lsdb.c
> --- rde_lsdb.c 2 Jan 2020 10:16:46 -0000 1.41
> +++ rde_lsdb.c 20 Jan 2020 09:23:01 -0000
> @@ -39,8 +39,6 @@ int lsa_get_prefix(void *, u_int16_t,
>
> RB_GENERATE(lsa_tree, vertex, entry, lsa_compare)
>
> -extern struct ospfd_conf *rdeconf;
> -
> void
> lsa_init(struct lsa_tree *t)
> {
> @@ -235,6 +233,7 @@ lsa_check(struct rde_nbr *nbr, struct ls
> case LSA_TYPE_NETWORK:
> if ((len % sizeof(u_int32_t)) ||
> len < sizeof(lsa->hdr) + sizeof(u_int32_t)) {
> + log_warnx("lsa_check: bad LSA network packet");
please use __func__
> return (0);
> }
> break;
> @@ -716,7 +715,7 @@ lsa_num_links(struct vertex *v)
> }
>
> void
> -lsa_snap(struct rde_nbr *nbr, u_int32_t peerid)
> +lsa_snap(struct rde_nbr *nbr)
> {
> struct lsa_tree *tree = &nbr->area->lsa_tree;
> struct vertex *v;
> @@ -727,11 +726,13 @@ lsa_snap(struct rde_nbr *nbr, u_int32_t
> continue;
> lsa_age(v);
> if (ntohs(v->lsa->hdr.age) >= MAX_AGE) {
> - rde_imsg_compose_ospfe(IMSG_LS_SNAP, peerid,
> - 0, &v->lsa->hdr, ntohs(v->lsa->hdr.len));
> + rde_imsg_compose_ospfe(IMSG_LS_SNAP,
> + nbr->peerid, 0, &v->lsa->hdr,
> + ntohs(v->lsa->hdr.len));
> } else {
> - rde_imsg_compose_ospfe(IMSG_DB_SNAPSHOT, peerid,
> - 0, &v->lsa->hdr, sizeof(struct lsa_hdr));
> + rde_imsg_compose_ospfe(IMSG_DB_SNAPSHOT,
> + nbr->peerid, 0, &v->lsa->hdr,
> + sizeof(struct lsa_hdr));
> }
> }
> if (tree == &asext_tree)
>
