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.11 by pcg, Thu Sep 30 12:46:16 2004 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 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
… …
60// will be casted to data_packet, due to structural similarity 67// will be casted to data_packet, due to structural similarity
61struct vpn_packet_t : net_packet { 68struct vpn_packet_t : net_packet {
62 u8 data[MAXSIZE]; 69 u8 data[MAXSIZE];
63}; 70};
64 71
65static tap_device *self;
66
67static bool overwrite_mac; 72static bool overwrite_mac;
68 73
69static bool 74static bool
70get_config_string(const char *key, char **res) 75get_config_string(const char *key, char **res)
71{ 76{
… …
84 89
85#define netname conf.ifname 90#define netname conf.ifname
86 91
87#if IF_linux 92#if IF_linux
88# include "tincd/linux/device.c" 93# include "tincd/linux/device.c"
94
89#elif IF_freebsd 95#elif IF_freebsd
90# include "tincd/freebsd/device.c" 96# include "tincd/freebsd/device.c"
97
91#elif IF_netbsd 98#elif IF_netbsd
99# define IF_istun 1
92# include "tincd/netbsd/device.c" 100# include "tincd/netbsd/device.c"
101
102#elif IF_openbsd
103# define IF_istun 1
104# include "tincd/openbsd/device.c"
105
93#elif IF_solaris 106#elif IF_solaris
107# define IF_istun 1
94# include "tincd/solaris/device.c" 108# include "tincd/solaris/device.c"
109
95#elif IF_cygwin 110#elif IF_cygwin
96# include "tincd/cygwin/device.c" 111# include "tincd/cygwin/device.c"
112
97#elif IF_mingw 113#elif IF_mingw
98# include "tincd/mingw/device.c" 114# include "tincd/mingw/device.c"
115
99#elif IF_darwin 116#elif IF_darwin
117# define IF_istun 1
100# include "tincd/darwin/device.c" 118# include "tincd/darwin/device.c"
119
101#elif IF_raw_socket 120#elif IF_raw_socket
121# define IF_istun 1
102# include "tincd/raw_socket/device.c" 122# include "tincd/raw_socket/device.c"
123
103#else 124#else
104# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 125# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
105#endif 126#endif
106 127
128#if IF_istun
129# include "ether_emu.C"
130#endif
131
107const char * 132const char *
108tap_device::info () 133tap_device::info ()
109{ 134{
110 return _("tincd compatibility layer"); 135 return _("tincd compatibility layer");
111} 136}
112 137
113tap_device::tap_device () 138tap_device::tap_device ()
114{ 139{
115 self = this; 140 device = "(null)";
116 141
117 if (setup_device ()) 142 if (setup_device ())
118 { 143 {
119 //slog (L_DEBUG, _("%s is a %s"), device, info ()); 144 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
120 fd = device_fd; 145 fd = device_fd;
121 strcpy (ifrname, iface); 146 strcpy (ifrname, iface);
122 } 147 }
123 else 148 else
124 { 149 {
125 slog (L_ERR, _("error while configuring tincd device (%s/%s)"), device, info ()); 150 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device);
126 exit (1); 151 exit (EXIT_FAILURE);
127 } 152 }
128} 153}
129 154
130tap_device::~tap_device () 155tap_device::~tap_device ()
131{ 156{
… …
143 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 168 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE,
144 strerror (errno)); 169 strerror (errno));
145 return 0; 170 return 0;
146 } 171 }
147 172
173#if IF_istun
174 // assume ipv4
175 (*pkt)[12] = 0x08;
176 (*pkt)[13] = 0x00;
177
178 if (!ether_emu.tun_to_tap (pkt))
179 {
180 delete pkt;
181 return 0;
182 }
183#endif
184
148 return pkt; 185 return pkt;
149} 186}
150 187
151void 188void
152tap_device::send (tap_packet *pkt) 189tap_device::send (tap_packet *pkt)
153{ 190{
191 if (
192#if IF_istun
193 ether_emu.tap_to_tun (pkt) &&
194#endif
154 if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 195 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
155 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 196 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
156 strerror (errno)); 197 strerror (errno));
157} 198}
158 199
159 200

Diff Legend

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