Module Name: src
Committed By: joerg
Date: Wed Apr 22 23:53:27 UTC 2020
Modified Files:
src/usr.sbin/ldpd: conffile.c conffile.h ldp_peer.c ldp_peer.h
socketops.c socketops.h
Log Message:
Avoid common symbol definitions
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/ldpd/conffile.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/ldpd/conffile.h
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/ldpd/ldp_peer.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/ldpd/ldp_peer.h
cvs rdiff -u -r1.34 -r1.35 src/usr.sbin/ldpd/socketops.c
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/ldpd/socketops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/conffile.c
diff -u src/usr.sbin/ldpd/conffile.c:1.12 src/usr.sbin/ldpd/conffile.c:1.13
--- src/usr.sbin/ldpd/conffile.c:1.12 Tue Jan 10 21:02:38 2017
+++ src/usr.sbin/ldpd/conffile.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: conffile.c,v 1.12 2017/01/10 21:02:38 christos Exp $ */
+/* $NetBSD: conffile.c,v 1.13 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -47,6 +47,9 @@
#define NextCommand(x) strsep(&x, " ")
#define LINEMAXSIZE 1024
+struct coifs_head coifs_head;
+struct conei_head conei_head;
+
char *mapped, *nextline;
size_t mapsize;
Index: src/usr.sbin/ldpd/conffile.h
diff -u src/usr.sbin/ldpd/conffile.h:1.4 src/usr.sbin/ldpd/conffile.h:1.5
--- src/usr.sbin/ldpd/conffile.h:1.4 Thu Oct 17 18:10:23 2013
+++ src/usr.sbin/ldpd/conffile.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: conffile.h,v 1.4 2013/10/17 18:10:23 kefren Exp $ */
+/* $NetBSD: conffile.h,v 1.5 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@ struct conf_neighbour {
int authenticate; /* RFC 2385 */
SLIST_ENTRY(conf_neighbour) neilist;
};
-SLIST_HEAD(,conf_neighbour) conei_head;
+extern SLIST_HEAD(conei_head,conf_neighbour) conei_head;
struct conf_interface {
char if_name[IF_NAMESIZE];
@@ -57,7 +57,7 @@ struct conf_interface {
int passive;
SLIST_ENTRY(conf_interface) iflist;
};
-SLIST_HEAD(,conf_interface) coifs_head;
+extern SLIST_HEAD(coifs_head,conf_interface) coifs_head;
int conf_parsefile(const char *fname);
Index: src/usr.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.16 src/usr.sbin/ldpd/ldp_peer.c:1.17
--- src/usr.sbin/ldpd/ldp_peer.c:1.16 Fri Aug 2 07:29:56 2013
+++ src/usr.sbin/ldpd/ldp_peer.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.16 2013/08/02 07:29:56 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.17 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -55,6 +55,7 @@
#include "ldp_peer.h"
extern int ldp_holddown_time;
+struct ldp_peer_head ldp_peer_head;
static struct label_mapping *ldp_peer_get_lm(struct ldp_peer *,
const struct sockaddr *, uint);
Index: src/usr.sbin/ldpd/ldp_peer.h
diff -u src/usr.sbin/ldpd/ldp_peer.h:1.8 src/usr.sbin/ldpd/ldp_peer.h:1.9
--- src/usr.sbin/ldpd/ldp_peer.h:1.8 Fri Aug 2 07:29:56 2013
+++ src/usr.sbin/ldpd/ldp_peer.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.h,v 1.8 2013/08/02 07:29:56 kefren Exp $ */
+/* $NetBSD: ldp_peer.h,v 1.9 2020/04/22 23:53:27 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -74,7 +74,7 @@ struct ldp_peer {
SLIST_ENTRY(ldp_peer) peers;
};
-SLIST_HEAD(,ldp_peer) ldp_peer_head;
+extern SLIST_HEAD(ldp_peer_head,ldp_peer) ldp_peer_head;
struct peer_map {
struct ldp_peer *peer;
Index: src/usr.sbin/ldpd/socketops.c
diff -u src/usr.sbin/ldpd/socketops.c:1.34 src/usr.sbin/ldpd/socketops.c:1.35
--- src/usr.sbin/ldpd/socketops.c:1.34 Wed Apr 12 17:02:51 2017
+++ src/usr.sbin/ldpd/socketops.c Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.c,v 1.34 2017/04/12 17:02:51 roy Exp $ */
+/* $NetBSD: socketops.c,v 1.35 2020/04/22 23:53:27 joerg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -61,6 +61,9 @@
#include "ldp_errors.h"
#include "socketops.h"
+struct hello_info_head hello_info_head;
+static SLIST_HEAD(,hello_socket) hello_socket_head;
+
int ls; /* TCP listening socket on port 646 */
int route_socket; /* used to see when a route is added/deleted */
int command_socket; /* Listening socket for interface command */
Index: src/usr.sbin/ldpd/socketops.h
diff -u src/usr.sbin/ldpd/socketops.h:1.6 src/usr.sbin/ldpd/socketops.h:1.7
--- src/usr.sbin/ldpd/socketops.h:1.6 Thu Jul 11 05:45:23 2013
+++ src/usr.sbin/ldpd/socketops.h Wed Apr 22 23:53:27 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: socketops.h,v 1.6 2013/07/11 05:45:23 kefren Exp $ */
+/* $NetBSD: socketops.h,v 1.7 2020/04/22 23:53:27 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -62,12 +62,11 @@ struct hello_info {
int keepalive;
SLIST_ENTRY(hello_info) infos;
};
-SLIST_HEAD(,hello_info) hello_info_head;
+extern SLIST_HEAD(hello_info_head,hello_info) hello_info_head;
struct hello_socket {
int type, socket;
SLIST_ENTRY(hello_socket) listentry;
};
-SLIST_HEAD(,hello_socket) hello_socket_head;
#endif /* !_SOCKETOPS_H_ */
