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.8 by pcg, Thu Oct 16 21:12:43 2003 UTC vs.
Revision 1.19 by pcg, Tue Apr 26 00:55:56 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 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include <cstdio> 22#include <cstdio>
21#include <cstring> 23#include <cstring>
22#include <cerrno> 24#include <cerrno>
… …
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];
… …
76{ 78{
77 if (!strcmp (key, "Interface")) 79 if (!strcmp (key, "Interface"))
78 *res = conf.ifname; 80 *res = conf.ifname;
79 else if (!strcmp (key, "Device")) 81 else if (!strcmp (key, "Device"))
80 *res = 0; 82 *res = 0;
83 else if (!strcmp (key, "DeviceType"))
84 *res = "tap";
81 else 85 else
82 { 86 {
83 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key); 87 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key);
84 *res = 0; 88 *res = 0;
85 } 89 }
… …
89 93
90#define netname conf.ifname 94#define netname conf.ifname
91 95
92#if IF_linux 96#if IF_linux
93# include "tincd/linux/device.c" 97# include "tincd/linux/device.c"
98const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU"; }
99
100#elif IF_bsd
101# include "tincd/bsd/device.c"
102const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
94 103
95#elif IF_freebsd 104#elif IF_freebsd
96# include "tincd/freebsd/device.c" 105# include "tincd/freebsd/device.c"
106const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
97 107
98#elif IF_netbsd 108#elif IF_netbsd
99#define IF_istun 1 109# define IF_istun 1
100# include "tincd/netbsd/device.c" 110# include "tincd/netbsd/device.c"
111const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
101 112
102#elif IF_openbsd 113#elif IF_openbsd
103#define IF_istun 1 114# define IF_istun 1
104# include "tincd/openbsd/device.c" 115# include "tincd/openbsd/device.c"
116const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
105 117
106#elif IF_solaris 118#elif IF_solaris
119# define IF_istun 1
107# include "tincd/solaris/device.c" 120# include "tincd/solaris/device.c"
121const char * tap_device::if_up () { return ""; }
108 122
109#elif IF_cygwin 123#elif IF_cygwin
110# include "tincd/cygwin/device.c" 124# include "tincd/cygwin/device.c"
125const char * tap_device::if_up () { return ""; }
111 126
112#elif IF_mingw 127#elif IF_mingw
113# include "tincd/mingw/device.c" 128# include "tincd/mingw/device.c"
129const char * tap_device::if_up () { return ""; }
114 130
115#elif IF_darwin 131#elif IF_darwin
116#define IF_istun 1 132# define IF_istun 1
117# include "tincd/darwin/device.c" 133# include "tincd/darwin/device.c"
134const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
118 135
119#elif IF_raw_socket 136#elif IF_raw_socket
120#define IF_istun 1
121# include "tincd/raw_socket/device.c" 137# include "tincd/raw_socket/device.c"
138const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU"; }
139
140#elif IF_uml_socket
141# include "tincd/uml_socket/device.c"
142const char * tap_device::if_up () { return 0; }
122 143
123#else 144#else
124# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 145# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
125#endif 146#endif
126 147
… …
136 157
137tap_device::tap_device () 158tap_device::tap_device ()
138{ 159{
139 device = "(null)"; 160 device = "(null)";
140 161
141 if (setup_device ()) 162 bool ok = setup_device ();
163
164 if (device_info)
165 device = device_info;
166
167 if (ok)
142 { 168 {
143 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 169 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
144 fd = device_fd; 170 fd = device_fd;
145 strcpy (ifrname, iface); 171 strcpy (ifrname, iface);
146 } 172 }
147 else 173 else
148 { 174 {
149 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device); 175 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device);
150 exit (1); 176 exit (EXIT_FAILURE);
151 } 177 }
152} 178}
153 179
154tap_device::~tap_device () 180tap_device::~tap_device ()
155{ 181{
… …
162 tap_packet *pkt = new tap_packet; 188 tap_packet *pkt = new tap_packet;
163 189
164 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 190 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
165 { 191 {
166 delete pkt; 192 delete pkt;
167 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 193 slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
168 strerror (errno)); 194 strerror (errno));
169 return 0; 195 return 0;
170 } 196 }
171 197
172#if IF_istun 198#if IF_istun
… …
190 if ( 216 if (
191#if IF_istun 217#if IF_istun
192 ether_emu.tap_to_tun (pkt) && 218 ether_emu.tap_to_tun (pkt) &&
193#endif 219#endif
194 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 220 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
195 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 221 slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
196 strerror (errno)); 222 strerror (errno));
197} 223}
198 224
199 225

Diff Legend

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