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.31 by pcg, Sat Mar 5 19:13:16 2005 UTC vs.
Revision 1.33 by pcg, Wed Mar 23 21:55:39 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
… …
65 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); 66 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
66 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); 67 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
67 asprintf (&env, "MTU=%d", mtu); putenv (env); 68 asprintf (&env, "MTU=%d", mtu); putenv (env);
68 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 69 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
69 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, 70 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
70 THISNODE->id & 0xff); 71 THISNODE->id & 0xff); putenv (env);
71 putenv (env);
72 72
73 // TODO: info for other nodes, maybe?
74}
75
76const char *vpn::script_if_init ()
77{
78 script_init_env ();
79
80 return tap->if_up ();
81}
82
83const char *vpn::script_if_up ()
84{
85 script_init_env ();
86
87 char *filename;
88 asprintf (&filename,
89 "%s/%s",
90 confbase,
73 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 91 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
92
93 return filename;
74} 94}
75 95
76int 96int
77vpn::setup () 97vpn::setup ()
78{ 98{
… …
235 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 255 dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
236 256
237 if (dnsv4_fd < 0) 257 if (dnsv4_fd < 0)
238 return -1; 258 return -1;
239 259
260#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
261 // this I really consider a linux bug. I am neither connected
262 // nor do I fragment myself. Linux still sets DF and doesn't
263 // fragment for me sometimes.
264 {
265 int oval = IP_PMTUDISC_DONT;
266 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
267 }
268#endif
269
240 // standard daemon practise... 270 // standard daemon practise...
241 { 271 {
242 int oval = 1; 272 int oval = 1;
243 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 273 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
244 } 274 }
… …
262 { 292 {
263 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 293 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
264 exit (EXIT_FAILURE); 294 exit (EXIT_FAILURE);
265 } 295 }
266 296
297 if (tap->if_up () &&
298 !run_script (run_script_cb (this, &vpn::script_if_init), true))
299 {
300 slog (L_ERR, _("interface initialization command '%s' failed, exiting."),
301 tap->if_up ());
302 exit (EXIT_FAILURE);
303 }
304
267 run_script (run_script_cb (this, &vpn::script_if_up), true); 305 if (!run_script (run_script_cb (this, &vpn::script_if_up), true))
306 {
307 slog (L_ERR, _("if-up command execution failed, exiting."));
308 exit (EXIT_FAILURE);
309 }
268 310
269 tap_ev_watcher.start (tap->fd, EVENT_READ); 311 tap_ev_watcher.start (tap->fd, EVENT_READ);
270 312
271 reconnect_all (); 313 reconnect_all ();
272 314

Diff Legend

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