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.9 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.15 by pcg, Wed Mar 23 21:55:39 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"
100const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
97 101
98#elif IF_netbsd 102#elif IF_netbsd
99#define IF_istun 1 103# define IF_istun 1
100# include "tincd/netbsd/device.c" 104# include "tincd/netbsd/device.c"
105const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
101 106
102#elif IF_openbsd 107#elif IF_openbsd
103#define IF_istun 1 108# define IF_istun 1
104# include "tincd/openbsd/device.c" 109# include "tincd/openbsd/device.c"
110const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
105 111
106#elif IF_solaris 112#elif IF_solaris
113# define IF_istun 1
107# include "tincd/solaris/device.c" 114# include "tincd/solaris/device.c"
115const char * tap_device::if_up () { return ""; }
108 116
109#elif IF_cygwin 117#elif IF_cygwin
110# include "tincd/cygwin/device.c" 118# include "tincd/cygwin/device.c"
119const char * tap_device::if_up () { return ""; }
111 120
112#elif IF_mingw 121#elif IF_mingw
113# include "tincd/mingw/device.c" 122# include "tincd/mingw/device.c"
123const char * tap_device::if_up () { return ""; }
114 124
115#elif IF_darwin 125#elif IF_darwin
116#define IF_istun 1 126# define IF_istun 1
117# include "tincd/darwin/device.c" 127# include "tincd/darwin/device.c"
128const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
118 129
119#elif IF_raw_socket 130#elif IF_raw_socket
120#define IF_istun 1
121# include "tincd/raw_socket/device.c" 131# include "tincd/raw_socket/device.c"
132const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
133
134#elif IF_uml_socket
135# include "tincd/uml_socket/device.c"
136const char * tap_device::if_up () { return 0; }
122 137
123#else 138#else
124# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 139# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
125#endif 140#endif
126 141
… …
136 151
137tap_device::tap_device () 152tap_device::tap_device ()
138{ 153{
139 device = "(null)"; 154 device = "(null)";
140 155
141 if (setup_device ()) 156 bool ok = setup_device ();
157
158 if (device_info)
159 device = device_info;
160
161 if (ok)
142 { 162 {
143 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 163 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
144 fd = device_fd; 164 fd = device_fd;
145 strcpy (ifrname, iface); 165 strcpy (ifrname, iface);
146 } 166 }
147 else 167 else
148 { 168 {
149 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device); 169 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device);
150 exit (1); 170 exit (EXIT_FAILURE);
151 } 171 }
152} 172}
153 173
154tap_device::~tap_device () 174tap_device::~tap_device ()
155{ 175{
… …
162 tap_packet *pkt = new tap_packet; 182 tap_packet *pkt = new tap_packet;
163 183
164 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 184 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
165 { 185 {
166 delete pkt; 186 delete pkt;
167 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 187 slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
168 strerror (errno)); 188 strerror (errno));
169 return 0; 189 return 0;
170 } 190 }
171 191
172#if IF_istun 192#if IF_istun
… …
190 if ( 210 if (
191#if IF_istun 211#if IF_istun
192 ether_emu.tap_to_tun (pkt) && 212 ether_emu.tap_to_tun (pkt) &&
193#endif 213#endif
194 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 214 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
195 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 215 slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
196 strerror (errno)); 216 strerror (errno));
197} 217}
198 218
199 219

Diff Legend

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