1 |
vip-ire |
1.1 |
--- ./pcap/ulogd_PCAP.c.initializers 2005-11-25 20:58:25.000000000 +0100 |
2 |
|
|
+++ ./pcap/ulogd_PCAP.c 2007-08-14 23:18:45.000000000 +0200 |
3 |
|
|
@@ -276,7 +276,7 @@ static ulog_output_t pcap_op = { |
4 |
|
|
.signal = &pcap_signal_handler, |
5 |
|
|
}; |
6 |
|
|
|
7 |
|
|
-void _init(void) |
8 |
|
|
+static void __attribute__((constructor)) init_pcap(void) |
9 |
|
|
{ |
10 |
|
|
if (get_ids()) { |
11 |
|
|
ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n"); |
12 |
|
|
--- ./sqlite3/ulogd_SQLITE3.c.initializers 2005-11-25 20:58:25.000000000 +0100 |
13 |
|
|
+++ ./sqlite3/ulogd_SQLITE3.c 2007-08-14 23:18:22.000000000 +0200 |
14 |
|
|
@@ -405,7 +405,7 @@ static ulog_output_t _sqlite3_plugin = { |
15 |
|
|
.fini = &_sqlite3_fini, |
16 |
|
|
}; |
17 |
|
|
|
18 |
|
|
-void _init(void) |
19 |
|
|
+static void __attribute__((constructor)) init_sqlite3(void) |
20 |
|
|
{ |
21 |
|
|
register_output(&_sqlite3_plugin); |
22 |
|
|
} |
23 |
|
|
--- ./pgsql/ulogd_PGSQL.c.initializers 2006-01-23 00:07:10.000000000 +0100 |
24 |
|
|
+++ ./pgsql/ulogd_PGSQL.c 2007-08-14 23:17:54.000000000 +0200 |
25 |
|
|
@@ -458,7 +458,7 @@ static ulog_output_t pgsql_plugin = { |
26 |
|
|
.fini = &pgsql_fini, |
27 |
|
|
}; |
28 |
|
|
|
29 |
|
|
-void _init(void) |
30 |
|
|
+static void __attribute__((constructor)) init_pgsql(void) |
31 |
|
|
{ |
32 |
|
|
register_output(&pgsql_plugin); |
33 |
|
|
} |
34 |
|
|
--- ./extensions/ulogd_LOGEMU.c.initializers 2005-11-25 20:58:26.000000000 +0100 |
35 |
|
|
+++ ./extensions/ulogd_LOGEMU.c 2007-08-14 23:16:04.000000000 +0200 |
36 |
|
|
@@ -130,7 +130,7 @@ static ulog_output_t logemu_op = { |
37 |
|
|
.signal = &signal_handler_logemu, |
38 |
|
|
}; |
39 |
|
|
|
40 |
|
|
-void _init(void) |
41 |
|
|
+static void __attribute__((constructor)) logemu__init(void) |
42 |
|
|
{ |
43 |
|
|
register_output(&logemu_op); |
44 |
|
|
} |
45 |
|
|
--- ./extensions/ulogd_PWSNIFF.c.initializers 2005-11-25 20:58:26.000000000 +0100 |
46 |
|
|
+++ ./extensions/ulogd_PWSNIFF.c 2007-08-14 23:16:04.000000000 +0200 |
47 |
|
|
@@ -151,7 +151,7 @@ static ulog_interpreter_t base_ip[] = { |
48 |
|
|
{ NULL, "", 0, NULL, 0, NULL }, |
49 |
|
|
}; |
50 |
|
|
|
51 |
|
|
-static void _base_reg_ip(void) |
52 |
|
|
+static void __attribute__((constructor)) _base_reg_ip(void) |
53 |
|
|
{ |
54 |
|
|
ulog_interpreter_t *ip = base_ip; |
55 |
|
|
ulog_interpreter_t *p; |
56 |
|
|
@@ -159,9 +159,3 @@ static void _base_reg_ip(void) |
57 |
|
|
for (p = ip; p->interp; p++) |
58 |
|
|
register_interpreter(p); |
59 |
|
|
} |
60 |
|
|
- |
61 |
|
|
- |
62 |
|
|
-void _init(void) |
63 |
|
|
-{ |
64 |
|
|
- _base_reg_ip(); |
65 |
|
|
-} |
66 |
|
|
--- ./extensions/ulogd_SYSLOG.c.initializers 2006-01-25 12:14:09.000000000 +0100 |
67 |
|
|
+++ ./extensions/ulogd_SYSLOG.c 2007-08-14 23:16:04.000000000 +0200 |
68 |
|
|
@@ -140,7 +140,7 @@ static ulog_output_t syslog_op = { |
69 |
|
|
}; |
70 |
|
|
|
71 |
|
|
|
72 |
|
|
-void _init(void) |
73 |
|
|
+static void __attribute__((constructor)) init_syslog(void) |
74 |
|
|
{ |
75 |
|
|
if (printpkt_init()) |
76 |
|
|
ulogd_log(ULOGD_ERROR, "can't resolve all keyhash id's\n"); |
77 |
|
|
--- ./extensions/ulogd_OPRINT.c.initializers 2005-11-25 20:58:26.000000000 +0100 |
78 |
|
|
+++ ./extensions/ulogd_OPRINT.c 2007-08-14 23:16:04.000000000 +0200 |
79 |
|
|
@@ -138,7 +138,8 @@ static ulog_output_t oprint_op = { |
80 |
|
|
.fini = &oprint_fini, |
81 |
|
|
}; |
82 |
|
|
|
83 |
|
|
-void _init(void) |
84 |
|
|
+__attribute__ ((constructor)) |
85 |
|
|
+static void init_oprint(void) |
86 |
|
|
{ |
87 |
|
|
register_output(&oprint_op); |
88 |
|
|
} |
89 |
|
|
--- ./extensions/ulogd_BASE.c.initializers 2007-08-14 23:16:04.000000000 +0200 |
90 |
|
|
+++ ./extensions/ulogd_BASE.c 2007-08-14 23:16:04.000000000 +0200 |
91 |
|
|
@@ -540,6 +540,7 @@ static ulog_interpreter_t base_ip[] = { |
92 |
|
|
{ NULL, "", 0, NULL, 0, NULL }, |
93 |
|
|
}; |
94 |
|
|
|
95 |
|
|
+__attribute__ ((constructor)) |
96 |
|
|
void _base_reg_ip(void) |
97 |
|
|
{ |
98 |
|
|
ulog_interpreter_t *ip = base_ip; |
99 |
|
|
@@ -549,8 +550,3 @@ void _base_reg_ip(void) |
100 |
|
|
register_interpreter(p); |
101 |
|
|
} |
102 |
|
|
} |
103 |
|
|
- |
104 |
|
|
-void _init(void) |
105 |
|
|
-{ |
106 |
|
|
- _base_reg_ip(); |
107 |
|
|
-} |
108 |
|
|
--- ./extensions/ulogd_LOCAL.c.initializers 2005-11-25 20:58:26.000000000 +0100 |
109 |
|
|
+++ ./extensions/ulogd_LOCAL.c 2007-08-14 23:16:04.000000000 +0200 |
110 |
|
|
@@ -84,7 +84,7 @@ static void _local_reg_ip(void) |
111 |
|
|
register_interpreter(p); |
112 |
|
|
} |
113 |
|
|
|
114 |
|
|
-void _init(void) |
115 |
|
|
+static void __attribute__((constructor)) local_init(void) |
116 |
|
|
{ |
117 |
|
|
/* get hostname */ |
118 |
|
|
char *tmp; |
119 |
|
|
--- ./mysql/ulogd_MYSQL.c.initializers 2005-11-25 20:58:27.000000000 +0100 |
120 |
|
|
+++ ./mysql/ulogd_MYSQL.c 2007-08-14 23:17:31.000000000 +0200 |
121 |
|
|
@@ -448,7 +448,7 @@ static ulog_output_t mysql_plugin = { |
122 |
|
|
.fini = &_mysql_fini, |
123 |
|
|
}; |
124 |
|
|
|
125 |
|
|
-void _init(void) |
126 |
|
|
+static void __attribute__((constructor)) init_mysql(void) |
127 |
|
|
{ |
128 |
|
|
register_output(&mysql_plugin); |
129 |
|
|
} |