diff options
Diffstat (limited to 'net/openbgpd6/files')
-rw-r--r-- | net/openbgpd6/files/patch-src_bgpd_bgpd.h | 23 | ||||
-rw-r--r-- | net/openbgpd6/files/patch-src_bgpd_rde.c | 15 | ||||
-rw-r--r-- | net/openbgpd6/files/patch-src_bgpd_session.c | 18 | ||||
-rw-r--r-- | net/openbgpd6/files/patch-src_bgpd_session.h | 20 |
4 files changed, 0 insertions, 76 deletions
diff --git a/net/openbgpd6/files/patch-src_bgpd_bgpd.h b/net/openbgpd6/files/patch-src_bgpd_bgpd.h deleted file mode 100644 index 14df54585928..000000000000 --- a/net/openbgpd6/files/patch-src_bgpd_bgpd.h +++ /dev/null @@ -1,23 +0,0 @@ ---- src/bgpd/bgpd.h.orig 2020-05-19 09:24:33 UTC -+++ src/bgpd/bgpd.h -@@ -130,7 +130,8 @@ enum bgpd_process { - PROC_MAIN, - PROC_SE, - PROC_RDE --} bgpd_process; -+}; -+extern enum bgpd_process bgpd_process; - - enum reconf_action { - RECONF_NONE, -@@ -532,6 +533,10 @@ enum imsg_type { - IMSG_XON, - IMSG_XOFF - }; -+ -+extern struct imsgbuf *ibuf_se; -+extern struct imsgbuf *ibuf_rde; -+extern struct imsgbuf *ibuf_main; - - struct demote_msg { - char demote_group[IFNAMSIZ]; diff --git a/net/openbgpd6/files/patch-src_bgpd_rde.c b/net/openbgpd6/files/patch-src_bgpd_rde.c deleted file mode 100644 index e8204a8b1661..000000000000 --- a/net/openbgpd6/files/patch-src_bgpd_rde.c +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bgpd/rde.c.orig 2020-05-04 14:45:09 UTC -+++ src/bgpd/rde.c -@@ -99,11 +99,9 @@ void rde_shutdown(void); - int ovs_match(struct prefix *, u_int32_t); - - volatile sig_atomic_t rde_quit = 0; --struct bgpd_config *conf, *nconf; -+static struct bgpd_config *conf, *nconf; - struct filter_head *out_rules, *out_rules_tmp; --struct imsgbuf *ibuf_se; - struct imsgbuf *ibuf_se_ctl; --struct imsgbuf *ibuf_main; - struct rde_memstats rdemem; - int softreconfig; - diff --git a/net/openbgpd6/files/patch-src_bgpd_session.c b/net/openbgpd6/files/patch-src_bgpd_session.c deleted file mode 100644 index fbb2ecf5b0c4..000000000000 --- a/net/openbgpd6/files/patch-src_bgpd_session.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/bgpd/session.c.orig 2020-05-19 09:24:33 UTC -+++ src/bgpd/session.c -@@ -100,13 +100,13 @@ void session_template_clone(struct peer *, struct so - u_int32_t, u_int32_t); - int session_match_mask(struct peer *, struct bgpd_addr *); - --struct bgpd_config *conf, *nconf; -+static struct bgpd_config *conf, *nconf; -+struct ctl_conns ctl_conns; - struct bgpd_sysdep sysdep; - volatile sig_atomic_t session_quit; - int pending_reconf; - int csock = -1, rcsock = -1; - u_int peer_cnt; --struct imsgbuf *ibuf_rde; - struct imsgbuf *ibuf_rde_ctl; - struct imsgbuf *ibuf_main; - diff --git a/net/openbgpd6/files/patch-src_bgpd_session.h b/net/openbgpd6/files/patch-src_bgpd_session.h deleted file mode 100644 index 9fbb480caf01..000000000000 --- a/net/openbgpd6/files/patch-src_bgpd_session.h +++ /dev/null @@ -1,20 +0,0 @@ ---- src/bgpd/session.h.orig 2020-05-18 19:17:41 UTC -+++ src/bgpd/session.h -@@ -18,6 +18,7 @@ - - #include <sys/types.h> - #include <sys/socket.h> -+#include <sys/queue.h> - #include <time.h> - - #define MAX_BACKLOG 5 -@@ -146,7 +147,8 @@ struct ctl_conn { - int terminate; - }; - --TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns; -+TAILQ_HEAD(ctl_conns, ctl_conn); -+extern struct ctl_conns ctl_conns; - - struct peer_stats { - unsigned long long msg_rcvd_open; |