remove prototypes with no matching function; ok claudio@

diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index 7939303..e0ba711 100644 (file)
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bgpd.h,v 1.492 2024/04/24 10:41:34 claudio Exp $ */
+/*     $OpenBSD: bgpd.h,v 1.493 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1470,7 +1470,6 @@ void               log_peer_warnx(const struct peer_config *, const char *, ...)
                        __attribute__((__format__ (printf, 2, 3)));
 
 /* mrt.c */
-void            mrt_clear_seq(void);
 void            mrt_write(struct mrt *);
 void            mrt_clean(struct mrt *);
 void            mrt_init(struct imsgbuf *, struct imsgbuf *);
@@ -1481,10 +1480,6 @@ struct mrt       *mrt_get(struct mrt_head *, struct mrt *);
 void            mrt_mergeconfig(struct mrt_head *, struct mrt_head *);
 
 /* name2id.c */
-uint16_t        rib_name2id(const char *);
-const char     *rib_id2name(uint16_t);
-void            rib_unref(uint16_t);
-void            rib_ref(uint16_t);
 uint16_t        rtlabel_name2id(const char *);
 const char     *rtlabel_id2name(uint16_t);
 void            rtlabel_unref(uint16_t);

diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h
index 895e730..8def9f0 100644 (file)
--- a/usr.sbin/bgpd/rde.h
+++ b/usr.sbin/bgpd/rde.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde.h,v 1.299 2024/01/24 14:51:12 claudio Exp $ */
+/*     $OpenBSD: rde.h,v 1.300 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and
@@ -564,7 +564,6 @@ re_rib(struct rib_entry *re)
 }
 
 void            path_shutdown(void);
-uint32_t        path_remove_stale(struct rde_aspath *, uint8_t, time_t);
 struct rde_aspath *path_copy(struct rde_aspath *, const struct rde_aspath *);
 struct rde_aspath *path_prep(struct rde_aspath *);
 struct rde_aspath *path_get(void);
@@ -581,7 +580,6 @@ struct prefix       *prefix_adjout_next(struct rde_peer *, struct prefix *);
 struct prefix  *prefix_adjout_lookup(struct rde_peer *, struct bgpd_addr *,
                    int);
 struct prefix  *prefix_adjout_match(struct rde_peer *, struct bgpd_addr *);
-struct prefix  *prefix_match(struct rde_peer *, struct bgpd_addr *);
 int             prefix_update(struct rib *, struct rde_peer *, uint32_t,
                    uint32_t, struct filterstate *, struct bgpd_addr *, int);
 int             prefix_withdraw(struct rib *, struct rde_peer *, uint32_t,
@@ -609,7 +607,6 @@ int          prefix_dump_subtree(struct rde_peer *, struct bgpd_addr *,
 struct prefix  *prefix_bypeer(struct rib_entry *, struct rde_peer *,
                    uint32_t);
 void            prefix_destroy(struct prefix *);
-void            prefix_relink(struct prefix *, struct rde_aspath *, int);
 
 RB_PROTOTYPE(prefix_tree, prefix, entry, prefix_cmp)
 
@@ -690,7 +687,6 @@ int          nexthop_unref(struct nexthop *);
 int             nexthop_compare(struct nexthop *, struct nexthop *);
 
 /* rde_update.c */
-void            up_init(struct rde_peer *);
 void            up_generate_updates(struct rde_peer *, struct rib_entry *);
 void            up_generate_addpath(struct rde_peer *, struct rib_entry *);
 void            up_generate_addpath_all(struct rde_peer *, struct rib_entry *,
@@ -713,6 +709,5 @@ int          aspa_table_equal(const struct rde_aspa *,
                    const struct rde_aspa *);
 void            aspa_table_unchanged(struct rde_aspa *,
                    const struct rde_aspa *);
-void            aspa_table_set_generation(struct rde_aspa *, uint8_t);
 
 #endif /* __RDE_H__ */

diff --git a/usr.sbin/bgpd/session.h b/usr.sbin/bgpd/session.h
index 598ce70..815b124 100644 (file)
--- a/usr.sbin/bgpd/session.h
+++ b/usr.sbin/bgpd/session.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: session.h,v 1.169 2024/04/22 09:36:04 claudio Exp $ */
+/*     $OpenBSD: session.h,v 1.170 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -300,7 +300,6 @@ struct rtr_session  *rtr_new(uint32_t, char *);
 struct rtr_session     *rtr_get(uint32_t);
 void                    rtr_free(struct rtr_session *);
 void                    rtr_open(struct rtr_session *, int);
-struct roa_tree                *rtr_get_roa(struct rtr_session *);
 void                    rtr_config_prep(void);
 void                    rtr_config_merge(void);
 void                    rtr_config_keep(struct rtr_session *);

diff --git a/usr.sbin/dvmrpd/dvmrpd.h b/usr.sbin/dvmrpd/dvmrpd.h
index 96f02b0..36c28af 100644 (file)
--- a/usr.sbin/dvmrpd/dvmrpd.h
+++ b/usr.sbin/dvmrpd/dvmrpd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: dvmrpd.h,v 1.24 2021/01/19 12:26:38 claudio Exp $ */
+/*     $OpenBSD: dvmrpd.h,v 1.25 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004, 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -171,7 +171,6 @@ struct nbr_msg {
 };
 
 TAILQ_HEAD(rr_head, rr_entry);
-RB_HEAD(src_head, src_node);
 
 struct iface {
        LIST_ENTRY(iface)        entry;

diff --git a/usr.sbin/dvmrpd/rde.h b/usr.sbin/dvmrpd/rde.h
index 6593194..80f323c 100644 (file)
--- a/usr.sbin/dvmrpd/rde.h
+++ b/usr.sbin/dvmrpd/rde.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde.h,v 1.16 2009/09/06 09:52:14 michele Exp $ */
+/*     $OpenBSD: rde.h,v 1.17 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -126,12 +126,9 @@ void                rt_dump(pid_t);
 struct rt_node *rt_match_origin(in_addr_t);
 
 int             srt_check_route(struct route_report *, int);
-int             src_compare(struct src_node *, struct src_node *);
 
 struct ds_nbr  *srt_find_ds(struct rt_node *, u_int32_t);
 void            srt_expire_nbr(struct in_addr, unsigned int);
 void            srt_check_downstream_ifaces(struct rt_node *, struct iface *);
 
-RB_PROTOTYPE(src_head, src_node, entry, src_compare);
-
 #endif /* _RDE_H_ */

diff --git a/usr.sbin/dvmrpd/rde_mfc.c b/usr.sbin/dvmrpd/rde_mfc.c
index 653dac5..efde74f 100644 (file)
--- a/usr.sbin/dvmrpd/rde_mfc.c
+++ b/usr.sbin/dvmrpd/rde_mfc.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: rde_mfc.c,v 1.10 2015/12/07 19:14:49 mmcc Exp $ */
+/*     $OpenBSD: rde_mfc.c,v 1.11 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2009 Michele Marchetto <michele@openbsd.org>
@@ -54,7 +54,6 @@ int    mfc_start_prune_timer(struct mfc_node *);
 int     mfc_reset_prune_timer(struct mfc_node *);
 
 int     mfc_compare(struct mfc_node *, struct mfc_node *);
-void    mfc_invalidate(void);
 
 RB_HEAD(mfc_tree, mfc_node)     mfc;
 RB_PROTOTYPE(mfc_tree, mfc_node, entry, mfc_compare)

diff --git a/usr.sbin/ospf6d/kroute.c b/usr.sbin/ospf6d/kroute.c
index 28ca7fa..962b362 100644 (file)
--- a/usr.sbin/ospf6d/kroute.c
+++ b/usr.sbin/ospf6d/kroute.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: kroute.c,v 1.68 2023/06/21 09:47:03 sthen Exp $ */
+/*     $OpenBSD: kroute.c,v 1.69 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -97,7 +97,6 @@ void          if_announce(void *);
 int            send_rtmsg(int, int, struct kroute *);
 int            dispatch_rtmsg(void);
 int            fetchtable(void);
-int            refetchtable(void);
 int            rtmsg_process(char *, size_t);
 void           kr_fib_reload_timer(int, short, void *);
 void           kr_fib_reload_arm_timer(int);

diff --git a/usr.sbin/ospf6d/ospf6d.h b/usr.sbin/ospf6d/ospf6d.h
index a8f2a92..5e2e1d3 100644 (file)
--- a/usr.sbin/ospf6d/ospf6d.h
+++ b/usr.sbin/ospf6d/ospf6d.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospf6d.h,v 1.51 2023/06/21 09:47:03 sthen Exp $ */
+/*     $OpenBSD: ospf6d.h,v 1.52 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004, 2007 Esben Norby <norby@openbsd.org>
@@ -534,9 +534,6 @@ struct iface        *if_new(u_short, char *);
 void            if_update(struct iface *, int, int, u_int8_t, u_int8_t,
                    u_int64_t, u_int32_t);
 
-/* in_cksum.c */
-u_int16_t       in_cksum(void *, size_t);
-
 /* iso_cksum.c */
 u_int16_t       iso_cksum(void *, u_int16_t, u_int16_t);
 

diff --git a/usr.sbin/ospf6d/ospfe.h b/usr.sbin/ospf6d/ospfe.h
index 7fec5f8..5b3ac45 100644 (file)
--- a/usr.sbin/ospf6d/ospfe.h
+++ b/usr.sbin/ospf6d/ospfe.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospfe.h,v 1.25 2021/01/19 09:43:40 claudio Exp $ */
+/*     $OpenBSD: ospfe.h,v 1.26 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -99,7 +99,6 @@ struct ctl_conn;
 int     send_db_description(struct nbr *);
 void    recv_db_description(struct nbr *, char *, u_int16_t);
 void    db_sum_list_add(struct nbr *, struct lsa_hdr *);
-int     db_sum_list_del(struct nbr *, struct lsa_hdr *);
 void    db_sum_list_clr(struct nbr *);
 void    db_tx_timer(int, short, void *);
 void    start_db_tx_timer(struct nbr *);
@@ -148,7 +147,6 @@ int  if_set_ipv6_pktinfo(int, int);
 int     if_set_ipv6_checksum(int);
 
 /* lsack.c */
-int     delay_lsa_ack(struct iface *, struct lsa_hdr *);
 int     send_direct_ack(struct iface *, struct in6_addr, void *, size_t);
 void    recv_ls_ack(struct nbr *, char *, u_int16_t);
 int     lsa_hdr_check(struct nbr *, struct lsa_hdr *);
@@ -164,7 +162,6 @@ void         stop_ls_ack_tx_timer(struct iface *);
 int     send_ls_req(struct nbr *);
 void    recv_ls_req(struct nbr *, char *, u_int16_t);
 void    ls_req_list_add(struct nbr *, struct lsa_hdr *);
-int     ls_req_list_del(struct nbr *, struct lsa_hdr *);
 struct lsa_entry       *ls_req_list_get(struct nbr *, struct lsa_hdr *);
 void    ls_req_list_free(struct nbr *, struct lsa_entry *);
 void    ls_req_list_clr(struct nbr *);

diff --git a/usr.sbin/ospf6d/packet.c b/usr.sbin/ospf6d/packet.c
index 2ed0e43..affc665 100644 (file)
--- a/usr.sbin/ospf6d/packet.c
+++ b/usr.sbin/ospf6d/packet.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: packet.c,v 1.22 2023/07/03 09:51:38 claudio Exp $ */
+/*     $OpenBSD: packet.c,v 1.23 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -36,7 +36,6 @@
 #include "log.h"
 #include "ospfe.h"
 
-int             ip_hdr_sanity_check(const struct ip6_hdr *, u_int16_t);
 int             ospf_hdr_sanity_check(struct ospf_hdr *, u_int16_t,
                    const struct iface *, struct in6_addr *);
 struct iface   *find_iface(struct ospfd_conf *, unsigned int,

diff --git a/usr.sbin/ospfd/ospfe.h b/usr.sbin/ospfd/ospfe.h
index 9e257e7..bc74139 100644 (file)
--- a/usr.sbin/ospfd/ospfe.h
+++ b/usr.sbin/ospfd/ospfe.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ospfe.h,v 1.48 2021/01/19 09:33:38 claudio Exp $ */
+/*     $OpenBSD: ospfe.h,v 1.49 2024/05/18 11:17:30 jsg Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
@@ -108,7 +108,6 @@ int          md_list_send(struct auth_md_head *, struct imsgev *);
 int     send_db_description(struct nbr *);
 void    recv_db_description(struct nbr *, char *, u_int16_t);
 void    db_sum_list_add(struct nbr *, struct lsa_hdr *);
-int     db_sum_list_del(struct nbr *, struct lsa_hdr *);
 void    db_sum_list_clr(struct nbr *);
 void    db_tx_timer(int, short, void *);
 void    start_db_tx_timer(struct nbr *);
@@ -157,7 +156,6 @@ int  if_set_mcast_loop(int);
 int     if_set_ip_hdrincl(int);
 
 /* lsack.c */
-int     delay_lsa_ack(struct iface *, struct lsa_hdr *);
 int     send_direct_ack(struct iface *, struct in_addr, void *, size_t);
 void    recv_ls_ack(struct nbr *, char *, u_int16_t);
 int     lsa_hdr_check(struct nbr *, struct lsa_hdr *);
@@ -173,7 +171,6 @@ void         stop_ls_ack_tx_timer(struct iface *);
 int     send_ls_req(struct nbr *);
 void    recv_ls_req(struct nbr *, char *, u_int16_t);
 void    ls_req_list_add(struct nbr *, struct lsa_hdr *);
-int     ls_req_list_del(struct nbr *, struct lsa_hdr *);
 struct lsa_entry       *ls_req_list_get(struct nbr *, struct lsa_hdr *);
 void    ls_req_list_free(struct nbr *, struct lsa_entry *);
 void    ls_req_list_clr(struct nbr *);