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.8 by pcg, Thu Jan 29 18:55:10 2004 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-2004 Marc Lehmann <pcg@goof.com>
3 4
4 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
5 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
6 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
41 42
42#include "gettext.h" 43#include "gettext.h"
43 44
44#include "conf.h" 45#include "conf.h"
45 46
47#if TEST_ETHEREMU
48# define IF_istun
49# include "ether_emu.C"
50#endif
51
46const char * 52const char *
47tap_device::info () 53tap_device::info ()
48{ 54{
49 return _("Linux tun/tap device"); 55 return _("Linux tun/tap device");
50} 56}
… …
58 fd = open (device, O_RDWR); 64 fd = open (device, O_RDWR);
59 65
60 if (fd < 0) 66 if (fd < 0)
61 { 67 {
62 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno)); 68 slog (L_ERR, _("could not open device %s: %s"), device, strerror (errno));
63 exit (1); 69 exit (EXIT_FAILURE);
64 } 70 }
65 71
66 memset (&ifr, 0, sizeof (ifr)); 72 memset (&ifr, 0, sizeof (ifr));
73#if TEST_ETHEREMU
74 ifr.ifr_flags = IFF_TUN | IFF_NO_PI;
75#else
67 ifr.ifr_flags = IFF_TAP | IFF_NO_PI; 76 ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
77#endif
68 78
69 if (conf.ifname) 79 if (conf.ifname)
70 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ); 80 strncpy (ifr.ifr_name, conf.ifname, IFNAMSIZ);
71 else 81 else
72 ifr.ifr_name[0] = 0; 82 ifr.ifr_name[0] = 0;
… …
77 ifrname [IFNAMSIZ] = 0; 87 ifrname [IFNAMSIZ] = 0;
78 } 88 }
79 else 89 else
80 { 90 {
81 slog (L_CRIT, _("unable to configure tun/tap interface: %s"), strerror (errno)); 91 slog (L_CRIT, _("unable to configure tun/tap interface: %s"), strerror (errno));
82 exit (1); 92 exit (EXIT_FAILURE);
83 } 93 }
84 94
85 if (ioctl (fd, TUNSETPERSIST, conf.ifpersist ? 1 : 0)) 95 if (ioctl (fd, TUNSETPERSIST, conf.ifpersist ? 1 : 0))
86 slog (L_WARN, _("cannot set persistency mode for device %s: %s"), ifrname, strerror (errno)); 96 slog (L_WARN, _("cannot set persistency mode for device %s: %s"), ifrname, strerror (errno));
87 97
… …
96tap_packet * 106tap_packet *
97tap_device::recv () 107tap_device::recv ()
98{ 108{
99 tap_packet *pkt = new tap_packet; 109 tap_packet *pkt = new tap_packet;
100 110
111#if TEST_ETHEREMU
112 pkt->len = read (fd, &((*pkt)[14]), MAX_MTU - 14);
113#else
101 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU); 114 pkt->len = read (fd, &((*pkt)[0]), MAX_MTU);
115#endif
102 116
103 if (pkt->len <= 0) 117 if (pkt->len <= 0)
104 { 118 {
105 delete pkt; 119 delete pkt;
106 slog (L_ERR, _("error while reading from %s %s: %s"), 120 slog (L_ERR, _("error while reading from %s %s: %s"),
107 info (), DEFAULT_DEVICE, strerror (errno)); 121 info (), DEFAULT_DEVICE, strerror (errno));
108 return 0; 122 return 0;
109 } 123 }
110 124
125#if TEST_ETHEREMU
126 pkt->len += 14;
127
128 // assume ipv4
129 (*pkt)[12] = 0x08;
130 (*pkt)[13] = 0x00;
131
132 if (!ether_emu.tun_to_tap (pkt))
133 {
134 delete pkt;
135 return 0;
136 }
137#endif
138
111 return pkt; 139 return pkt;
112} 140}
113 141
114void 142void
115tap_device::send (tap_packet *pkt) 143tap_device::send (tap_packet *pkt)
116{ 144{
145#if TEST_ETHEREMU
146 if (ether_emu.tap_to_tun (pkt) &&
147 write (fd, &((*pkt)[14]), pkt->len - 14) < 0)
148#else
117 if (write (fd, &((*pkt)[0]), pkt->len) < 0) 149 if (write (fd, &((*pkt)[0]), pkt->len) < 0)
150#endif
118 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE, 151 slog (L_ERR, _("can't write to %s %s: %s"), info (), DEFAULT_DEVICE,
119 strerror (errno)); 152 strerror (errno));
120} 153}
121 154

Diff Legend

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