Skip to contentSkip to conversation

housekeeping patches for 2.3

Openvpn-devel In review Gert Doering 2 participants 5 messages Aug 16, 2012 – Sep 2, 2012

lore
Share & tools
lore
#0 lore raw

Hi,

as discussed on IRC, the "--version" output for IPv6 is no longer useful in its existing form -> shorten (but keep, to point out "yes, this has IPv6" even if *we* all know).

Add another convenience patch to t_client.sh, to put the command line used by a specific test run into the corresponding openvpn log file, so you can always see what command was run (t_client.sh prints this, but if you clear the screen in between, it's good to have a place to go and look it up).

gert

#1 lore raw

PATCH 1/2 Put actual OpenVPN command line on top of corresponding log file.

This is useful if a test fails, and the tester wants to run the very same OpenVPN call with the very same arguments interactively to pinpoint and fix the problem.

---
 tests/t_client.sh.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
tests/t_client.sh.in +2 -1
index 8c66033..189eecc 100755
@@ -234,7 +234,8 @@ do
     fi
 
     echo " run openvpn $openvpn_conf"
-    $RUN_SUDO "${top_builddir}/src/openvpn/openvpn" $openvpn_conf >$LOGDIR/$SUF:openvpn.log &
+    echo "# src/openvpn/openvpn $openvpn_conf" >$LOGDIR/$SUF:openvpn.log
+    $RUN_SUDO "${top_builddir}/src/openvpn/openvpn" $openvpn_conf >>$LOGDIR/$SUF:openvpn.log &
     opid=$!
 
     # make sure openvpn client is terminated in case shell exits
Signature · 1 line
1.7.3.5
#2 lore raw

Re: [Openvpn-devel] [PATCH 1/2] Put actual OpenVPN command line on top of corresponding log file.

Quoted 8 lines · Gert Doering

This is useful if a test fails, and the tester wants to run the very same OpenVPN call with the very same arguments interactively to pinpoint and fix the problem.

---
 tests/t_client.sh.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

ACK. Applied to master

commit cc43956c649a1557a814d52ab422d44939b2383e

Author: Gert Doering <[email protected]...>
Date:   Thu Aug 16 20:31:22 2012 +0200
    Put actual OpenVPN command line on top of corresponding log file.

    Signed-off-by: Gert Doering <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Message-Id: [email protected]...
    URL: http://article.gmane.org/gmane.network.openvpn.devel/6984
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

David Sommerseth

#3 lore raw

PATCH 2/2 Reduce --version string detail about IPv6 to just "[IPv6]".

In reply to Gert Doering

For 2.3 release, we do not need to have more details, as there is no separate patch set anymore, and both IPv6 transport and IPv6 payload (PF_INET6) have been fully integrated.

---
 src/openvpn/options.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
src/openvpn/options.c +1 -2
index 19690e1..d25bbea 100644
@@ -106,8 +106,7 @@ const char title_string[] =
 #if ENABLE_IP_PKTINFO
   " [MH]"
 #endif
-  " [PF_INET6]"
-  " [IPv6 payload 20110522-1 (2.2.0)]"
+  " [IPv6]"
   " built on " __DATE__
 ;
 
Signature · 1 line
1.7.3.5
#4 lore raw

Re: [Openvpn-devel] [PATCH 2/2] Reduce --version string detail about IPv6 to just "[IPv6]".

Quoted 8 lines · Gert Doering

For 2.3 release, we do not need to have more details, as there is no separate patch set anymore, and both IPv6 transport and IPv6 payload (PF_INET6) have been fully integrated.

---
 src/openvpn/options.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

ACK. Applied to master.

Author: Gert Doering <[email protected]...>
Date:   Thu Aug 16 20:31:23 2012 +0200
    Reduce --version string detail about IPv6 to just "[IPv6]".

    Signed-off-by: Gert Doering <[email protected]...>
    Acked-by: David Sommerseth <[email protected]...>
    Message-Id: [email protected]...
    URL: http://article.gmane.org/gmane.network.openvpn.devel/6985
    Signed-off-by: David Sommerseth <[email protected]...>

kind regards,

David Sommerseth