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.4 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.10 by pcg, Thu Jan 29 18:55:10 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 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
4 4
5 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
6 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
7 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 8 (at your option) any later version.
… …
67// will be casted to data_packet, due to structural similarity 67// will be casted to data_packet, due to structural similarity
68struct vpn_packet_t : net_packet { 68struct vpn_packet_t : net_packet {
69 u8 data[MAXSIZE]; 69 u8 data[MAXSIZE];
70}; 70};
71 71
72static tap_device *self;
73
74static bool overwrite_mac; 72static bool overwrite_mac;
75 73
76static bool 74static bool
77get_config_string(const char *key, char **res) 75get_config_string(const char *key, char **res)
78{ 76{
… …
91 89
92#define netname conf.ifname 90#define netname conf.ifname
93 91
94#if IF_linux 92#if IF_linux
95# include "tincd/linux/device.c" 93# include "tincd/linux/device.c"
94
96#elif IF_freebsd 95#elif IF_freebsd
97# include "tincd/freebsd/device.c" 96# include "tincd/freebsd/device.c"
97
98#elif IF_netbsd 98#elif IF_netbsd
99#define IF_istun 1
99# 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
100#elif IF_solaris 106#elif IF_solaris
101# include "tincd/solaris/device.c" 107# include "tincd/solaris/device.c"
108
102#elif IF_cygwin 109#elif IF_cygwin
103# include "tincd/cygwin/device.c" 110# include "tincd/cygwin/device.c"
111
104#elif IF_mingw 112#elif IF_mingw
105# include "tincd/mingw/device.c" 113# include "tincd/mingw/device.c"
114
106#elif IF_darwin 115#elif IF_darwin
116#define IF_istun 1
107# include "tincd/darwin/device.c" 117# include "tincd/darwin/device.c"
118
108#elif IF_raw_socket 119#elif IF_raw_socket
120#define IF_istun 1
109# include "tincd/raw_socket/device.c" 121# include "tincd/raw_socket/device.c"
122
110#else 123#else
111# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 124# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
125#endif
126
127#if IF_istun
128# include "ether_emu.C"
112#endif 129#endif
113 130
114const char * 131const char *
115tap_device::info () 132tap_device::info ()
116{ 133{
117 return _("tincd compatibility layer"); 134 return _("tincd compatibility layer");
118} 135}
119 136
120tap_device::tap_device () 137tap_device::tap_device ()
121{ 138{
122 self = this; 139 device = "(null)";
123 140
124 if (setup_device ()) 141 if (setup_device ())
125 { 142 {
126 //slog (L_DEBUG, _("%s is a %s"), device, info ()); 143 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
127 fd = device_fd; 144 fd = device_fd;
128 strcpy (ifrname, iface); 145 strcpy (ifrname, iface);
129 } 146 }
130 else 147 else
131 { 148 {
132 slog (L_ERR, _("error while configuring tincd device (%s/%s)"), device, info ()); 149 slog (L_ERR, _("error while configuring tincd device %s on %s"), info (), device);
133 exit (1); 150 exit (EXIT_FAILURE);
134 } 151 }
135} 152}
136 153
137tap_device::~tap_device () 154tap_device::~tap_device ()
138{ 155{
… …
150 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 167 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE,
151 strerror (errno)); 168 strerror (errno));
152 return 0; 169 return 0;
153 } 170 }
154 171
172#if IF_istun
173 // assume ipv4
174 (*pkt)[12] = 0x08;
175 (*pkt)[13] = 0x00;
176
177 if (!ether_emu.tun_to_tap (pkt))
178 {
179 delete pkt;
180 return 0;
181 }
182#endif
183
155 return pkt; 184 return pkt;
156} 185}
157 186
158void 187void
159tap_device::send (tap_packet *pkt) 188tap_device::send (tap_packet *pkt)
160{ 189{
190 if (
191#if IF_istun
192 ether_emu.tap_to_tun (pkt) &&
193#endif
161 if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 194 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
162 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 195 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
163 strerror (errno)); 196 strerror (errno));
164} 197}
165 198
166 199

Diff Legend

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