Attachment #218667 for bug #250274

View | Details | Raw Unified | Return to bug 250274
Collapse All | Expand All

Lines 1-8 Link Here

(-)Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= openbgpd	3	PORTNAME= openbgpd
4	PORTVERSION= 6.6p0	4	PORTVERSION= 6.7p0
5	PORTREVISION= 1
6	CATEGORIES= net	5	CATEGORIES= net
7	MASTER_SITES= OPENBSD/OpenBGPD	6	MASTER_SITES= OPENBSD/OpenBGPD
8	PKGNAMESUFFIX= 6	7	PKGNAMESUFFIX= 6

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1575231489	1	TIMESTAMP = 1592137617
2	SHA256 (openbgpd-6.6p0.tar.gz) = 83ad5ee8177d324a2a5cc2ce014835007deff8c91550c009c12b7aa16cb2e046	2	SHA256 (openbgpd-6.7p0.tar.gz) = c319bfdc31227cb64f7b7d530c029afb0f261336c55d6aa94f625f96b2f7a249
3	SIZE (openbgpd-6.6p0.tar.gz) = 676732	3	SIZE (openbgpd-6.7p0.tar.gz) = 699211




--- Makefile.am.orig	2020-05-05 08:36:21 UTC
+++ Makefile.am
@@ -19,13 +19,16 @@ ACLOCAL_AMFLAGS = -I m4
 EXTRA_DIST = README.md LICENSE VERSION bgpd.conf
 
 install-data-hook:
-	@if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
+	if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
 		$(INSTALL) -m 755 -d "$(DESTDIR)$(runstatedir)"; \
 	fi
-	@if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
+	if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \

 		$(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \
 	fi
-	@if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
+	if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample" ]; then \
+		$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample"; \
+	fi
+	if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
 		$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf"; \
 	else \

Line 0 Link Here

(-)files/patch-src__bgpctl__output_json.c (+11 lines)
	1	--- src/bgpctl/output_json.c.orig 2020-05-18 19:17:41 UTC
	2	+++ src/bgpctl/output_json.c
	3	@@ -22,6 +22,8 @@
	4	#include <stdlib.h>
	5	#include <string.h>
	6
	7	+#include <sys/endian.h>
	8	+
	9	#include "bgpd.h"
	10	#include "session.h"
	11	#include "rde.h"

Line 0 Link Here

(-)files/patch-src_bgpctl_output.c (+11 lines)
	1	--- src/bgpctl/output.c.orig 2020-05-18 19:17:41 UTC
	2	+++ src/bgpctl/output.c
	3	@@ -25,6 +25,8 @@
	4	#include <stdlib.h>
	5	#include <string.h>
	6
	7	+#include <sys/endian.h>
	8	+
	9	#include "bgpd.h"
	10	#include "session.h"
	11	#include "rde.h"

Line 0 Link Here

(-)files/patch-src_bgpd_bgpd.c (+11 lines)
	1	--- src/bgpd/bgpd.c.orig 2020-05-18 19:17:41 UTC
	2	+++ src/bgpd/bgpd.c
	3	@@ -61,6 +61,8 @@ struct rib_names ribnames = SIMPLEQ_HEAD_INITIALIZER(
	4	char *cname;
	5	char *rcname;
	6
	7	+enum bgpd_process bgpd_process;
	8	+
	9	void
	10	sighdlr(int sig)
	11	{




--- 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];




--- 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;
 




--- 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;
 




--- 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;

Return to bug 250274

Lines 1-12 Link Here

(-)files/patch-Makefile.am (-7 / +9 lines)
1	--- Makefile.am.orig 2019-05-01 11:22:14 UTC	1	--- Makefile.am.orig 2020-05-05 08:36:21 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -19,13 +19,14 @@	3	@@ -19,13 +19,16 @@ ACLOCAL_AMFLAGS = -I m4
4	EXTRA_DIST = README.md VERSION bgpd.conf	4	EXTRA_DIST = README.md LICENSE VERSION bgpd.conf
5		5
6	install-data-hook:	6	install-data-hook:
7	- @if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \	7	- @if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
8	+ if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \	8	+ if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
9	$(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \	9	$(INSTALL) -m 755 -d "$(DESTDIR)$(runstatedir)"; \
10	fi	10	fi
11	- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \	11	- @if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
12	+ if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \	12	+ if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
Lines 13-19 Link Here
13	$(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \	13	$(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \
14	fi	14	fi
15	- @if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \	15	- @if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
16	+ $(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample"; \	16	+ if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample" ]; then \
		17	+ $(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample"; \
		18	+ fi
17	+ if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \	19	+ if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
18	$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf"; \	20	$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf"; \
19	else \	21	else \

Line 0 Link Here

(-)files/patch-src_bgpd_bgpd.h (+23 lines)
	1	--- src/bgpd/bgpd.h.orig 2020-05-19 09:24:33 UTC
	2	+++ src/bgpd/bgpd.h
	3	@@ -130,7 +130,8 @@ enum bgpd_process {
	4	PROC_MAIN,
	5	PROC_SE,
	6	PROC_RDE
	7	-} bgpd_process;
	8	+};
	9	+extern enum bgpd_process bgpd_process;
	10
	11	enum reconf_action {
	12	RECONF_NONE,
	13	@@ -532,6 +533,10 @@ enum imsg_type {
	14	IMSG_XON,
	15	IMSG_XOFF
	16	};
	17	+
	18	+extern struct imsgbuf *ibuf_se;
	19	+extern struct imsgbuf *ibuf_rde;
	20	+extern struct imsgbuf *ibuf_main;
	21
	22	struct demote_msg {
	23	char demote_group[IFNAMSIZ];

Line 0 Link Here

(-)files/patch-src_bgpd_rde.c (+15 lines)
	1	--- src/bgpd/rde.c.orig 2020-05-04 14:45:09 UTC
	2	+++ src/bgpd/rde.c
	3	@@ -99,11 +99,9 @@ void rde_shutdown(void);
	4	int ovs_match(struct prefix *, u_int32_t);
	5
	6	volatile sig_atomic_t rde_quit = 0;
	7	-struct bgpd_config conf, nconf;
	8	+static struct bgpd_config conf, nconf;
	9	struct filter_head out_rules, out_rules_tmp;
	10	-struct imsgbuf *ibuf_se;
	11	struct imsgbuf *ibuf_se_ctl;
	12	-struct imsgbuf *ibuf_main;
	13	struct rde_memstats rdemem;
	14	int softreconfig;
	15

Line 0 Link Here

(-)files/patch-src_bgpd_session.c (+18 lines)
	1	--- src/bgpd/session.c.orig 2020-05-19 09:24:33 UTC
	2	+++ src/bgpd/session.c
	3	@@ -100,13 +100,13 @@ void session_template_clone(struct peer *, struct so
	4	u_int32_t, u_int32_t);
	5	int session_match_mask(struct peer , struct bgpd_addr );
	6
	7	-struct bgpd_config conf, nconf;
	8	+static struct bgpd_config conf, nconf;
	9	+struct ctl_conns ctl_conns;
	10	struct bgpd_sysdep sysdep;
	11	volatile sig_atomic_t session_quit;
	12	int pending_reconf;
	13	int csock = -1, rcsock = -1;
	14	u_int peer_cnt;
	15	-struct imsgbuf *ibuf_rde;
	16	struct imsgbuf *ibuf_rde_ctl;
	17	struct imsgbuf *ibuf_main;
	18

Line 0 Link Here

(-)files/patch-src_bgpd_session.h (+20 lines)
	1	--- src/bgpd/session.h.orig 2020-05-18 19:17:41 UTC
	2	+++ src/bgpd/session.h
	3	@@ -18,6 +18,7 @@
	4
	5	#include <sys/types.h>
	6	#include <sys/socket.h>
	7	+#include <sys/queue.h>
	8	#include <time.h>
	9
	10	#define MAX_BACKLOG 5
	11	@@ -146,7 +147,8 @@ struct ctl_conn {
	12	int terminate;
	13	};
	14
	15	-TAILQ_HEAD(ctl_conns, ctl_conn) ctl_conns;
	16	+TAILQ_HEAD(ctl_conns, ctl_conn);
	17	+extern struct ctl_conns ctl_conns;
	18
	19	struct peer_stats {
	20	unsigned long long msg_rcvd_open;