Am 19.11.2012 21:47, schrieb Stefan Schantl:
Hello Alexander & Michael,
I've merged my mtu-disc changes with the ccd changes from Alexander.
http://git.ipfire.org/?p=people/stevee/ipfire-2.x.git;a=commit;h=350f298025c...
Today, I was doing some testing and found some problems - mostly on the ccd extension:
- mtu-disc: The cgi doesn't respect if mtu-disc never has been
configured.
Fixed:http://git.ipfire.org/?p=people/stevee/ipfire-2.x.git;a=commit;h=a66e24bbfd0...
- After creating a new ccd roadwarrior, there is very stange sting in
the "/var/ipfire/ovpn/ccd/test" file:
ifconfig-push 10.0.0.50 10.-1.255.49 The first thing looks good, because I have assigned that IP to theconnection, but the second part looks really strange.
WOW! That is really strange! i could not reproduce that. Tested with the same ip. but the only possible killer is this code in general_functions:
sub getlastip { my ($byte1,$byte2,$byte3,$byte4) = split (/./,$_[0]); my $step=$_[1]; for (my $x=$step;$x>=1;$x--){ $byte4--; if($byte4==0){ $byte4=255;$byte3--;} if($byte3==0){$byte3=255;$byte2--;} if ($byte2==0){$byte2=255;$byte1--} } return "$byte1.$byte2.$byte3.$byte4";
your Prob seems that the code reduces byte 4, then byte3, then byte2 which leads to this "ip" But as you can see in my code, i am checking if byte3 is EQUAL 0 and only then i set byte3 to 255 and reduce byte 2 .. ans so on. Please check if you have the right general functions !
i appended it to this mail. Maybe i was too dumb to push all code to the git. it is in my ccd tree...
if you like i will send you the files via mail.
- In the WUI the Green Network always is selected, also if you have
allowed access to more zones ( like blue or orange ) or to Nothing.
Well also here the same, i can not reproduce that error! It was right, that this behaviour was when we tested it. but then i fixed that error.
I append the ovpnmain.cgi at this mail. please check it.
Best regards,
Stefan
Am 16.11.2012 17:34, schrieb Michael Tremer:
Hello guys,
I merged the changes to the next branch.
http://git.ipfire.org/?p=ipfire-2.x.git;a=commit;h=8c877a82f6a63e07e2dde8d55...
Please note, that this does not mean that testing is done. It has just been started.
I also changed a lot of the translation strings. Fixed typos, rephrased sentences. Please double check this.
Thanks for that, looks better.
Stevee will take care of the migration script. Please rename "lang.sh" to "update-lang-cache" and put it in /usr/sbin (lfs/stage2).
Sorry, but i checket out next branch and lfs/stage2 is a script? How can i put the lang.sh (update-lang-cache) into it?
Michael
On Fri, 2012-11-16 at 06:19 +0100, Alexander Marx wrote:
Dear List!
Here you get the final release with latest modifications. Git Version is updated.
Stevee, one thing for you:
We need to run an update script with the core update. The script is in attachment, tools->ccd.pl i don't know where to put it in the git branch, so please make it run once on update.
This script looks for existing VPN Clients and builds ccd files with default route to green network. This is needed, because the default route to green is no longer in the server.conf. I modified the script so that there's no Console output. The script needs to stop and start the OVPN server!
The lang.sh file should go to /usr/bin/ or /usr/local/bin/ in the next release if possible. It makes it easier to generate the languages, because one only needs to execute "lang.sh"
Here i also don't know where to put it in the git.
Thank you a lot for reviewing the code and testing.
Alex _______________________________________________ Development mailing list Development@lists.ipfire.org http://lists.ipfire.org/mailman/listinfo/development
Development mailing list Development@lists.ipfire.org http://lists.ipfire.org/mailman/listinfo/development
Development mailing list Development@lists.ipfire.org http://lists.ipfire.org/mailman/listinfo/development
Development mailing list Development@lists.ipfire.org http://lists.ipfire.org/mailman/listinfo/development