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.4 by pcg, Thu Oct 16 02:28:36 2003 UTC

… …
41 41
42#include "gettext.h" 42#include "gettext.h"
43 43
44#include "conf.h" 44#include "conf.h"
45 45
46#if TEST_ETHEREMU
47# include "ether_emu.C"
48#endif
49
46const char * 50const char *
47tap_device::info () 51tap_device::info ()
48{ 52{
49 return _("Linux tun/tap device"); 53 return _("Linux tun/tap device");
50} 54}
… …
62 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));
63 exit (1); 67 exit (1);
64 } 68 }
65 69
66 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
67 ifr.ifr_flags = IFF_TAP | IFF_NO_PI; 74 ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
75#endif
68 76
69 if (conf.ifname) 77 if (conf.ifname)
70 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ); 78 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ);
71 else 79 else
72 ifr.ifr_name[0] = 0; 80 ifr.ifr_name[0] = 0;
… …
96tap_packet * 104tap_packet *
97tap_device::recv () 105tap_device::recv ()
98{ 106{
99 tap_packet *pkt = new tap_packet; 107 tap_packet *pkt = new tap_packet;
100 108
109#if TEST_ETHEREMU
110 pkt->len = read (fd, &((*pkt)[14]), MAX_MTU - 14);
111#else
101 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU); 112 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU);
113#endif
102 114
103 if (pkt->len <= 0) 115 if (pkt->len <= 0)
104 { 116 {
105 delete pkt; 117 delete pkt;
106 slog (L_ERR, _("error while reading from %s %s: %s"), 118 slog (L_ERR, _("error while reading from %s %s: %s"),
107 info (), DEFAULT_DEVICE, strerror (errno)); 119 info (), DEFAULT_DEVICE, strerror (errno));
108 return 0; 120 return 0;
109 } 121 }
110 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
136
111 return pkt; 137 return pkt;
112} 138}
113 139
114void 140void
115tap_device::send (tap_packet *pkt) 141tap_device::send (tap_packet *pkt)
116{ 142{
143#if TEST_ETHEREMU
144 if (ether_emu.tap_to_tun (pkt) &&
145 write (fd, &((*pkt)[14]), pkt->len - 14) < 0)
146#else
117 if (write (fd, &((*pkt)[0]), pkt->len) < 0) 147 if (write (fd, &((*pkt)[0]), pkt->len) < 0)
148#endif
118 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,
119 strerror (errno)); 150 strerror (errno));
120} 151}
121 152

Diff Legend

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