diff options
| author | Lev Stipakov <lstipakov@gmail.com> | 2014-12-08 19:06:02 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2014-12-08 22:15:08 +0100 |
| commit | 1b9541922ad6ff6ee46c84f43cd23b7064f7919d (patch) | |
| tree | d53b0d7dea2e1d36b0cd184dffba55b64cc3845c | |
| parent | b08c25dbaeffbdd80acc143a931a276163c851a3 (diff) | |
| download | openvpn-1b9541922ad6ff6ee46c84f43cd23b7064f7919d.tar.gz openvpn-1b9541922ad6ff6ee46c84f43cd23b7064f7919d.tar.xz openvpn-1b9541922ad6ff6ee46c84f43cd23b7064f7919d.zip | |
Add the peer-id to the output of the status command
This adds peer-id to the status output which might help analyze floating
logs. This will change the output of status in the same way commit
662ce6acc065bddf6490b3494725b8b3987b7def did.
Signed-off-by: Lev Stipakov <lstipakov@gmail.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: 1418058362-13480-1-git-send-email-lstipakov@gmail.com
URL: http://article.gmane.org/gmane.network.openvpn.devel/9322
Signed-off-by: David Sommerseth <davids@redhat.com>
| -rw-r--r-- | src/openvpn/multi.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index 538f4f1..b7785c1 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -815,8 +815,8 @@ multi_print_status (struct multi_context *m, struct status_output *so, const int */ status_printf (so, "TITLE%c%s", sep, title_string); status_printf (so, "TIME%c%s%c%u", sep, time_string (now, 0, false, &gc_top), sep, (unsigned int)now); - status_printf (so, "HEADER%cCLIENT_LIST%cCommon Name%cReal Address%cVirtual Address%cVirtual IPv6 Address%cBytes Received%cBytes Sent%cConnected Since%cConnected Since (time_t)%cUsername%cClient ID", - sep, sep, sep, sep, sep, sep, sep, sep, sep, sep, sep); + status_printf (so, "HEADER%cCLIENT_LIST%cCommon Name%cReal Address%cVirtual Address%cVirtual IPv6 Address%cBytes Received%cBytes Sent%cConnected Since%cConnected Since (time_t)%cUsername%cClient ID%cPeer ID", + sep, sep, sep, sep, sep, sep, sep, sep, sep, sep, sep, sep); hash_iterator_init (m->hash, &hi); while ((he = hash_iterator_next (&hi))) { @@ -827,10 +827,11 @@ multi_print_status (struct multi_context *m, struct status_output *so, const int { status_printf (so, "CLIENT_LIST%c%s%c%s%c%s%c%s%c" counter_format "%c" counter_format "%c%s%c%u%c%s%c" #ifdef MANAGEMENT_DEF_AUTH - "%lu", + "%lu" #else - "", + "" #endif + "%c%"PRIu32, sep, tls_common_name (mi->context.c2.tls_multi, false), sep, mroute_addr_print (&mi->real, &gc), sep, print_in_addr_t (mi->reporting_addr, IA_EMPTY_IF_UNDEF, &gc), @@ -841,10 +842,11 @@ multi_print_status (struct multi_context *m, struct status_output *so, const int sep, (unsigned int)mi->created, sep, tls_username (mi->context.c2.tls_multi, false), #ifdef MANAGEMENT_DEF_AUTH - sep, mi->context.c2.mda_context.cid); + sep, mi->context.c2.mda_context.cid, #else - sep); + sep, #endif + sep, mi->context.c2.tls_multi ? mi->context.c2.tls_multi->peer_id : UINT32_MAX); } gc_free (&gc); } |