blob: 60835b858816e6c0f1a049e85c020b010091287d (
plain)
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
|
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -86,6 +86,10 @@
int daemon_pipe[2];
+pthread_t daemon_thread;
+char *dump_prefix;
+char *dump_dir;
+
pthread_mutex_t mutex;
struct request *requests = 0, *requests_last = 0;
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -252,7 +252,7 @@
int num_flows;
};
-pthread_t daemon_thread;
+extern pthread_t daemon_thread;
/* Through this pipe we wakeup the thread from select */
extern int daemon_pipe[2];
@@ -268,9 +268,8 @@
* large a reply can get */
struct report* get_reports(int *has_more);
-/* FIXME: shouldn't be global? */
-char *dump_prefix;
-char *dump_dir;
+extern char *dump_prefix;
+extern char *dump_dir;
void *daemon_main(void* ptr);
void add_report(struct report* report);
|
GitWeb
