projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use inttypes.h instead of stdint.h.
[tinc]
/
src
/
netbsd
/
device.c
diff --git
a/src/netbsd/device.c
b/src/netbsd/device.c
index
ed8cb4e
..
43dfed4
100644
(file)
--- a/
src/netbsd/device.c
+++ b/
src/netbsd/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.
1 2002/02/12 14:40:12
guus Exp $
+ $Id: device.c,v 1.1.2.
3 2002/06/05 00:20:40
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>
@@
-70,7
+71,7
@@
int setup_device(void)
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
@@
-101,13
+102,11
@@
cp
int read_packet(vpn_packet_t *packet)
{
int lenin;
int read_packet(vpn_packet_t *packet)
{
int lenin;
- u_int32_t type;
- struct iovec vector[2] = {{&type, sizeof(type)}, {packet->data + 14, MTU - 14}};
cp
cp
- if((lenin = read
v(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: %
m"), device_info, device
);
+ syslog(LOG_ERR, _("Error while reading from %s %s: %
s"), device_info, device, strerror(errno)
);
return -1;
}
return -1;
}
@@
-116,7
+115,7
@@
cp
packet->data[12] = 0x08;
packet->data[13] = 0x00;
packet->data[12] = 0x08;
packet->data[13] = 0x00;
- packet->len = lenin + 1
0
;
+ packet->len = lenin + 1
4
;
device_total_in += packet->len;
device_total_in += packet->len;
@@
-131,21
+130,14
@@
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
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
cp
if(debug_lvl >= DEBUG_TRAFFIC)
syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
packet->len, device_info);
- vector[0].iov_base = &type;
- 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)
+ if(write(device_fd, packet->data + 14, packet->len - 14) < 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;
}