diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-06-02 15:45:11 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-06-02 15:45:11 +0200 |
| commit | ec2008e9e53b99ba1725d8398e21b9cb04f6b8ca (patch) | |
| tree | 8498bf1722b27ae47a5cec27c7f6cf5ecb868bb3 /openvpn/src/openvpn/tun.c | |
| parent | b84e3939a015b42c316af0b63297932e6fcf8ba4 (diff) | |
bring openvpn in sync with openvpn git master and patches submitted to mailing list
Diffstat (limited to 'openvpn/src/openvpn/tun.c')
| -rw-r--r-- | openvpn/src/openvpn/tun.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openvpn/src/openvpn/tun.c b/openvpn/src/openvpn/tun.c index 92ad001e..8057c16e 100644 --- a/openvpn/src/openvpn/tun.c +++ b/openvpn/src/openvpn/tun.c @@ -46,10 +46,10 @@ #include "manage.h" #include "route.h" #include "win32.h" + #include "memdbg.h" #include <string.h> - #ifdef WIN32 /* #define SIMULATE_DHCP_FAILED */ /* simulate bad DHCP negotiation */ @@ -1739,7 +1739,7 @@ read_tun (struct tuntap* tt, uint8_t *buf, int len) ret = readv(tt->fd, vect, 2); return(ret - sizeof(pi)); } - else + else return read (tt->fd, buf, len); } |