ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

Comparing gvpe/src/vpn.C (file contents):
Revision 1.32 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.34 by pcg, Sat Mar 26 03:16:24 2005 UTC

… …
46 46
47vpn network; // THE vpn (bad design...) 47vpn network; // THE vpn (bad design...)
48 48
49///////////////////////////////////////////////////////////////////////////// 49/////////////////////////////////////////////////////////////////////////////
50 50
51const char *vpn::script_if_up () 51void
52vpn::script_init_env ()
52{ 53{
53 // the tunnel device mtu should be the physical mtu - overhead 54 // the tunnel device mtu should be the physical mtu - overhead
54 // the tricky part is rounding to the cipher key blocksize 55 // the tricky part is rounding to the cipher key blocksize
55 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
56 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
57 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
58 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
59 60
60 char *env; 61 char *env;
61 asprintf (&env, "CONFBASE=%s", confbase); putenv (env); 62 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
62 asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
63 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
64 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); 63 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
65 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 64 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
66 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 65 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); putenv (env); 66 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 67 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
69 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 68 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
70 THISNODE->id & 0xff);
71 putenv (env);
72 69
70 conns [THISNODE->id - 1]->script_init_env ("");
71
72 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
73 {
74 char ext[16];
75 snprintf (ext, 16, "_%d", (*c)->conf->id);
76 (*c)->script_init_env (ext);
77 }
78}
79
80const char *vpn::script_if_init ()
81{
82 script_init_env ();
83
84 return tap->if_up ();
85}
86
87const char *vpn::script_if_up ()
88{
89 script_init_env ();
90
91 char *filename;
92 asprintf (&filename,
93 "%s/%s",
94 confbase,
73 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 95 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
96
97 return filename;
74} 98}
75 99
76int 100int
77vpn::setup () 101vpn::setup ()
78{ 102{
… …
265 289
266 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); 290 dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
267 } 291 }
268#endif 292#endif
269 293
294 /////////////////////////////////////////////////////////////////////////////
295
296 reconnect_all ();
297
298 /////////////////////////////////////////////////////////////////////////////
299
270 tap = new tap_device (); 300 tap = new tap_device ();
271 if (!tap) //D this, of course, never catches 301 if (!tap) //D this, of course, never catches
272 { 302 {
273 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 303 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
274 exit (EXIT_FAILURE); 304 exit (EXIT_FAILURE);
275 } 305 }
276 306
307 if (tap->if_up () &&
308 !run_script (run_script_cb (this, &vpn::script_if_init), true))
309 {
310 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
311 tap->if_up ());
312 exit (EXIT_FAILURE);
313 }
314
277 run_script (run_script_cb (this, &vpn::script_if_up), true); 315 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
316 {
317 slog (L_ERR, _("if-up command execution failed, exiting."));
318 exit (EXIT_FAILURE);
319 }
278 320
279 tap_ev_watcher.start (tap->fd, EVENT_READ); 321 tap_ev_watcher.start (tap->fd, EVENT_READ);
280
281 reconnect_all ();
282 322
283 return 0; 323 return 0;
284} 324}
285 325
286bool 326bool

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines