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

Comparing gvpe/src/device-tincd.C (file contents):
Revision 1.10 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.16 by pcg, Fri Mar 25 13:56:25 2005 UTC

1/* 1/*
2 device-tincd.C -- include one of the tincd low level implementations. 2 device-tincd.C -- include one of the tincd low level implementations.
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18*/ 20*/
19 21
20#include <cstdio> 22#include <cstdio>
21#include <cstring> 23#include <cstring>
… …
59#define ifdebug(subsys) if (0) 61#define ifdebug(subsys) if (0)
60 62
61#define cp() 63#define cp()
62#define lookup_config(config_tree,key) (key) 64#define lookup_config(config_tree,key) (key)
63 65
64#define MTU MAXSIZE 66#define MTU MAX_MTU
65 67
66// BIGGEST hack of 'em all 68// BIGGEST hack of 'em all
67// will be casted to data_packet, due to structural similarity 69// will be casted to data_packet, due to structural similarity
68struct vpn_packet_t : net_packet { 70struct vpn_packet_t : net_packet {
69 u8 data[MAXSIZE]; 71 u8 data[MAXSIZE];
… …
89 91
90#define netname conf.ifname 92#define netname conf.ifname
91 93
92#if IF_linux 94#if IF_linux
93# include "tincd/linux/device.c" 95# include "tincd/linux/device.c"
96const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU up"; }
94 97
95#elif IF_freebsd 98#elif IF_freebsd
96# include "tincd/freebsd/device.c" 99# include "tincd/freebsd/device.c"
100// 5.2.1' ifconfig _first_ sets the if up then changes mtu, which can be deadly due to ipv6 kicking in
101const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU && /sbin/ifconfig $IFNAME up"; }
97 102
98#elif IF_netbsd 103#elif IF_netbsd
99#define IF_istun 1 104# define IF_istun 1
100# include "tincd/netbsd/device.c" 105# include "tincd/netbsd/device.c"
106const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
101 107
102#elif IF_openbsd 108#elif IF_openbsd
103#define IF_istun 1 109# define IF_istun 1
104# include "tincd/openbsd/device.c" 110# include "tincd/openbsd/device.c"
111const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
105 112
106#elif IF_solaris 113#elif IF_solaris
114# define IF_istun 1
107# include "tincd/solaris/device.c" 115# include "tincd/solaris/device.c"
116const char * tap_device::if_up () { return ""; }
108 117
109#elif IF_cygwin 118#elif IF_cygwin
110# include "tincd/cygwin/device.c" 119# include "tincd/cygwin/device.c"
120const char * tap_device::if_up () { return ""; }
111 121
112#elif IF_mingw 122#elif IF_mingw
113# include "tincd/mingw/device.c" 123# include "tincd/mingw/device.c"
124const char * tap_device::if_up () { return ""; }
114 125
115#elif IF_darwin 126#elif IF_darwin
116#define IF_istun 1 127# define IF_istun 1
117# include "tincd/darwin/device.c" 128# include "tincd/darwin/device.c"
129const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
118 130
119#elif IF_raw_socket 131#elif IF_raw_socket
120#define IF_istun 1
121# include "tincd/raw_socket/device.c" 132# include "tincd/raw_socket/device.c"
133const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
134
135#elif IF_uml_socket
136# include "tincd/uml_socket/device.c"
137const char * tap_device::if_up () { return 0; }
122 138
123#else 139#else
124# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 140# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
125#endif 141#endif
126 142
… …
136 152
137tap_device::tap_device () 153tap_device::tap_device ()
138{ 154{
139 device = "(null)"; 155 device = "(null)";
140 156
141 if (setup_device ()) 157 bool ok = setup_device ();
158
159 if (device_info)
160 device = device_info;
161
162 if (ok)
142 { 163 {
143 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 164 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
144 fd = device_fd; 165 fd = device_fd;
145 strcpy (ifrname, iface); 166 strcpy (ifrname, iface);
146 } 167 }
… …
162 tap_packet *pkt = new tap_packet; 183 tap_packet *pkt = new tap_packet;
163 184
164 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 185 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
165 { 186 {
166 delete pkt; 187 delete pkt;
167 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 188 slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
168 strerror (errno)); 189 strerror (errno));
169 return 0; 190 return 0;
170 } 191 }
171 192
172#if IF_istun 193#if IF_istun
… …
190 if ( 211 if (
191#if IF_istun 212#if IF_istun
192 ether_emu.tap_to_tun (pkt) && 213 ether_emu.tap_to_tun (pkt) &&
193#endif 214#endif
194 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 215 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
195 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 216 slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
196 strerror (errno)); 217 strerror (errno));
197} 218}
198 219
199 220

Diff Legend

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