]>
Commit | Line | Data |
---|---|---|
cd1a2927 MT |
1 | --- openswan-1.0.6.old/klips/net/ipsec/ipsec_tunnel.c 2003-12-04 03:03:24.000000000 +0000 |
2 | +++ openswan-1.0.6/klips/net/ipsec/ipsec_tunnel.c 2004-09-01 21:20:46.870711465 +0100 | |
3 | @@ -3186,6 +3186,174 @@ | |
4 | return 0; | |
5 | } | |
6 | ||
7 | +static struct device dev_ipsec15 = | |
8 | +{ | |
9 | + "ipsec15\0 ", /* name */ | |
10 | + 0, /* recv memory end */ | |
11 | + 0, /* recv memory start */ | |
12 | + 0, /* memory end */ | |
13 | + 0, /* memory start */ | |
14 | + 0x0, /* base I/O address */ | |
15 | + 0, /* IRQ */ | |
16 | + 0, 0, 0, /* flags */ | |
17 | + NULL, /* next device */ | |
18 | + ipsec_tunnel_probe /* setup */ | |
19 | +}; | |
20 | + | |
21 | +static struct device dev_ipsec14 = | |
22 | +{ | |
23 | + "ipsec14\0 ", /* name */ | |
24 | + 0, /* recv memory end */ | |
25 | + 0, /* recv memory start */ | |
26 | + 0, /* memory end */ | |
27 | + 0, /* memory start */ | |
28 | + 0x0, /* base I/O address */ | |
29 | + 0, /* IRQ */ | |
30 | + 0, 0, 0, /* flags */ | |
31 | + NULL, /* next device */ | |
32 | + ipsec_tunnel_probe /* setup */ | |
33 | +}; | |
34 | + | |
35 | +static struct device dev_ipsec13 = | |
36 | +{ | |
37 | + "ipsec13\0 ", /* name */ | |
38 | + 0, /* recv memory end */ | |
39 | + 0, /* recv memory start */ | |
40 | + 0, /* memory end */ | |
41 | + 0, /* memory start */ | |
42 | + 0x0, /* base I/O address */ | |
43 | + 0, /* IRQ */ | |
44 | + 0, 0, 0, /* flags */ | |
45 | + NULL, /* next device */ | |
46 | + ipsec_tunnel_probe /* setup */ | |
47 | +}; | |
48 | + | |
49 | +static struct device dev_ipsec12 = | |
50 | +{ | |
51 | + "ipsec12\0 ", /* name */ | |
52 | + 0, /* recv memory end */ | |
53 | + 0, /* recv memory start */ | |
54 | + 0, /* memory end */ | |
55 | + 0, /* memory start */ | |
56 | + 0x0, /* base I/O address */ | |
57 | + 0, /* IRQ */ | |
58 | + 0, 0, 0, /* flags */ | |
59 | + NULL, /* next device */ | |
60 | + ipsec_tunnel_probe /* setup */ | |
61 | +}; | |
62 | + | |
63 | +static struct device dev_ipsec11 = | |
64 | +{ | |
65 | + "ipsec11\0 ", /* name */ | |
66 | + 0, /* recv memory end */ | |
67 | + 0, /* recv memory start */ | |
68 | + 0, /* memory end */ | |
69 | + 0, /* memory start */ | |
70 | + 0x0, /* base I/O address */ | |
71 | + 0, /* IRQ */ | |
72 | + 0, 0, 0, /* flags */ | |
73 | + NULL, /* next device */ | |
74 | + ipsec_tunnel_probe /* setup */ | |
75 | +}; | |
76 | + | |
77 | +static struct device dev_ipsec10 = | |
78 | +{ | |
79 | + "ipsec10\0 ", /* name */ | |
80 | + 0, /* recv memory end */ | |
81 | + 0, /* recv memory start */ | |
82 | + 0, /* memory end */ | |
83 | + 0, /* memory start */ | |
84 | + 0x0, /* base I/O address */ | |
85 | + 0, /* IRQ */ | |
86 | + 0, 0, 0, /* flags */ | |
87 | + NULL, /* next device */ | |
88 | + ipsec_tunnel_probe /* setup */ | |
89 | +}; | |
90 | + | |
91 | +static struct device dev_ipsec9 = | |
92 | +{ | |
93 | + "ipsec9\0 ", /* name */ | |
94 | + 0, /* recv memory end */ | |
95 | + 0, /* recv memory start */ | |
96 | + 0, /* memory end */ | |
97 | + 0, /* memory start */ | |
98 | + 0x0, /* base I/O address */ | |
99 | + 0, /* IRQ */ | |
100 | + 0, 0, 0, /* flags */ | |
101 | + NULL, /* next device */ | |
102 | + ipsec_tunnel_probe /* setup */ | |
103 | +}; | |
104 | + | |
105 | +static struct device dev_ipsec8 = | |
106 | +{ | |
107 | + "ipsec8\0 ", /* name */ | |
108 | + 0, /* recv memory end */ | |
109 | + 0, /* recv memory start */ | |
110 | + 0, /* memory end */ | |
111 | + 0, /* memory start */ | |
112 | + 0x0, /* base I/O address */ | |
113 | + 0, /* IRQ */ | |
114 | + 0, 0, 0, /* flags */ | |
115 | + NULL, /* next device */ | |
116 | + ipsec_tunnel_probe /* setup */ | |
117 | +}; | |
118 | + | |
119 | +static struct device dev_ipsec7 = | |
120 | +{ | |
121 | + "ipsec7\0 ", /* name */ | |
122 | + 0, /* recv memory end */ | |
123 | + 0, /* recv memory start */ | |
124 | + 0, /* memory end */ | |
125 | + 0, /* memory start */ | |
126 | + 0x0, /* base I/O address */ | |
127 | + 0, /* IRQ */ | |
128 | + 0, 0, 0, /* flags */ | |
129 | + NULL, /* next device */ | |
130 | + ipsec_tunnel_probe /* setup */ | |
131 | +}; | |
132 | + | |
133 | +static struct device dev_ipsec6 = | |
134 | +{ | |
135 | + "ipsec6\0 ", /* name */ | |
136 | + 0, /* recv memory end */ | |
137 | + 0, /* recv memory start */ | |
138 | + 0, /* memory end */ | |
139 | + 0, /* memory start */ | |
140 | + 0x0, /* base I/O address */ | |
141 | + 0, /* IRQ */ | |
142 | + 0, 0, 0, /* flags */ | |
143 | + NULL, /* next device */ | |
144 | + ipsec_tunnel_probe /* setup */ | |
145 | +}; | |
146 | + | |
147 | +static struct device dev_ipsec5 = | |
148 | +{ | |
149 | + "ipsec5\0 ", /* name */ | |
150 | + 0, /* recv memory end */ | |
151 | + 0, /* recv memory start */ | |
152 | + 0, /* memory end */ | |
153 | + 0, /* memory start */ | |
154 | + 0x0, /* base I/O address */ | |
155 | + 0, /* IRQ */ | |
156 | + 0, 0, 0, /* flags */ | |
157 | + NULL, /* next device */ | |
158 | + ipsec_tunnel_probe /* setup */ | |
159 | +}; | |
160 | + | |
161 | +static struct device dev_ipsec4 = | |
162 | +{ | |
163 | + "ipsec4\0 ", /* name */ | |
164 | + 0, /* recv memory end */ | |
165 | + 0, /* recv memory start */ | |
166 | + 0, /* memory end */ | |
167 | + 0, /* memory start */ | |
168 | + 0x0, /* base I/O address */ | |
169 | + 0, /* IRQ */ | |
170 | + 0, 0, 0, /* flags */ | |
171 | + NULL, /* next device */ | |
172 | + ipsec_tunnel_probe /* setup */ | |
173 | +}; | |
174 | + | |
175 | static struct device dev_ipsec3 = | |
176 | { | |
177 | "ipsec3\0 ", /* name */ | |
178 | @@ -3277,6 +3445,102 @@ | |
179 | #endif | |
180 | if (register_netdev(&dev_ipsec3) != 0) | |
181 | return -EIO; | |
182 | +#if 0 | |
183 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
184 | + "klips_debug:ipsec_tunnel_init_devices: " | |
185 | + "registering device %s\n", | |
186 | + dev_ipsec4.name); | |
187 | +#endif | |
188 | + if (register_netdev(&dev_ipsec4) != 0) | |
189 | + return -EIO; | |
190 | +#if 0 | |
191 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
192 | + "klips_debug:ipsec_tunnel_init_devices: " | |
193 | + "registering device %s\n", | |
194 | + dev_ipsec5.name); | |
195 | +#endif | |
196 | + if (register_netdev(&dev_ipsec5) != 0) | |
197 | + return -EIO; | |
198 | +#if 0 | |
199 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
200 | + "klips_debug:ipsec_tunnel_init_devices: " | |
201 | + "registering device %s\n", | |
202 | + dev_ipsec6.name); | |
203 | +#endif | |
204 | + if (register_netdev(&dev_ipsec6) != 0) | |
205 | + return -EIO; | |
206 | +#if 0 | |
207 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
208 | + "klips_debug:ipsec_tunnel_init_devices: " | |
209 | + "registering device %s\n", | |
210 | + dev_ipsec7.name); | |
211 | +#endif | |
212 | + if (register_netdev(&dev_ipsec7) != 0) | |
213 | + return -EIO; | |
214 | +#if 0 | |
215 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
216 | + "klips_debug:ipsec_tunnel_init_devices: " | |
217 | + "registering device %s\n", | |
218 | + dev_ipsec8.name); | |
219 | +#endif | |
220 | + if (register_netdev(&dev_ipsec8) != 0) | |
221 | + return -EIO; | |
222 | +#if 0 | |
223 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
224 | + "klips_debug:ipsec_tunnel_init_devices: " | |
225 | + "registering device %s\n", | |
226 | + dev_ipsec9.name); | |
227 | +#endif | |
228 | + if (register_netdev(&dev_ipsec9) != 0) | |
229 | + return -EIO; | |
230 | +#if 0 | |
231 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
232 | + "klips_debug:ipsec_tunnel_init_devices: " | |
233 | + "registering device %s\n", | |
234 | + dev_ipsec10.name); | |
235 | +#endif | |
236 | + if (register_netdev(&dev_ipsec10) != 0) | |
237 | + return -EIO; | |
238 | +#if 0 | |
239 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
240 | + "klips_debug:ipsec_tunnel_init_devices: " | |
241 | + "registering device %s\n", | |
242 | + dev_ipsec11.name); | |
243 | +#endif | |
244 | + if (register_netdev(&dev_ipsec11) != 0) | |
245 | + return -EIO; | |
246 | +#if 0 | |
247 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
248 | + "klips_debug:ipsec_tunnel_init_devices: " | |
249 | + "registering device %s\n", | |
250 | + dev_ipsec12.name); | |
251 | +#endif | |
252 | + if (register_netdev(&dev_ipsec12) != 0) | |
253 | + return -EIO; | |
254 | +#if 0 | |
255 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
256 | + "klips_debug:ipsec_tunnel_init_devices: " | |
257 | + "registering device %s\n", | |
258 | + dev_ipsec13.name); | |
259 | +#endif | |
260 | + if (register_netdev(&dev_ipsec13) != 0) | |
261 | + return -EIO; | |
262 | +#if 0 | |
263 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
264 | + "klips_debug:ipsec_tunnel_init_devices: " | |
265 | + "registering device %s\n", | |
266 | + dev_ipsec14.name); | |
267 | +#endif | |
268 | + if (register_netdev(&dev_ipsec14) != 0) | |
269 | + return -EIO; | |
270 | +#if 0 | |
271 | + KLIPS_PRINT(debug_tunnel & DB_TN_INIT, | |
272 | + "klips_debug:ipsec_tunnel_init_devices: " | |
273 | + "registering device %s\n", | |
274 | + dev_ipsec15.name); | |
275 | +#endif | |
276 | + if (register_netdev(&dev_ipsec15) != 0) | |
277 | + return -EIO; | |
278 | return 0; | |
279 | } | |
280 | ||
281 | @@ -3290,14 +3554,50 @@ | |
282 | unregister_netdev(&dev_ipsec1); | |
283 | unregister_netdev(&dev_ipsec2); | |
284 | unregister_netdev(&dev_ipsec3); | |
285 | + unregister_netdev(&dev_ipsec4); | |
286 | + unregister_netdev(&dev_ipsec5); | |
287 | + unregister_netdev(&dev_ipsec6); | |
288 | + unregister_netdev(&dev_ipsec7); | |
289 | + unregister_netdev(&dev_ipsec8); | |
290 | + unregister_netdev(&dev_ipsec9); | |
291 | + unregister_netdev(&dev_ipsec10); | |
292 | + unregister_netdev(&dev_ipsec11); | |
293 | + unregister_netdev(&dev_ipsec12); | |
294 | + unregister_netdev(&dev_ipsec13); | |
295 | + unregister_netdev(&dev_ipsec14); | |
296 | + unregister_netdev(&dev_ipsec15); | |
297 | kfree(dev_ipsec0.priv); | |
298 | kfree(dev_ipsec1.priv); | |
299 | kfree(dev_ipsec2.priv); | |
300 | kfree(dev_ipsec3.priv); | |
301 | + kfree(dev_ipsec4.priv); | |
302 | + kfree(dev_ipsec5.priv); | |
303 | + kfree(dev_ipsec6.priv); | |
304 | + kfree(dev_ipsec7.priv); | |
305 | + kfree(dev_ipsec8.priv); | |
306 | + kfree(dev_ipsec9.priv); | |
307 | + kfree(dev_ipsec10.priv); | |
308 | + kfree(dev_ipsec11.priv); | |
309 | + kfree(dev_ipsec12.priv); | |
310 | + kfree(dev_ipsec13.priv); | |
311 | + kfree(dev_ipsec14.priv); | |
312 | + kfree(dev_ipsec15.priv); | |
313 | dev_ipsec0.priv=NULL; | |
314 | dev_ipsec1.priv=NULL; | |
315 | dev_ipsec2.priv=NULL; | |
316 | dev_ipsec3.priv=NULL; | |
317 | + dev_ipsec4.priv=NULL; | |
318 | + dev_ipsec5.priv=NULL; | |
319 | + dev_ipsec6.priv=NULL; | |
320 | + dev_ipsec7.priv=NULL; | |
321 | + dev_ipsec8.priv=NULL; | |
322 | + dev_ipsec9.priv=NULL; | |
323 | + dev_ipsec10.priv=NULL; | |
324 | + dev_ipsec11.priv=NULL; | |
325 | + dev_ipsec12.priv=NULL; | |
326 | + dev_ipsec13.priv=NULL; | |
327 | + dev_ipsec14.priv=NULL; | |
328 | + dev_ipsec15.priv=NULL; | |
329 | ||
330 | return error; | |
331 | } | |
332 | --- openswan-1.0.6.old/klips/net/ipsec/ipsec_tunnel.h 2002-09-05 05:13:17.000000000 +0200 | |
333 | +++ openswan-1.0.6/klips/net/ipsec/ipsec_tunnel.h 2004-08-25 12:30:01.000000000 +0200 | |
334 | @@ -98,7 +98,7 @@ | |
335 | int mtu; /* What is the desired MTU? */ | |
336 | }; | |
337 | ||
338 | -#define IPSEC_NUM_IF 4 | |
339 | +#define IPSEC_NUM_IF 16 | |
340 | ||
341 | extern char ipsec_tunnel_c_version[]; | |
342 |