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.1 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.5 by pcg, Thu Oct 16 13:37:10 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
39/* make the tincd sources feel comfortable in our environment. */
40/* this was reasonably easy to do. */
32#define routing_mode 1 41#define routing_mode 1
33#define RMODE_ROUTER 0 42#define RMODE_ROUTER 0
34 43
35/* need iso c-90 or ugly workaround :( */ 44#define LOG_TO_L(level) \
36#define logger(level, ...) slog ( \
37 (level) == LOG_ERR ? L_ERR \ 45 (level) == LOG_ERR ? L_ERR \
38 : (level) == LOG_DEBUG ? L_DEBUG \ 46 : (level) == LOG_DEBUG ? L_DEBUG \
39 : (level) == LOG_WARNING ? L_WARN \ 47 : (level) == LOG_WARNING ? L_WARN \
40 : (level) == LOG_INFO ? L_INFO \ 48 : (level) == LOG_INFO ? L_INFO \
41 : L_NOTICE, __VA_ARGS__) 49 : L_NOTICE
50
51#if __STDC_VERSION__ > 199900
52# define logger(level, ...) slog (LOG_TO_L(level), __VA_ARGS__)
53#elif __GNUC__
54# define logger(level, args...) slog (LOG_TO_L(level), ## args)
55#else
56# error either need ISO-C 99 compliant compiler or gcc.
57#endif
42 58
43#define ifdebug(subsys) if (0) 59#define ifdebug(subsys) if (0)
44 60
45#define cp() 61#define cp()
46#define lookup_config(config_tree,key) (key) 62#define lookup_config(config_tree,key) (key)
… …
78#if IF_linux 94#if IF_linux
79# include "tincd/linux/device.c" 95# include "tincd/linux/device.c"
80#elif IF_freebsd 96#elif IF_freebsd
81# include "tincd/freebsd/device.c" 97# include "tincd/freebsd/device.c"
82#elif IF_netbsd 98#elif IF_netbsd
99#define IF_istun 1
83# include "tincd/netbsd/device.c" 100# include "tincd/netbsd/device.c"
84#elif IF_solaris 101#elif IF_solaris
85# include "tincd/solaris/device.c" 102# include "tincd/solaris/device.c"
86#elif IF_cygwin 103#elif IF_cygwin
87# include "tincd/cygwin/device.c" 104# include "tincd/cygwin/device.c"
88#elif IF_mingw 105#elif IF_mingw
89# include "tincd/mingw/device.c" 106# include "tincd/mingw/device.c"
90#elif IF_darwin 107#elif IF_darwin
108#define IF_istun 1
91# include "tincd/darwin/device.c" 109# include "tincd/darwin/device.c"
92#elif IF_raw_socket 110#elif IF_raw_socket
111#define IF_istun 1
93# include "tincd/raw_socket/device.c" 112# include "tincd/raw_socket/device.c"
94#else 113#else
95# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 114# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
115#endif
116
117#if IF_istun
118# include "ether_emu.C"
96#endif 119#endif
97 120
98const char * 121const char *
99tap_device::info () 122tap_device::info ()
100{ 123{
… …
134 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 157 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE,
135 strerror (errno)); 158 strerror (errno));
136 return 0; 159 return 0;
137 } 160 }
138 161
162#if IF_istun
163 // assume ipv4
164 (*pkt)[12] = 0x08;
165 (*pkt)[13] = 0x00;
166
167 if (!ether_emu.tun_to_tap (pkt))
168 {
169 delete pkt;
170 return 0;
171 }
172#endif
173
139 return pkt; 174 return pkt;
140} 175}
141 176
142void 177void
143tap_device::send (tap_packet *pkt) 178tap_device::send (tap_packet *pkt)
144{ 179{
180 if (
181#if IF_istun
182 ether_emu.tap_to_tun (pkt) &&
183#endif
145 if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 184 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
146 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 185 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
147 strerror (errno)); 186 strerror (errno));
148} 187}
149 188
150 189

Diff Legend

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