j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Make it work correctly with NetBSD tun device.

Browse source
This commit is contained in:
Guus Sliepen 2002-06-05 00:20:40 +00:00
parent 4856d8e1f8
commit 5886b6a10d
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/netbsd/device.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: device.c,v 1.1.2.2 2002/02/18 16:25:19 guus Exp $ $Id: device.c,v 1.1.2.3 2002/06/05 00:20:40 guus Exp $
*/ */
#include "config.h" #include "config.h"
@ -102,11 +102,9 @@ cp
int read_packet(vpn_packet_t *packet) int read_packet(vpn_packet_t *packet)
{ {
int lenin; int lenin;
u_int32_t type;
struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
cp cp
if((lenin = readv(device_fd, vector, 2)) <= 0) if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0)
{ {
syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno)); syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info, device, strerror(errno));
return -1; return -1;
@ -117,7 +115,7 @@ cp
packet->data[12] = 0x08; packet->data[12] = 0x08;
packet->data[13] = 0x00; packet->data[13] = 0x00;
packet->len = lenin + 10; packet->len = lenin + 14;
device_total_in += packet->len; device_total_in += packet->len;
@ -132,19 +130,12 @@ cp
int write_packet(vpn_packet_t *packet) int write_packet(vpn_packet_t *packet)
{ {
u_int32_t type = htonl(AF_INET);
struct iovec vector[2];
cp cp
if(debug_lvl >= DEBUG_TRAFFIC) if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"), syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info); packet->len, device_info);
vector[0].iov_base = &type; if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
vector[0].iov_len = sizeof(type);
vector[1].iov_base = packet->data + 14;
vector[1].iov_len = packet->len - 14;
if(writev(device_fd, vector, 2) < 0)
{ {
syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno)); syslog(LOG_ERR, _("Can't write to %s %s: %s"), device_info, device, strerror(errno));
return -1; return -1;