projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autodetect $MAKE/gmake/make.
[tinc]
/
src
/
openbsd
/
device.c
diff --git
a/src/openbsd/device.c
b/src/openbsd/device.c
index
1fccd14
..
8468b19
100644
(file)
--- a/
src/openbsd/device.c
+++ b/
src/openbsd/device.c
@@
-17,12
+17,13
@@
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.
3 2002/02/10 21:57:54
guus Exp $
+ $Id: device.c,v 1.1.2.
5 2002/02/18 16:25:19
guus Exp $
*/
#include "config.h"
#include <stdio.h>
*/
#include "config.h"
#include <stdio.h>
+#include <errno.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/stat.h>
@@
-66,11
+67,11
@@
int setup_device(void)
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
device = DEFAULT_DEVICE;
if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
- interface =
netnam
e;
+ interface =
rindex(device, '/')?rindex(device, '/')+1:devic
e;
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
@@
-107,7
+108,7
@@
cp
if((lenin = readv(device_fd, vector, 2)) <= 0)
{
if((lenin = readv(device_fd, vector, 2)) <= 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;
}
@@
-145,7
+146,7
@@
cp
if(writev(device_fd, vector, 2) < 0)
{
if(writev(device_fd, vector, 2) < 0)
{
- syslog(LOG_ERR, _("Can't write to %s %s: %
m"), device_info, device
);
+ syslog(LOG_ERR, _("Can't write to %s %s: %
s"), device_info, device, strerror(errno)
);
return -1;
}
return -1;
}