ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/device-linux.C
(Generate patch)

Comparing gvpe/src/device-linux.C (file contents):
Revision 1.3 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.9 by pcg, Thu Mar 3 16:54:34 2005 UTC

1/* 1/*
2 device-linux.C -- Interaction with Linux tun/tap device 2 device-linux.C -- Interaction with Linux tun/tap device
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 8 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 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your option) any later version.
8 11
9 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 15 GNU General Public License for more details.
13 16
14 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20 23
… …
41 44
42#include "gettext.h" 45#include "gettext.h"
43 46
44#include "conf.h" 47#include "conf.h"
45 48
49#if TEST_ETHEREMU
50# define IF_istun
51# include "ether_emu.C"
52#endif
53
46const char * 54const char *
47tap_device::info () 55tap_device::info ()
48{ 56{
49 return _("Linux tun/tap device"); 57 return _("Linux tun/tap device");
50} 58}
… …
58 fd = open (device, O_RDWR); 66 fd = open (device, O_RDWR);
59 67
60 if (fd < 0) 68 if (fd < 0)
61 { 69 {
62 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno)); 70 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno));
63 exit (1); 71 exit (EXIT_FAILURE);
64 } 72 }
65 73
66 memset (&ifr, 0, sizeof (ifr)); 74 memset (&ifr, 0, sizeof (ifr));
75#if TEST_ETHEREMU
76 ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
77#else
67 ifr.ifr_flags = IFF_TAP | IFF_NO_PI; 78 ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
79#endif
68 80
69 if (conf.ifname) 81 if (conf.ifname)
70 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ); 82 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ);
71 else 83 else
72 ifr.ifr_name[0] = 0; 84 ifr.ifr_name[0] = 0;
… …
77 ifrname [IFNAMSIZ] = 0; 89 ifrname [IFNAMSIZ] = 0;
78 } 90 }
79 else 91 else
80 { 92 {
81 slog (L_CRIT, _("unable to configure tun/tap interface: %s"), strerror (errno)); 93 slog (L_CRIT, _("unable to configure tun/tap interface: %s"), strerror (errno));
82 exit (1); 94 exit (EXIT_FAILURE);
83 } 95 }
84 96
85 if (ioctl (fd, TUNSETPERSIST, conf.ifpersist ? 1 : 0)) 97 if (ioctl (fd, TUNSETPERSIST, conf.ifpersist ? 1 : 0))
86 slog (L_WARN, _("cannot set persistency mode for device %s: %s"), ifrname, strerror (errno)); 98 slog (L_WARN, _("cannot set persistency mode for device %s: %s"), ifrname, strerror (errno));
87 99
… …
96tap_packet * 108tap_packet *
97tap_device::recv () 109tap_device::recv ()
98{ 110{
99 tap_packet *pkt = new tap_packet; 111 tap_packet *pkt = new tap_packet;
100 112
113#if TEST_ETHEREMU
114 pkt->len = read (fd, &((*pkt)[14]), MAX_MTU - 14);
115#else
101 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU); 116 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU);
117#endif
102 118
103 if (pkt->len <= 0) 119 if (pkt->len <= 0)
104 { 120 {
105 delete pkt; 121 delete pkt;
106 slog (L_ERR, _("error while reading from %s %s: %s"), 122 slog (L_ERR, _("error while reading from %s %s: %s"),
107 info (), DEFAULT_DEVICE, strerror (errno)); 123 info (), DEFAULT_DEVICE, strerror (errno));
108 return 0; 124 return 0;
109 } 125 }
110 126
127#if TEST_ETHEREMU
128 pkt->len += 14;
129
130 // assume ipv4
131 (*pkt)[12] = 0x08;
132 (*pkt)[13] = 0x00;
133
134 if (!ether_emu.tun_to_tap (pkt))
135 {
136 delete pkt;
137 return 0;
138 }
139#endif
140
111 return pkt; 141 return pkt;
112} 142}
113 143
114void 144void
115tap_device::send (tap_packet *pkt) 145tap_device::send (tap_packet *pkt)
116{ 146{
147#if TEST_ETHEREMU
148 if (ether_emu.tap_to_tun (pkt) &&
149 write (fd, &((*pkt)[14]), pkt->len - 14) < 0)
150#else
117 if (write (fd, &((*pkt)[0]), pkt->len) < 0) 151 if (write (fd, &((*pkt)[0]), pkt->len) < 0)
152#endif
118 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 153 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
119 strerror (errno)); 154 strerror (errno));
120} 155}
121 156

Diff Legend

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