From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: openvpn broken in 13
Date: Mon, 17 Sep 2012 21:00:16 +0200
Message-ID: <1347908416.14788.111.camel@rice-oxley.tremer.info>
In-Reply-To: <BEEEF143-A80B-43BE-A125-E4B031CF40A2@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2565193225209305173=="
List-Id: <development.lists.ipfire.org>

--===============2565193225209305173==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

The patch has been applied to the next branch.

Please please please test.

Michael

On Mon, 2012-09-10 at 11:02 +0200, Erik K. wrote:
> Hi all,
> the patch is working for me, after patching the ovpnmain.cgi the package si=
ze is per default 1400 MTU and fragment and mssfix doesn=C2=B4t appear. If i =
adjust a value for fragment and activate mssfix, both are displayed with the =
same values in the configuration files for the server and also for the client=
 configuration file, also the MTU can be adjusted and the values are also pri=
nted to both configuration files.=20
>=20
> But i have had some strange messages after patching the ovpnmain.cgi . The =
logs said that the keepalive value aren=C2=B4t set for the server and as i co=
ntrolled the server.conf there wasn=C2=B4t the keepalive 10 60 value findable=
. After a manual edit over the WUI, keepalive 10 60 was also printed to serve=
r.conf.=20
>=20
> So this patch:
> --- ovpnmain.cgi.61	2012-09-01 06:49:41.385539818 +0200
> +++ ovpnmain.cgi	2012-09-01 06:41:15.804679610 +0200
> @@ -356,14 +356,11 @@
>      if ($sovpnsettings{CLIENT2CLIENT} eq 'on') {
>  	print CONF "client-to-client\n";
>      }
> -    if ($sovpnsettings{'DPROTOCOL'} eq 'udp') {
> -        if ($sovpnsettings{MSSFIX} eq 'on') {
> -	    print CONF "mssfix\n";
> -        }
> -        if ($sovpnsettings{'FRAGMENT'} eq '' || $sovpnsettings{'FRAGMENT'}=
 eq 0) {
> -		$sovpnsettings{'FRAGMENT'} =3D '1300';
> -        }
> -        print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";
> +    if ($sovpnsettings{MSSFIX} eq 'on') {
> +	print CONF "mssfix\n";
> +    }
> +    if ($sovpnsettings{FRAGMENT} ne '' && $sovpnsettings{'DPROTOCOL'} ne '=
tcp') {
> +	print CONF "fragment $sovpnsettings{'FRAGMENT'}\n";  =20
>      }
>      if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0=
) {=09
>  	print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPA=
LIVE_2'}\n";
> @@ -532,7 +529,7 @@
>      	}
>      }
>      if ($cgiparams{'MSSFIX'} ne 'on') {
> -    	$vpnsettings{'MSSFIX'} =3D 'off';
> +    	delete $vpnsettings{'MSSFIX'};
>      } else {
>      	$vpnsettings{'MSSFIX'} =3D $cgiparams{'MSSFIX'};
>      }
> @@ -1906,12 +1903,6 @@
>      if ($cgiparams{'LOG_VERB'} eq '') {
>  	$cgiparams{'LOG_VERB'} =3D  '3';
>      }
> -    if ($cgiparams{'MSSFIX'} eq '') {
> -        $cgiparams{'MSSFIX'} =3D 'on';
> -    }
> -    if ($cgiparams{'FRAGMENT'} eq '') {
> -        $cgiparams{'FRAGMENT'} =3D '1300';
> -    }
>      $checked{'CLIENT2CLIENT'}{'off'} =3D '';
>      $checked{'CLIENT2CLIENT'}{'on'} =3D '';
>      $checked{'CLIENT2CLIENT'}{$cgiparams{'CLIENT2CLIENT'}} =3D 'CHECKED';
>=20
>=20
> doesn=C2=B4t contain changes for keepalive so i=C2=B4am pretty unsure where=
 it comes from. Does someone have similar log entries or is it maybe only a i=
ndividual problem?
>=20
> Erik
>  =20
> Am 10.09.2012 um 10:08 schrieb Michael Tremer:
>=20
> > On Fri, 2012-09-07 at 12:26 -0500, R. W. Rodolico wrote:
> >> All of my tests so far have shown the patch to be effective. I agree
> >> that it was likely a bug that crept in on the new code (would be nice to
> >> have some effective beta testing -- oops, I'm the one that should have
> >> done that).
> >=20
> > Indeed :D
> >=20
> > I am waiting for some more responses about the patch. I think we are
> > clear to go, but still need more people to test it.
> >=20
> > Michael
> >=20
> > _______________________________________________
> > Development mailing list
> > Development(a)lists.ipfire.org
> > http://lists.ipfire.org/mailman/listinfo/development
>=20
> _______________________________________________
> Development mailing list
> Development(a)lists.ipfire.org
> http://lists.ipfire.org/mailman/listinfo/development


--===============2565193225209305173==--