Merge pull request #11353 from kvuorine/fwknop-fixes
[feed/packages.git] / net / netdiscover / patches / 010-gcc10.patch
1 --- a/src/data_al.h
2 +++ b/src/data_al.h
3 @@ -35,7 +35,7 @@ extern "C"
4 {
5 #endif
6
7 -pthread_mutex_t *data_access;
8 +extern pthread_mutex_t *data_access;
9
10
11 /* Holds each data type total counters */
12 --- a/src/data_reply.c
13 +++ b/src/data_reply.c
14 @@ -43,7 +43,7 @@ struct data_registry *current_reply;
15 struct data_counter reply_count;
16
17 /* Screen printing buffers */
18 -char line[300], tline[300];
19 +extern char line[300], tline[300];
20 extern char blank[];
21
22
23 --- a/src/data_request.c
24 +++ b/src/data_request.c
25 @@ -43,7 +43,7 @@ struct data_registry *request_current;
26 struct data_counter request_count;
27
28 /* Screen printing buffers */
29 -char line[300], tline[300];
30 +extern char line[300], tline[300];
31 extern char blank[];
32
33
34 --- a/src/data_unique.c
35 +++ b/src/data_unique.c
36 @@ -44,7 +44,7 @@ struct data_registry *current_unique;
37 struct data_counter unique_count;
38
39 /* Screen printing buffers */
40 -char line[300], tline[300];
41 +extern char line[300], tline[300];
42 extern char blank[];
43
44
45 --- a/src/ifaces.c
46 +++ b/src/ifaces.c
47 @@ -73,7 +73,7 @@
48 pcap_t *inject;
49 unsigned char smac[] = { 0xCA, 0xFE, 0xCA, 0xFE, 0xCA, 0xFE };
50 struct p_header *temp_header;
51 -
52 +char errbuf[PCAP_ERRBUF_SIZE];
53
54 /* Start Sniffing on given iface */
55 void *start_sniffer(void *args)
56 --- a/src/ifaces.h
57 +++ b/src/ifaces.h
58 @@ -51,7 +51,7 @@ extern "C"
59
60
61 /* Shitty globals */
62 - char errbuf[PCAP_ERRBUF_SIZE];
63 + extern char errbuf[PCAP_ERRBUF_SIZE];
64
65 /* Threads data structure */
66 struct t_data {
67 --- a/src/main.c
68 +++ b/src/main.c
69 @@ -44,6 +44,7 @@
70 #define RPATH "%s/.netdiscover/ranges"
71 #define FPATH "%s/.netdiscover/fastips"
72
73 +int continue_listening;
74
75 extern void parseable_scan_end();
76 void *inject_arp(void *arg);
77 @@ -52,6 +53,9 @@ void *parsable_screen_refresh(void *arg);
78 void scan_range(char *disp, char *sip);
79 void usage();
80
81 +char *current_network;
82 +int parsable_output;
83 +pthread_mutex_t *data_access;
84
85 /* Last octect of ips scaned in fast mode */
86 /* Add new addr if needed here */
87 --- a/src/screen.c
88 +++ b/src/screen.c
89 @@ -56,6 +56,7 @@ int smode, oldmode;
90 char line[300], tline[300];
91 char blank[] = " ";
92
93 +struct winsize win_sz;
94
95 /* Inits lists with null pointers, sighandlers, etc */
96 void init_screen()
97 --- a/src/screen.h
98 +++ b/src/screen.h
99 @@ -51,9 +51,9 @@ extern "C"
100 #define KNOWN_COLOR "\33[1m%s\33[0m\n"
101
102 /* Ohh no, more globals */
103 -struct winsize win_sz;
104 -char *current_network;
105 -int parsable_output, continue_listening;
106 +extern struct winsize win_sz;
107 +extern char *current_network;
108 +extern int parsable_output, continue_listening;
109
110
111 /* Screen functions */