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.19 by pcg, Tue Apr 26 00:55:56 2005 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include <cstdio> 22#include <cstdio>
23#include <cstring> 23#include <cstring>
24#include <cerrno> 24#include <cerrno>
… …
61#define ifdebug(subsys) if (0) 61#define ifdebug(subsys) if (0)
62 62
63#define cp() 63#define cp()
64#define lookup_config(config_tree,key) (key) 64#define lookup_config(config_tree,key) (key)
65 65
66#define MTU MAXSIZE 66#define MTU MAX_MTU
67 67
68// BIGGEST hack of 'em all 68// BIGGEST hack of 'em all
69// will be casted to data_packet, due to structural similarity 69// will be casted to data_packet, due to structural similarity
70struct vpn_packet_t : net_packet { 70struct vpn_packet_t : net_packet {
71 u8 data[MAXSIZE]; 71 u8 data[MAXSIZE];
… …
78{ 78{
79 if (!strcmp (key, "Interface")) 79 if (!strcmp (key, "Interface"))
80 *res = conf.ifname; 80 *res = conf.ifname;
81 else if (!strcmp (key, "Device")) 81 else if (!strcmp (key, "Device"))
82 *res = 0; 82 *res = 0;
83 else if (!strcmp (key, "DeviceType"))
84 *res = "tap";
83 else 85 else
84 { 86 {
85 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key); 87 slog (L_ERR, _("tincd layer asking for unknown config '%s'"), key);
86 *res = 0; 88 *res = 0;
87 } 89 }
… …
91 93
92#define netname conf.ifname 94#define netname conf.ifname
93 95
94#if IF_linux 96#if IF_linux
95# 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"; }
96 103
97#elif IF_freebsd 104#elif IF_freebsd
98# 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"; }
99 107
100#elif IF_netbsd 108#elif IF_netbsd
101# define IF_istun 1 109# define IF_istun 1
102# include "tincd/netbsd/device.c" 110# include "tincd/netbsd/device.c"
111const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
103 112
104#elif IF_openbsd 113#elif IF_openbsd
105# define IF_istun 1 114# define IF_istun 1
106# include "tincd/openbsd/device.c" 115# include "tincd/openbsd/device.c"
116const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU"; }
107 117
108#elif IF_solaris 118#elif IF_solaris
109# define IF_istun 1 119# define IF_istun 1
110# include "tincd/solaris/device.c" 120# include "tincd/solaris/device.c"
121const char * tap_device::if_up () { return ""; }
111 122
112#elif IF_cygwin 123#elif IF_cygwin
113# include "tincd/cygwin/device.c" 124# include "tincd/cygwin/device.c"
125const char * tap_device::if_up () { return ""; }
114 126
115#elif IF_mingw 127#elif IF_mingw
116# include "tincd/mingw/device.c" 128# include "tincd/mingw/device.c"
129const char * tap_device::if_up () { return ""; }
117 130
118#elif IF_darwin 131#elif IF_darwin
119# define IF_istun 1 132# define IF_istun 1
120# 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"; }
121 135
122#elif IF_raw_socket 136#elif IF_raw_socket
123# define IF_istun 1
124# 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; }
125 143
126#else 144#else
127# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 145# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
128#endif 146#endif
129 147
… …
139 157
140tap_device::tap_device () 158tap_device::tap_device ()
141{ 159{
142 device = "(null)"; 160 device = "(null)";
143 161
144 if (setup_device ()) 162 bool ok = setup_device ();
163
164 if (device_info)
165 device = device_info;
166
167 if (ok)
145 { 168 {
146 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 169 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
147 fd = device_fd; 170 fd = device_fd;
148 strcpy (ifrname, iface); 171 strcpy (ifrname, iface);
149 } 172 }
… …
165 tap_packet *pkt = new tap_packet; 188 tap_packet *pkt = new tap_packet;
166 189
167 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 190 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
168 { 191 {
169 delete pkt; 192 delete pkt;
170 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,
171 strerror (errno)); 194 strerror (errno));
172 return 0; 195 return 0;
173 } 196 }
174 197
175#if IF_istun 198#if IF_istun
… …
193 if ( 216 if (
194#if IF_istun 217#if IF_istun
195 ether_emu.tap_to_tun (pkt) && 218 ether_emu.tap_to_tun (pkt) &&
196#endif 219#endif
197 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 220 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
198 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,
199 strerror (errno)); 222 strerror (errno));
200} 223}
201 224
202 225

Diff Legend

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