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.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 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
107# define IF_istun 1
101# include "tincd/solaris/device.c" 108# include "tincd/solaris/device.c"
109
102#elif IF_cygwin 110#elif IF_cygwin
103# include "tincd/cygwin/device.c" 111# include "tincd/cygwin/device.c"
112
104#elif IF_mingw 113#elif IF_mingw
105# include "tincd/mingw/device.c" 114# include "tincd/mingw/device.c"
115
106#elif IF_darwin 116#elif IF_darwin
117# define IF_istun 1
107# include "tincd/darwin/device.c" 118# include "tincd/darwin/device.c"
119
108#elif IF_raw_socket 120#elif IF_raw_socket
121# define IF_istun 1
109# include "tincd/raw_socket/device.c" 122# include "tincd/raw_socket/device.c"
123
110#else 124#else
111# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 125# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
112#endif 126#endif
113 127
128#if IF_istun
129# include "ether_emu.C"
130#endif
131
114const char * 132const char *
115tap_device::info () 133tap_device::info ()
116{ 134{
117 return _("tincd compatibility layer"); 135 return _("tincd compatibility layer");
118} 136}
119 137
120tap_device::tap_device () 138tap_device::tap_device ()
121{ 139{
122 self = this; 140 device = "(null)";
123 141
124 if (setup_device ()) 142 if (setup_device ())
125 { 143 {
126 //slog (L_DEBUG, _("%s is a %s"), device, info ()); 144 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
127 fd = device_fd; 145 fd = device_fd;
128 strcpy (ifrname, iface); 146 strcpy (ifrname, iface);
129 } 147 }
130 else 148 else
131 { 149 {
132 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);
133 exit (1); 151 exit (EXIT_FAILURE);
134 } 152 }
135} 153}
136 154
137tap_device::~tap_device () 155tap_device::~tap_device ()
138{ 156{
… …
150 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,
151 strerror (errno)); 169 strerror (errno));
152 return 0; 170 return 0;
153 } 171 }
154 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
155 return pkt; 185 return pkt;
156} 186}
157 187
158void 188void
159tap_device::send (tap_packet *pkt) 189tap_device::send (tap_packet *pkt)
160{ 190{
191 if (
192#if IF_istun
193 ether_emu.tap_to_tun (pkt) &&
194#endif
161 if (!write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 195 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
162 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,
163 strerror (errno)); 197 strerror (errno));
164} 198}
165 199
166 200

Diff Legend

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