projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix maskcmp() and maskcpy().
[tinc]
/
src
/
linux
/
device.c
diff --git
a/src/linux/device.c
b/src/linux/device.c
index
88355ca
..
450fcd1
100644
(file)
--- a/
src/linux/device.c
+++ b/
src/linux/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.
6 2002/02/11 12:33:01
guus Exp $
+ $Id: device.c,v 1.1.2.
7 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/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
@@
-85,7
+86,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
@@
-154,7
+155,7
@@
cp
{
if((lenin = read(device_fd, packet->data, MTU)) <= 0)
{
{
if((lenin = read(device_fd, packet->data, MTU)) <= 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;
}
@@
-164,7
+165,7
@@
cp
{
if((lenin = read(device_fd, packet->data - 2, MTU + 2)) <= 0)
{
{
if((lenin = read(device_fd, packet->data - 2, MTU + 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;
}
@@
-193,7
+194,7
@@
cp
{
if(write(device_fd, packet->data, packet->len) < 0)
{
{
if(write(device_fd, packet->data, packet->len) < 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;
}
}
@@
-202,7
+203,7
@@
cp
*(short int *)(packet->data - 2) = packet->len;
if(write(device_fd, packet->data - 2, packet->len + 2) < 0)
{
*(short int *)(packet->data - 2) = packet->len;
if(write(device_fd, packet->data - 2, packet->len + 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;
}
}