1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
Description: fix FTBFS with gcc10
Author: Thorsten Alteholz <debian@alteholz.de>
Index: npd6-1.1.0/main.c
===================================================================
--- npd6-1.1.0.orig/main.c 2014-07-17 13:22:19.000000000 +0000
+++ npd6-1.1.0/main.c 2020-08-06 19:15:55.060492031 +0000
@@ -25,6 +25,46 @@
#include "includes.h"
#include "npd6.h"
+//*****************************************************************************
+// Globals
+//
+char *pname;
+char *paramName;
+int sockpkt;
+int debug;
+int daemonize;
+FILE *logFileFD;
+int logging;
+char configfile[FILENAME_MAX];
+FILE *configFileFD;
+int initialIFFlags;
+
+unsigned int interfaceCount; // Total number of interface/prefix combos
+// We dynaimcally size this at run-time
+struct npd6Interface *interfaces;
+
+// Key behaviour
+int naLinkOptFlag; // From config file NPD6OPTFLAG
+int nsIgnoreLocal; // From config file NPD6LOCALIG
+int naRouter; // From config file NPD6ROUTERNA
+int maxHops; // From config file NPD6MAXHOPS
+int collectTargets; // From config file NPD6TARGETS
+
+// Target tree data structures etc
+void *tRoot;
+int tEntries;
+
+// Black/whitelisting data
+void *lRoot;
+int listType;
+int listLog; // From config file NPD6LISTLOG
+
+// Logging - various
+int ralog; // From config file NPD6RALOG
+
+// Error handling
+int pollErrorLimit; // From config file
+
char usage_str[] =
{
"\n"
Index: npd6-1.1.0/npd6.h
===================================================================
--- npd6-1.1.0.orig/npd6.h 2014-07-17 13:22:19.000000000 +0000
+++ npd6-1.1.0/npd6.h 2020-08-06 19:16:41.372709873 +0000
@@ -65,16 +65,16 @@
//*****************************************************************************
// Globals
//
-char *pname;
-char *paramName;
-int sockpkt;
-int debug;
-int daemonize;
-FILE *logFileFD;
-int logging;
-char configfile[FILENAME_MAX];
-FILE *configFileFD;
-int initialIFFlags;
+extern char *pname;
+extern char *paramName;
+extern int sockpkt;
+extern int debug;
+extern int daemonize;
+extern FILE *logFileFD;
+extern int logging;
+extern char configfile[FILENAME_MAX];
+extern FILE *configFileFD;
+extern int initialIFFlags;
// Record of interfaces, prefix, indices, etc.
struct npd6Interface {
@@ -88,36 +88,36 @@
int pktSock;
int icmpSock;
};
-unsigned int interfaceCount; // Total number of interface/prefix combos
+extern unsigned int interfaceCount; // Total number of interface/prefix combos
// We dynaimcally size this at run-time
-struct npd6Interface *interfaces;
+extern struct npd6Interface *interfaces;
// Key behaviour
-int naLinkOptFlag; // From config file NPD6OPTFLAG
-int nsIgnoreLocal; // From config file NPD6LOCALIG
-int naRouter; // From config file NPD6ROUTERNA
-int maxHops; // From config file NPD6MAXHOPS
-int collectTargets; // From config file NPD6TARGETS
+extern int naLinkOptFlag; // From config file NPD6OPTFLAG
+extern int nsIgnoreLocal; // From config file NPD6LOCALIG
+extern int naRouter; // From config file NPD6ROUTERNA
+extern int maxHops; // From config file NPD6MAXHOPS
+extern int collectTargets; // From config file NPD6TARGETS
// Target tree data structures etc
-void *tRoot;
+extern void *tRoot;
int tCompare(const void *, const void *);
void tDump(const void *, const VISIT , const int);
-int tEntries;
+extern int tEntries;
// Black/whitelisting data
-void *lRoot;
-int listType;
+extern void *lRoot;
+extern int listType;
#define NOLIST 0
#define BLACKLIST 1
#define WHITELIST 2
-int listLog; // From config file NPD6LISTLOG
+extern int listLog; // From config file NPD6LISTLOG
// Logging - various
-int ralog; // From config file NPD6RALOG
+extern int ralog; // From config file NPD6RALOG
// Error handling
-int pollErrorLimit; // From config file
+extern int pollErrorLimit; // From config file
//*****************************************************************************
// Prototypes
|
