aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-19 07:50:13 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-19 07:50:13 +0000
commit7b0a8146c71e64f39256179208447807df00948b (patch)
tree6691e9c5d9cfc3bb09f9734c780826909ff53e33
parentMerged with Alon's tree @ r660 (diff)
downloadopenvpn-7b0a8146c71e64f39256179208447807df00948b.tar.xz
svn merge -r 670:672 $SO/trunk/openvpn
Brought up-to-date with 2.0.x branch. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@673 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r--ChangeLog5
-rw-r--r--errlevel.h2
-rw-r--r--forward.c10
-rw-r--r--multi.c5
4 files changed, 13 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index cc763c9..9ddddaf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@ $Id$
2005.10.xx -- Version 2.1-beta5
* More PKCS#11 additions/changes (Alon Bar-Lev).
+* Fixed double fork issue that occurs when --management-hold
+ is used.
+* Moved TUN/TAP read/write log messages from --verb 8 to 6.
+* Warn when multiple clients having the same common name or
+ username usurp each other when --duplicate-cn is not used.
2005.10.17 -- Version 2.1-beta4
diff --git a/errlevel.h b/errlevel.h
index 0bb9755..d34e602 100644
--- a/errlevel.h
+++ b/errlevel.h
@@ -104,6 +104,7 @@
#define D_LOG_RW LOGLEV(5, 0, 0) /* Print 'R' or 'W' to stdout for read/write */
#define D_LINK_RW LOGLEV(6, 60, M_DEBUG) /* show TCP/UDP reads/writes (terse) */
+#define D_TUN_RW LOGLEV(6, 60, M_DEBUG) /* show TUN/TAP reads/writes */
#define D_TAP_WIN32_DEBUG LOGLEV(6, 60, M_DEBUG) /* show TAP-Win32 driver debug info */
#define D_SHOW_KEYS LOGLEV(7, 70, M_DEBUG) /* show data channel encryption keys */
@@ -138,7 +139,6 @@
#define D_GREMLIN_VERBOSE LOGLEV(8, 70, M_DEBUG) /* show verbose info from gremlin module */
#define D_REL_DEBUG LOGLEV(8, 70, M_DEBUG) /* show detailed info from reliable routines */
#define D_EVENT_WAIT LOGLEV(8, 70, M_DEBUG) /* show detailed info from event waits */
-#define D_TUN_RW LOGLEV(8, 70, M_DEBUG) /* show TUN/TAP reads/writes */
#define D_MULTI_TCP LOGLEV(8, 70, M_DEBUG) /* show debug info from mtcp.c */
#define D_TLS_DEBUG LOGLEV(9, 70, M_DEBUG) /* show detailed info from TLS routines */
diff --git a/forward.c b/forward.c
index a6b8923..23edfc8 100644
--- a/forward.c
+++ b/forward.c
@@ -899,10 +899,7 @@ process_incoming_tun (struct context *c)
#endif
/* Show packet content */
- dmsg (D_TUN_RW, "TUN READ [%d]: %s md5=%s",
- BLEN (&c->c2.buf),
- format_hex (BPTR (&c->c2.buf), BLEN (&c->c2.buf), 80, &gc),
- MD5SUM (BPTR (&c->c2.buf), BLEN (&c->c2.buf), &gc));
+ dmsg (D_TUN_RW, "TUN READ [%d]", BLEN (&c->c2.buf));
if (c->c2.buf.len > 0)
{
@@ -1118,10 +1115,7 @@ process_outgoing_tun (struct context *c)
if (c->c2.log_rw)
fprintf (stderr, "w");
#endif
- dmsg (D_TUN_RW, "TUN WRITE [%d]: %s md5=%s",
- BLEN (&c->c2.to_tun),
- format_hex (BPTR (&c->c2.to_tun), BLEN (&c->c2.to_tun), 80, &gc),
- MD5SUM (BPTR (&c->c2.to_tun), BLEN (&c->c2.to_tun), &gc));
+ dmsg (D_TUN_RW, "TUN WRITE [%d]", BLEN (&c->c2.to_tun));
#ifdef PACKET_TRUNCATION_CHECK
ipv4_packet_size_verify (BPTR (&c->c2.to_tun),
diff --git a/multi.c b/multi.c
index a42c561..c4015d7 100644
--- a/multi.c
+++ b/multi.c
@@ -1045,6 +1045,7 @@ multi_delete_dup (struct multi_context *m, struct multi_instance *new_mi)
{
struct hash_iterator hi;
struct hash_element *he;
+ int count = 0;
hash_iterator_init (m->iter, &hi, true);
while ((he = hash_iterator_next (&hi)))
@@ -1058,10 +1059,14 @@ multi_delete_dup (struct multi_context *m, struct multi_instance *new_mi)
mi->did_iter = false;
multi_close_instance (m, mi, false);
hash_iterator_delete_element (&hi);
+ ++count;
}
}
}
hash_iterator_free (&hi);
+
+ if (count)
+ msg (D_MULTI_LOW, "MULTI: new connection by client '%s' will cause previous active sessions by this client to be dropped. Remember to use the --duplicate-cn option if you want multiple clients using the same certificate or username to concurrently connect.", new_cn);
}
}
}