projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for prefixlengths of 32 (IPv4) and 128 (IPv6) bits.
[tinc]
/
src
/
solaris
/
device.c
diff --git
a/src/solaris/device.c
b/src/solaris/device.c
index
5aacf3e
..
c72662b
100644
(file)
--- a/
src/solaris/device.c
+++ b/
src/solaris/device.c
@@
-1,7
+1,7
@@
/*
device.c -- Interaction with Solaris tun device
/*
device.c -- Interaction with Solaris tun device
- Copyright (C) 2001-2002 Ivo Timmermans <i
timmermans@bigfoot.com
>,
- 2001-2002 Guus Sliepen <guus@sliepen.
warande.net
>
+ Copyright (C) 2001-2002 Ivo Timmermans <i
vo@o2w.nl
>,
+ 2001-2002 Guus Sliepen <guus@sliepen.
eu.org
>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,13
+17,14
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: device.c,v 1.1.2.
5 2002/02/11 12:33:01
guus Exp $
+ $Id: device.c,v 1.1.2.
8 2002/06/21 10:11:37
guus Exp $
*/
#include "config.h"
#include <stdio.h>
*/
#include "config.h"
#include <stdio.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-71,7
+72,7
@@
cp
cp
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
{
cp
if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0)
{
- syslog(LOG_ERR, _("Could not open %s: %
m"), device
);
+ syslog(LOG_ERR, _("Could not open %s: %
s"), device, strerror(errno)
);
return -1;
}
cp
return -1;
}
cp
@@
-82,39
+83,39
@@
cp
ppa = atoi(ptr);
if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
ppa = atoi(ptr);
if( (ip_fd = open("/dev/ip", O_RDWR, 0)) < 0){
- syslog(LOG_ERR, _("Could not open /dev/ip: %
m"
));
+ syslog(LOG_ERR, _("Could not open /dev/ip: %
s"), strerror(errno
));
return -1;
}
/* Assign a new PPA and get its unit number. */
if( (ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0){
return -1;
}
/* Assign a new PPA and get its unit number. */
if( (ppa = ioctl(device_fd, TUNNEWPPA, ppa)) < 0){
- syslog(LOG_ERR, _("Can't assign new interface: %
m"
));
+ syslog(LOG_ERR, _("Can't assign new interface: %
s"), strerror(errno
));
return -1;
}
if( (if_fd = open(device, O_RDWR, 0)) < 0){
return -1;
}
if( (if_fd = open(device, O_RDWR, 0)) < 0){
- syslog(LOG_ERR, _("Could not open %s twice: %
m"), device
);
+ syslog(LOG_ERR, _("Could not open %s twice: %
s"), device, strerror(errno)
);
return -1;
}
if(ioctl(if_fd, I_PUSH, "ip") < 0){
return -1;
}
if(ioctl(if_fd, I_PUSH, "ip") < 0){
- syslog(LOG_ERR, _("Can't push IP module: %
m"
));
+ syslog(LOG_ERR, _("Can't push IP module: %
s"), strerror(errno
));
return -1;
}
/* Assign ppa according to the unit number returned by tun device */
if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
return -1;
}
/* Assign ppa according to the unit number returned by tun device */
if(ioctl(if_fd, IF_UNITSEL, (char *)&ppa) < 0){
- syslog(LOG_ERR, _("Can't set PPA %d: %
m"), ppa
);
+ syslog(LOG_ERR, _("Can't set PPA %d: %
s"), ppa, strerror(errno)
);
return -1;
}
if(ioctl(ip_fd, I_LINK, if_fd) < 0){
return -1;
}
if(ioctl(ip_fd, I_LINK, if_fd) < 0){
- syslog(LOG_ERR, _("Can't link TUN device to IP: %
m"
));
+ syslog(LOG_ERR, _("Can't link TUN device to IP: %
s"), strerror(errno
));
return -1;
}
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
return -1;
}
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
- asprintf(interface, "tun%d", ppa);
+ asprintf(
&
interface, "tun%d", ppa);
device_info = _("Solaris tun device");
device_info = _("Solaris tun device");
@@
-145,7
+146,7
@@
int read_packet(vpn_packet_t *packet)
cp
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0)
{
cp
if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0)
{
- syslog(LOG_ERR, _("Error while reading from %s %s: %
m"), device_info, device
);
+ syslog(LOG_ERR, _("Error while reading from %s %s: %
s"), device_info, device, strerror(errno)
);
return -1;
}
return -1;
}
@@
-176,7
+177,7
@@
cp
if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
{
if(write(device_fd, packet->data + 14, packet->len - 14) < 0)
{
- syslog(LOG_ERR, _("Can't write to %s %s: %
m"), device_info, packet->len
);
+ syslog(LOG_ERR, _("Can't write to %s %s: %
s"), device_info, packet->len, strerror(errno)
);
return -1;
}
return -1;
}