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

Diff Legend

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