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.2 by pcg, Tue Oct 14 03:59:32 2003 UTC vs.
Revision 1.6 by pcg, Thu Oct 16 13:37:52 2003 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 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
27#include <syslog.h> 28#include <syslog.h>
28#include <fcntl.h> 29#include <fcntl.h>
29 30
30#include "conf.h" 31#include "conf.h"
31 32
33// following headers used by cygwin (maybe others)
34#include "netcompat.h"
35#include <signal.h>
36
37#define xstrdup(strd) strdup(str)
38
32/* make the tincd sources feel comfortable in our environment. */ 39/* make the tincd sources feel comfortable in our environment. */
33/* this was reasonably easy to do. */ 40/* this was reasonably easy to do. */
34#define routing_mode 1 41#define routing_mode 1
35#define RMODE_ROUTER 0 42#define RMODE_ROUTER 0
36 43
… …
84 91
85#define netname conf.ifname 92#define netname conf.ifname
86 93
87#if IF_linux 94#if IF_linux
88# include "tincd/linux/device.c" 95# include "tincd/linux/device.c"
96
89#elif IF_freebsd 97#elif IF_freebsd
90# include "tincd/freebsd/device.c" 98# include "tincd/freebsd/device.c"
99
91#elif IF_netbsd 100#elif IF_netbsd
101#define IF_istun 1
92# include "tincd/netbsd/device.c" 102# include "tincd/netbsd/device.c"
103
104#elif IF_openbsd
105#define IF_istun 1
106# include "tincd/openbsd/device.c"
107
93#elif IF_solaris 108#elif IF_solaris
94# include "tincd/solaris/device.c" 109# include "tincd/solaris/device.c"
110
95#elif IF_cygwin 111#elif IF_cygwin
96# include "tincd/cygwin/device.c" 112# include "tincd/cygwin/device.c"
113
97#elif IF_mingw 114#elif IF_mingw
98# include "tincd/mingw/device.c" 115# include "tincd/mingw/device.c"
116
99#elif IF_darwin 117#elif IF_darwin
118#define IF_istun 1
100# include "tincd/darwin/device.c" 119# include "tincd/darwin/device.c"
120
101#elif IF_raw_socket 121#elif IF_raw_socket
122#define IF_istun 1
102# include "tincd/raw_socket/device.c" 123# include "tincd/raw_socket/device.c"
124
103#else 125#else
104# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 126# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
127#endif
128
129#if IF_istun
130# include "ether_emu.C"
105#endif 131#endif
106 132
107const char * 133const char *
108tap_device::info () 134tap_device::info ()
109{ 135{
… …
143 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 169 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE,
144 strerror (errno)); 170 strerror (errno));
145 return 0; 171 return 0;
146 } 172 }
147 173
174#if IF_istun
175 // assume ipv4
176 (*pkt)[12] = 0x08;
177 (*pkt)[13] = 0x00;
178
179 if (!ether_emu.tun_to_tap (pkt))
180 {
181 delete pkt;
182 return 0;
183 }
184#endif
185
148 return pkt; 186 return pkt;
149} 187}
150 188
151void 189void
152tap_device::send (tap_packet *pkt) 190tap_device::send (tap_packet *pkt)
153{ 191{
192 if (
193#if IF_istun
194 ether_emu.tap_to_tun (pkt) &&
195#endif
154 if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 196 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
155 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 197 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
156 strerror (errno)); 198 strerror (errno));
157} 199}
158 200
159 201

Diff Legend

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