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.2 by pcg, Sat Mar 8 10:48:41 2003 UTC vs.
Revision 1.4 by pcg, Thu Oct 16 02:28:36 2003 UTC

… …
28#include <fcntl.h> 28#include <fcntl.h>
29#include <net/if.h> 29#include <net/if.h>
30#include <unistd.h> 30#include <unistd.h>
31#include <sys/ioctl.h> 31#include <sys/ioctl.h>
32 32
33#include <net/if.h>
34
33#ifdef LINUX_IF_TUN_H 35#ifdef LINUX_IF_TUN_H
34#include LINUX_IF_TUN_H 36# include LINUX_IF_TUN_H
35#else 37#else
36#include <linux/if_tun.h> 38#include <linux/if_tun.h>
37#endif 39#endif
38#define DEFAULT_DEVICE "/dev/net/tun" 40#define DEFAULT_DEVICE "/dev/net/tun"
39 41
40#include "gettext.h" 42#include "gettext.h"
41 43
42#include "conf.h" 44#include "conf.h"
45
46#if TEST_ETHEREMU
47# include "ether_emu.C"
48#endif
49
50const char *
51tap_device::info ()
52{
53 return _("Linux tun/tap device");
54}
43 55
44tap_device::tap_device () 56tap_device::tap_device ()
45{ 57{
46 struct ifreq ifr; 58 struct ifreq ifr;
47 59
… …
54 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno)); 66 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno));
55 exit (1); 67 exit (1);
56 } 68 }
57 69
58 memset (&ifr, 0, sizeof (ifr)); 70 memset (&ifr, 0, sizeof (ifr));
71#if TEST_ETHEREMU
72 ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
73#else
59 ifr.ifr_flags = IFF_TAP | IFF_NO_PI; 74 ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
75#endif
60 76
61 if (conf.ifname) 77 if (conf.ifname)
62 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ); 78 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ);
63 else 79 else
64 ifr.ifr_name[0] = 0; 80 ifr.ifr_name[0] = 0;
… …
88tap_packet * 104tap_packet *
89tap_device::recv () 105tap_device::recv ()
90{ 106{
91 tap_packet *pkt = new tap_packet; 107 tap_packet *pkt = new tap_packet;
92 108
109#if TEST_ETHEREMU
110 pkt->len = read (fd, &((*pkt)[14]), MAX_MTU - 14);
111#else
93 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU); 112 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU);
113#endif
94 114
95 if (pkt->len <= 0) 115 if (pkt->len <= 0)
96 { 116 {
117 delete pkt;
97 slog (L_ERR, _("error while reading from %s %s: %s"), 118 slog (L_ERR, _("error while reading from %s %s: %s"),
98 info (), DEFAULT_DEVICE, strerror (errno)); 119 info (), DEFAULT_DEVICE, strerror (errno));
99 free (pkt);
100 return 0; 120 return 0;
101 } 121 }
122
123#if TEST_ETHEREMU
124 pkt->len += 14;
125
126 // assume ipv4
127 (*pkt)[12] = 0x08;
128 (*pkt)[13] = 0x00;
129
130 if (!ether_emu.tun_to_tap (pkt))
131 {
132 delete pkt;
133 return 0;
134 }
135#endif
102 136
103 return pkt; 137 return pkt;
104} 138}
105 139
106void 140void
107tap_device::send (tap_packet *pkt) 141tap_device::send (tap_packet *pkt)
108{ 142{
143#if TEST_ETHEREMU
144 if (ether_emu.tap_to_tun (pkt) &&
145 write (fd, &((*pkt)[14]), pkt->len - 14) < 0)
146#else
109 if (write (fd, &((*pkt)[0]), pkt->len) < 0) 147 if (write (fd, &((*pkt)[0]), pkt->len) < 0)
148#endif
110 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 149 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
111 strerror (errno)); 150 strerror (errno));
112} 151}
113 152

Diff Legend

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