diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:30:27 +0200 |
commit | c70135d8ed31d133f2fb085bee01db8ad26d7fec (patch) | |
tree | 6b1edab6b87bd4c0d5b4aeca747232e524d28b36 /forward.c | |
parent | Added win/build_exe.py script, which is similar to (diff) | |
parent | Fixed client hang when server don't PUSH (aka the NO_SOUP_FOR_YOU patch) (diff) | |
download | openvpn-c70135d8ed31d133f2fb085bee01db8ad26d7fec.tar.xz |
Merge branch 'bugfix2.1' into beta2.2
Conflicts:
openvpn.8
- New option descriped (--register-dns)
Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
Diffstat (limited to '')
-rw-r--r-- | forward.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -766,7 +766,7 @@ process_incoming_link (struct context *c) /* log incoming packet */ #ifdef LOG_RW - if (c->c2.log_rw) + if (c->c2.log_rw && c->c2.buf.len > 0) fprintf (stderr, "R"); #endif msg (D_LINK_RW, "%s READ [%d] from %s: %s", @@ -976,7 +976,7 @@ process_incoming_tun (struct context *c) c->c2.tun_read_bytes += c->c2.buf.len; #ifdef LOG_RW - if (c->c2.log_rw) + if (c->c2.log_rw && c->c2.buf.len > 0) fprintf (stderr, "r"); #endif |