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.12 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.22 by root, Tue Feb 8 23:11:35 2011 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-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include <cstdio> 32#include <cstdio>
23#include <cstring> 33#include <cstring>
24#include <cerrno> 34#include <cerrno>
… …
61#define ifdebug(subsys) if (0) 71#define ifdebug(subsys) if (0)
62 72
63#define cp() 73#define cp()
64#define lookup_config(config_tree,key) (key) 74#define lookup_config(config_tree,key) (key)
65 75
66#define MTU MAXSIZE 76#define MTU MAX_MTU
67 77
68// BIGGEST hack of 'em all 78// BIGGEST hack of 'em all
69// will be casted to data_packet, due to structural similarity 79// will be casted to data_packet, due to structural similarity
70struct vpn_packet_t : net_packet { 80struct vpn_packet_t : net_packet
81{
71 u8 data[MAXSIZE]; 82 u8 data[MAXSIZE];
72}; 83};
73 84
74static bool overwrite_mac; 85static bool overwrite_mac;
75 86
… …
78{ 89{
79 if (!strcmp (key, "Interface")) 90 if (!strcmp (key, "Interface"))
80 *res = conf.ifname; 91 *res = conf.ifname;
81 else if (!strcmp (key, "Device")) 92 else if (!strcmp (key, "Device"))
82 *res = 0; 93 *res = 0;
94 else if (!strcmp (key, "DeviceType"))
95 *res = "tap";
83 else 96 else
84 { 97 {
85 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key); 98 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key);
86 *res = 0; 99 *res = 0;
87 } 100 }
… …
91 104
92#define netname conf.ifname 105#define netname conf.ifname
93 106
94#if IF_linux 107#if IF_linux
95# include "tincd/linux/device.c" 108# include "tincd/linux/device.c"
109const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU"; }
110
111#elif IF_bsd
112# include "tincd/bsd/device.c"
113const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
96 114
97#elif IF_freebsd 115#elif IF_freebsd
98# include "tincd/freebsd/device.c" 116# include "tincd/freebsd/device.c"
117const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
99 118
100#elif IF_netbsd 119#elif IF_netbsd
101# define IF_istun 1 120# define IF_istun 1
102# include "tincd/netbsd/device.c" 121# include "tincd/netbsd/device.c"
122const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
103 123
104#elif IF_openbsd 124#elif IF_openbsd
105# define IF_istun 1 125# define IF_istun 1
106# include "tincd/openbsd/device.c" 126# include "tincd/openbsd/device.c"
127const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
107 128
108#elif IF_solaris 129#elif IF_solaris
109# define IF_istun 1 130# define IF_istun 1
110# include "tincd/solaris/device.c" 131# include "tincd/solaris/device.c"
132const char * tap_device::if_up () { return ""; }
111 133
112#elif IF_cygwin 134#elif IF_cygwin
113# include "tincd/cygwin/device.c" 135# include "tincd/cygwin/device.c"
136const char * tap_device::if_up () { return ""; }
114 137
115#elif IF_mingw 138#elif IF_mingw
116# include "tincd/mingw/device.c" 139# include "tincd/mingw/device.c"
140const char * tap_device::if_up () { return ""; }
117 141
118#elif IF_darwin 142#elif IF_darwin
119# define IF_istun 1 143# define IF_istun 1
120# include "tincd/darwin/device.c" 144# include "tincd/darwin/device.c"
145const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
121 146
122#elif IF_raw_socket 147#elif IF_raw_socket
123# define IF_istun 1
124# include "tincd/raw_socket/device.c" 148# include "tincd/raw_socket/device.c"
149const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
150
151#elif IF_uml_socket
152# include "tincd/uml_socket/device.c"
153const char * tap_device::if_up () { return 0; }
125 154
126#else 155#else
127# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 156# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
128#endif 157#endif
129 158
… …
139 168
140tap_device::tap_device () 169tap_device::tap_device ()
141{ 170{
142 device = "(null)"; 171 device = "(null)";
143 172
144 if (setup_device ()) 173 bool ok = setup_device ();
174
175 if (device_info)
176 device = device_info;
177
178 if (ok)
145 { 179 {
146 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 180 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
147 fd = device_fd; 181 fd = device_fd;
148 strcpy (ifrname, iface); 182 strcpy (ifrname, iface);
149 } 183 }
… …
165 tap_packet *pkt = new tap_packet; 199 tap_packet *pkt = new tap_packet;
166 200
167 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 201 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
168 { 202 {
169 delete pkt; 203 delete pkt;
170 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 204 slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
171 strerror (errno)); 205 strerror (errno));
172 return 0; 206 return 0;
173 } 207 }
174 208
175#if IF_istun 209#if IF_istun
… …
193 if ( 227 if (
194#if IF_istun 228#if IF_istun
195 ether_emu.tap_to_tun (pkt) && 229 ether_emu.tap_to_tun (pkt) &&
196#endif 230#endif
197 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 231 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
198 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 232 slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
199 strerror (errno)); 233 strerror (errno));
200} 234}
201 235
202

Diff Legend

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