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.12 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.16 by pcg, Fri Mar 25 13:56:25 2005 UTC

… …
61#define ifdebug(subsys) if (0) 61#define ifdebug(subsys) if (0)
62 62
63#define cp() 63#define cp()
64#define lookup_config(config_tree,key) (key) 64#define lookup_config(config_tree,key) (key)
65 65
66#define MTU MAXSIZE 66#define MTU MAX_MTU
67 67
68// BIGGEST hack of 'em all 68// BIGGEST hack of 'em all
69// will be casted to data_packet, due to structural similarity 69// will be casted to data_packet, due to structural similarity
70struct vpn_packet_t : net_packet { 70struct vpn_packet_t : net_packet {
71 u8 data[MAXSIZE]; 71 u8 data[MAXSIZE];
… …
91 91
92#define netname conf.ifname 92#define netname conf.ifname
93 93
94#if IF_linux 94#if IF_linux
95# include "tincd/linux/device.c" 95# include "tincd/linux/device.c"
96const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME hw ether $MAC mtu $MTU up"; }
96 97
97#elif IF_freebsd 98#elif IF_freebsd
98# include "tincd/freebsd/device.c" 99# include "tincd/freebsd/device.c"
100// 5.2.1' ifconfig _first_ sets the if up then changes mtu, which can be deadly due to ipv6 kicking in
101const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU && /sbin/ifconfig $IFNAME up"; }
99 102
100#elif IF_netbsd 103#elif IF_netbsd
101# define IF_istun 1 104# define IF_istun 1
102# include "tincd/netbsd/device.c" 105# include "tincd/netbsd/device.c"
106const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
103 107
104#elif IF_openbsd 108#elif IF_openbsd
105# define IF_istun 1 109# define IF_istun 1
106# include "tincd/openbsd/device.c" 110# include "tincd/openbsd/device.c"
111const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME mtu $MTU up"; }
107 112
108#elif IF_solaris 113#elif IF_solaris
109# define IF_istun 1 114# define IF_istun 1
110# include "tincd/solaris/device.c" 115# include "tincd/solaris/device.c"
116const char * tap_device::if_up () { return ""; }
111 117
112#elif IF_cygwin 118#elif IF_cygwin
113# include "tincd/cygwin/device.c" 119# include "tincd/cygwin/device.c"
120const char * tap_device::if_up () { return ""; }
114 121
115#elif IF_mingw 122#elif IF_mingw
116# include "tincd/mingw/device.c" 123# include "tincd/mingw/device.c"
124const char * tap_device::if_up () { return ""; }
117 125
118#elif IF_darwin 126#elif IF_darwin
119# define IF_istun 1 127# define IF_istun 1
120# include "tincd/darwin/device.c" 128# include "tincd/darwin/device.c"
129const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
121 130
122#elif IF_raw_socket 131#elif IF_raw_socket
123# define IF_istun 1
124# include "tincd/raw_socket/device.c" 132# include "tincd/raw_socket/device.c"
133const char * tap_device::if_up () { return "/sbin/ifconfig $IFNAME ether $MAC mtu $MTU up"; }
134
135#elif IF_uml_socket
136# include "tincd/uml_socket/device.c"
137const char * tap_device::if_up () { return 0; }
125 138
126#else 139#else
127# error No interface implementation for your IFTYPE/IFSUBTYPE combination. 140# error No interface implementation for your IFTYPE/IFSUBTYPE combination.
128#endif 141#endif
129 142
… …
139 152
140tap_device::tap_device () 153tap_device::tap_device ()
141{ 154{
142 device = "(null)"; 155 device = "(null)";
143 156
144 if (setup_device ()) 157 bool ok = setup_device ();
158
159 if (device_info)
160 device = device_info;
161
162 if (ok)
145 { 163 {
146 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device); 164 slog (L_DEBUG, _("interface %s on %s initialized"), info (), device);
147 fd = device_fd; 165 fd = device_fd;
148 strcpy (ifrname, iface); 166 strcpy (ifrname, iface);
149 } 167 }
… …
165 tap_packet *pkt = new tap_packet; 183 tap_packet *pkt = new tap_packet;
166 184
167 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 185 if (!read_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
168 { 186 {
169 delete pkt; 187 delete pkt;
170 slog (L_ERR, _("can't read from to %s %s: %s"), info (), DEFAULT_DEVICE, 188 slog (L_ERR, _("can't read from to %s %s: %s"), info (), device,
171 strerror (errno)); 189 strerror (errno));
172 return 0; 190 return 0;
173 } 191 }
174 192
175#if IF_istun 193#if IF_istun
… …
193 if ( 211 if (
194#if IF_istun 212#if IF_istun
195 ether_emu.tap_to_tun (pkt) && 213 ether_emu.tap_to_tun (pkt) &&
196#endif 214#endif
197 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt))) 215 !write_packet (reinterpret_cast<vpn_packet_t *>(pkt)))
198 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 216 slog (L_ERR, _("can't write to %s %s: %s"), info (), device,
199 strerror (errno)); 217 strerror (errno));
200} 218}
201 219
202 220

Diff Legend

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