X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=fc28e70bba13537e06ed55d57b3fe06a2f69b3f8;hp=31db636ab07eca509bfb33e42c04d19eb7deb552;hb=090eda1dc856043a212923f8ac4bff5269249780;hpb=cb5e9c6c64d5281eba5c790f14c2e5f3066becbf diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 31db636ab0..fc28e70bba 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -1,11 +1,23 @@ #!/usr/bin/perl -# -# SmoothWall CGIs -# -# This code is distributed under the terms of the GPL -# -# (c) The SmoothWall Team -# +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### use strict; @@ -41,253 +53,257 @@ $pppsettings{'ACTION'} = ''; &Header::getcgihash(\%pppsettings); if ($pppsettings{'ACTION'} ne '' && - (-e '/var/run/ppp-ipcop.pid' || -e "${General::swroot}/red/active")) -{ - $errormessage = $Lang::tr{'unable to alter profiles while red is active'}; - # read in the current vars - %pppsettings = (); - $pppsettings{'VALID'} = ''; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); -} + ( -e "${General::swroot}/red/active")){ + $errormessage = $Lang::tr{'unable to alter profiles while red is active'}; + # read in the current vars + %pppsettings = (); + $pppsettings{'VALID'} = ''; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);} elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) { - unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - my $type = $pppsettings{'TYPE'}; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'TYPE'} = $type; + unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + my $type = $pppsettings{'TYPE'}; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'TYPE'} = $type; } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'}) { - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|isdn1|isdn2)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'TYPE'} eq 'modem' && $pppsettings{'DIALMODE'} !~ /^(T|P)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - if ($pppsettings{'AUTH'} !~ /^(pap-or-chap|pap|chap|standard-login-script|demon-login-script|other-login-script)$/) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; - } - - if ($pppsettings{'PROFILENAME'} eq '') { - $errormessage = $Lang::tr{'profile name not given'}; - $pppsettings{'PROFILENAME'} = ''; - goto ERROR; } - if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) { - if ($pppsettings{'TELEPHONE'} eq '') { - $errormessage = $Lang::tr{'telephone not set'}; - goto ERROR; } - if (!($pppsettings{'TELEPHONE'} =~ /^[\d\*\#\,]+$/)) { - $errormessage = $Lang::tr{'bad characters in the telephone number field'}; - goto ERROR; } - } - unless (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} =~ /^(STATIC|DHCP)$/)) { - if ($pppsettings{'USERNAME'} eq '') { - $errormessage = $Lang::tr{'username not set'}; - goto ERROR; } - if ($pppsettings{'PASSWORD'} eq '') { - $errormessage = $Lang::tr{'password not set'}; - goto ERROR; } - } - - if ($pppsettings{'TIMEOUT'} eq '') { - $errormessage = $Lang::tr{'idle timeout not set'}; - goto ERROR; } - if (!($pppsettings{'TIMEOUT'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in the idle timeout'}; - goto ERROR; } - - if ($pppsettings{'LOGINSCRIPT'} =~ /[.\/ ]/ ) { - $errormessage = $Lang::tr{'bad characters in script field'}; - goto ERROR; } - - if ($pppsettings{'DNS1'}) - { - if (!(&General::validip($pppsettings{'DNS1'}))) { - $errormessage = $Lang::tr{'invalid primary dns'}; - goto ERROR; } - } - if ($pppsettings{'DNS2'}) - { - if (!(&General::validip($pppsettings{'DNS2'}))) { - $errormessage = $Lang::tr{'invalid secondary dns'}; - goto ERROR; } - } - - if ($pppsettings{'MAXRETRIES'} eq '') { - $errormessage = $Lang::tr{'max retries not set'}; - goto ERROR; } - if (!($pppsettings{'MAXRETRIES'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in max retries field'}; - goto ERROR; } - - if (!($pppsettings{'HOLDOFF'} =~ /^\d+$/)) { - $errormessage = $Lang::tr{'only digits allowed in holdoff field'}; - goto ERROR; } - - if ($pppsettings{'TYPE'} eq 'pptp') { - $errormessage = ''; - if ($pppsettings{'METHOD'} eq 'STATIC') { - if (! &General::validip($pppsettings{'ROUTERIP'})) { - $errormessage = $Lang::tr{'router ip'}.' '.$Lang::tr{'invalid ip'}; - } - } else { - if (($pppsettings{'DHCP_HOSTNAME'} ne '') && (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) ) { - $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.' '.$Lang::tr{'invalid hostname'}; - } - } - if ($errormessage ne '') {goto ERROR; } - } - - if ( ($pppsettings{'PROTOCOL'} eq 'RFC1483') && ($pppsettings{'METHOD'} eq '') && \ - ($pppsettings{'TYPE'} !~ /^(alcatelusb|fritzdsl)$/)) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - - if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'DHCP')) { - if ($pppsettings{'DHCP_HOSTNAME'} ne '') { - if (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) { - $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.': '.$Lang::tr{'invalid hostname'}; } - } - } - - if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'STATIC')) { - $errormessage = ''; - if (! &General::validip($pppsettings{'IP'})) { - $errormessage = $Lang::tr{'static ip'}.' '.$Lang::tr{'invalid ip'}; } - if (! &General::validip($pppsettings{'GATEWAY'})) { - $errormessage = $errormessage.' '.$Lang::tr{'gateway ip'}.' '.$Lang::tr{'invalid ip'}; } - if (! &General::validmask($pppsettings{'NETMASK'})) { - $errormessage = $errormessage.' '.$Lang::tr{'netmask'}.' '.$Lang::tr{'invalid netmask'}; } - if ($pppsettings{'BROADCAST'} ne '') { - if (! &General::validip($pppsettings{'BROADCAST'})) { - $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } - } - if( $pppsettings{'DNS'} eq 'Automatic') { - $errormessage = $Lang::tr{'invalid input'}; } - if ($errormessage ne '') {goto ERROR; } - } - - if( $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} ne 'PPPOE' && \ - $pppsettings{'RECONNECTION'} eq 'dialondemand' ) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } - - if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && `/bin/cat ${General::swroot}/ddns/config` =~ /,on$/m ) { - $errormessage = $Lang::tr{'dod not compatible with ddns'}; - goto ERROR; } - - if( $pppsettings{'PROTOCOL'} eq 'RFC1483') { - $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC1483'}; } - if( $pppsettings{'PROTOCOL'} eq 'RFC2364') { - $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC2364'}; } - delete $pppsettings{'ENCAP_RFC1483'}; - delete $pppsettings{'ENCAP_RFC2364'}; + if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/ && $pppsettings{'COMPORT'} !~ /^(ttyS0|ttyS1|ttyS2|ttyS3|ttyS4|ttyACM0|ttyACM1|ttyACM2|ttyACM3|ttyUSB0|ttyUSB1|ttyUSB2|ttyUSB3|rfcomm0|rfcomm1|isdn1|isdn2)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ && $pppsettings{'DTERATE'} !~ /^(9600|19200|38400|57600|115200|230400|460800|921600)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'TYPE'} eq 'modem' && $pppsettings{'DIALMODE'} !~ /^(T|P)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + if ($pppsettings{'AUTH'} !~ /^(pap-or-chap|pap|chap|standard-login-script|demon-login-script|other-login-script)$/) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; + } + + if ($pppsettings{'PROFILENAME'} eq '') { + $errormessage = $Lang::tr{'profile name not given'}; + $pppsettings{'PROFILENAME'} = ''; + goto ERROR; } + if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/) { + if ($pppsettings{'TELEPHONE'} eq '') { + $errormessage = $Lang::tr{'telephone not set'}; + goto ERROR; } + if (!($pppsettings{'TELEPHONE'} =~ /^[\d\*\#\,]+$/)) { + $errormessage = $Lang::tr{'bad characters in the telephone number field'}; + goto ERROR; } + } + unless (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} =~ /^(STATIC|DHCP)$/)) { + if ($pppsettings{'USERNAME'} eq '') { + $errormessage = $Lang::tr{'username not set'}; + goto ERROR; } + if ($pppsettings{'PASSWORD'} eq '') { + $errormessage = $Lang::tr{'password not set'}; + goto ERROR; } + } + + if ($pppsettings{'TIMEOUT'} eq '') { + $errormessage = $Lang::tr{'idle timeout not set'}; + goto ERROR; } + if (!($pppsettings{'TIMEOUT'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in the idle timeout'}; + goto ERROR; } + + if ($pppsettings{'LOGINSCRIPT'} =~ /[.\/ ]/ ) { + $errormessage = $Lang::tr{'bad characters in script field'}; + goto ERROR; } + + if ($pppsettings{'DNS1'}) + { + if (!(&General::validip($pppsettings{'DNS1'}))) { + $errormessage = $Lang::tr{'invalid primary dns'}; + goto ERROR; } + } + if ($pppsettings{'DNS2'}) + { + if (!(&General::validip($pppsettings{'DNS2'}))) { + $errormessage = $Lang::tr{'invalid secondary dns'}; + goto ERROR; } + } + + if ($pppsettings{'MAXRETRIES'} eq '') { + $errormessage = $Lang::tr{'max retries not set'}; + goto ERROR; } + if (!($pppsettings{'MAXRETRIES'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in max retries field'}; + goto ERROR; } + + if (!($pppsettings{'HOLDOFF'} =~ /^\d+$/)) { + $errormessage = $Lang::tr{'only digits allowed in holdoff field'}; + goto ERROR; } + + if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/) { + if ( ($pppsettings{'VPI'} eq '') || ($pppsettings{'VCI'} eq '') ) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if ( (!($pppsettings{'VPI'} =~ /^\d+$/)) || (!($pppsettings{'VCI'} =~ /^\d+$/)) ) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if (($pppsettings{'VPI'} eq '0') && ($pppsettings{'VCI'} eq '0')) { + $errormessage = $Lang::tr{'invalid vpi vpci'}; + goto ERROR; } + if ( $pppsettings{'PROTOCOL'} eq '' ) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + } + + if ( ($pppsettings{'PROTOCOL'} eq 'RFC1483') && ($pppsettings{'METHOD'} eq '') && \ + ($pppsettings{'TYPE'} !~ /^(alcatelusb|fritzdsl)$/)) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + + if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'DHCP')) { + if ($pppsettings{'DHCP_HOSTNAME'} ne '') { + if (! &General::validfqdn($pppsettings{'DHCP_HOSTNAME'})) { + $errormessage = $errormessage.' '.$Lang::tr{'hostname'}.': '.$Lang::tr{'invalid hostname'}; } + } + } + + if (($pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} eq 'STATIC')) { + $errormessage = ''; + if (! &General::validip($pppsettings{'IP'})) { + $errormessage = $Lang::tr{'static ip'}.' '.$Lang::tr{'invalid ip'}; } + if (! &General::validip($pppsettings{'GATEWAY'})) { + $errormessage = $errormessage.' '.$Lang::tr{'gateway ip'}.' '.$Lang::tr{'invalid ip'}; } + if (! &General::validmask($pppsettings{'NETMASK'})) { + $errormessage = $errormessage.' '.$Lang::tr{'netmask'}.' '.$Lang::tr{'invalid netmask'}; } + if ($pppsettings{'BROADCAST'} ne '') { + if (! &General::validip($pppsettings{'BROADCAST'})) { + $errormessage = $errormessage.' '.$Lang::tr{'broadcast'}.' '.$Lang::tr{'invalid broadcast ip'}; } + } + if( $pppsettings{'DNS'} eq 'Automatic') { + $errormessage = $Lang::tr{'invalid input'}; } + if ($errormessage ne '') {goto ERROR; } + } + + if( $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} ne 'PPPOE' && \ + $pppsettings{'RECONNECTION'} eq 'dialondemand' ) { + $errormessage = $Lang::tr{'invalid input'}; + goto ERROR; } + + if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && `/bin/cat ${General::swroot}/ddns/config` =~ /,on$/m ) { + $errormessage = $Lang::tr{'dod not compatible with ddns'}; + goto ERROR; } + +# if( $pppsettings{'PROTOCOL'} eq 'RFC1483') { +# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC1483'}; } +# if( $pppsettings{'PROTOCOL'} eq 'RFC2364') { +# $pppsettings{'ENCAP'} = $pppsettings{'ENCAP_RFC2364'}; } + delete $pppsettings{'ENCAP_RFC1483'}; + delete $pppsettings{'ENCAP_RFC2364'}; ERROR: - if ($errormessage) { - $pppsettings{'VALID'} = 'no'; } - else { - $pppsettings{'VALID'} = 'yes'; } + if ($errormessage) { + $pppsettings{'VALID'} = 'no'; } + else { + $pppsettings{'VALID'} = 'yes'; } - # write cgi vars to the file. - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + # write cgi vars to the file. + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); - # make link and write secret file. - &updatesettings(); - &writesecrets(); + # make link and write secret file. + &updatesettings(); + &writesecrets(); - &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); + &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); } if ($pppsettings{'ACTION'} eq $Lang::tr{'select'}) { - my $profile = $pppsettings{'PROFILE'}; - %temppppsettings = (); - $temppppsettings{'PROFILE'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%temppppsettings); + my $profile = $pppsettings{'PROFILE'}; + %temppppsettings = (); + $temppppsettings{'PROFILE'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%temppppsettings); - # make link. - &updatesettings(); + # make link. + &updatesettings(); - # read in the new params "early" so we can write secrets. - %pppsettings = (); - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'PROFILE'} = $profile; - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + # read in the new params "early" so we can write secrets. + %pppsettings = (); + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'PROFILE'} = $profile; + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); - &writesecrets(); + &writesecrets(); - &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); + &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); } elsif ($pppsettings{'ACTION'} eq $Lang::tr{'delete'}) { - &General::log("$Lang::tr{'profile deleted'} $pppsettings{'PROFILENAME'}"); - - my $profile = $pppsettings{'PROFILE'}; - truncate ("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", 0); - - %temppppsettings = (); - $temppppsettings{'PROFILE'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%temppppsettings); - - # make link. - &updatesettings(); - - # read in the new params "early" so we can write secrets. - %pppsettings = (); - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); - $pppsettings{'PROFILE'} = $profile; - &initprofile; - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); + &General::log("$Lang::tr{'profile deleted'} $pppsettings{'PROFILENAME'}"); + + my $profile = $pppsettings{'PROFILE'}; + truncate ("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", 0); + + %temppppsettings = (); + $temppppsettings{'PROFILE'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%temppppsettings); + + # make link. + &updatesettings(); + + # read in the new params "early" so we can write secrets. + %pppsettings = (); + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + $pppsettings{'PROFILE'} = $profile; + &initprofile; + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); +} +elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) +{ } else { - # read in the current vars - %pppsettings = (); - $pppsettings{'VALID'} = ''; - &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); + # read in the current vars + %pppsettings = (); + $pppsettings{'VALID'} = ''; + &General::readhash("${General::swroot}/ppp/settings", \%pppsettings); } # read in the profile names into @profilenames. my $c=0; for ($c = 1; $c <= $maxprofiles; $c++) { - %temppppsettings = (); - $temppppsettings{'PROFILENAME'} = $Lang::tr{'empty profile'}; - &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); - $profilenames[$c] = $temppppsettings{'PROFILENAME'}; + %temppppsettings = (); + $temppppsettings{'PROFILENAME'} = $Lang::tr{'empty profile'}; + &General::readhash("${General::swroot}/ppp/settings-$c", \%temppppsettings); + $profilenames[$c] = $temppppsettings{'PROFILENAME'}; } if ($pppsettings{'VALID'} eq '') { - if ($pppsettings{'PROFILE'} eq '') { - $pppsettings{'PROFILE'} = '1'; - &initprofile(); - } + if ($pppsettings{'PROFILE'} eq '') { + $pppsettings{'PROFILE'} = '1'; + &initprofile(); + } } for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'PROFILE'}{$c} = ''; } + $selected{'PROFILE'}{$c} = ''; } $selected{'PROFILE'}{$pppsettings{'PROFILE'}} = "selected='selected'"; for ($c = 1; $c <= $maxprofiles; $c++) { - $selected{'BACKUPPROFILE'}{$c} = ''; } + $selected{'BACKUPPROFILE'}{$c} = ''; } $selected{'BACKUPPROFILE'}{$pppsettings{'BACKUPPROFILE'}} = "selected='selected'"; $selected{'TYPE'}{'modem'} = ''; $selected{'TYPE'}{'serial'} = ''; $selected{'TYPE'}{'pppoe'} = ''; $selected{'TYPE'}{'pptp'} = ''; +$selected{'TYPE'}{'vdsl'} = ''; +$selected{'TYPE'}{'pppoeatm'} = ''; +$selected{'TYPE'}{'pptpatm'} = ''; $selected{'TYPE'}{$pppsettings{'TYPE'}} = "selected='selected'"; - $checked{'DEBUG'}{'off'} = ''; $checked{'DEBUG'}{'on'} = ''; $checked{'DEBUG'}{$pppsettings{'DEBUG'}} = "checked='checked'"; @@ -301,6 +317,12 @@ $selected{'COMPORT'}{'ttyACM0'} = ''; $selected{'COMPORT'}{'ttyACM1'} = ''; $selected{'COMPORT'}{'ttyACM2'} = ''; $selected{'COMPORT'}{'ttyACM3'} = ''; +$selected{'COMPORT'}{'ttyUSB0'} = ''; +$selected{'COMPORT'}{'ttyUSB1'} = ''; +$selected{'COMPORT'}{'ttyUSB2'} = ''; +$selected{'COMPORT'}{'ttyUSB3'} = ''; +$selected{'COMPORT'}{'rfcomm0'} = ''; +$selected{'COMPORT'}{'rfcomm1'} = ''; $selected{'COMPORT'}{$pppsettings{'COMPORT'}} = "selected='selected'"; $selected{'DTERATE'}{'9600'} = ''; @@ -310,6 +332,7 @@ $selected{'DTERATE'}{'57600'} = ''; $selected{'DTERATE'}{'115200'} = ''; $selected{'DTERATE'}{'230400'} = ''; $selected{'DTERATE'}{'460800'} = ''; +$selected{'DTERATE'}{'921600'} = ''; $selected{'DTERATE'}{$pppsettings{'DTERATE'}} = "selected='selected'"; $checked{'SPEAKER'}{'off'} = ''; @@ -320,7 +343,6 @@ $selected{'DIALMODE'}{'T'} = ''; $selected{'DIALMODE'}{'P'} = ''; $selected{'DIALMODE'}{$pppsettings{'DIALMODE'}} = "selected='selected'"; -$checked{'RECONNECTION'}{'manual'} = ''; $checked{'RECONNECTION'}{'persistent'} = ''; $checked{'RECONNECTION'}{'dialondemand'} = ''; $checked{'RECONNECTION'}{$pppsettings{'RECONNECTION'}} = "checked='checked'"; @@ -330,7 +352,7 @@ $checked{'DIALONDEMANDDNS'}{'on'} = ''; $checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'"; $checked{'AUTOCONNECT'}{'off'} = ''; -$checked{'AUTOCONNECT'}{'on'} = ''; +$checked{'AUTOCONNECT'}{'on'} = ''; $checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'"; $checked{'SENDCR'}{'off'} = ''; @@ -365,13 +387,13 @@ $checked{'PROTOCOL'}{$pppsettings{'PROTOCOL'}} = "checked='checked'"; $selected{'ENCAP'}{'0'} = ''; $selected{'ENCAP'}{'1'} = ''; -$selected{'ENCAP'}{'2'} = ''; -$selected{'ENCAP'}{'3'} = ''; -$selected{'ENCAP'}{'4'} = ''; +#$selected{'ENCAP'}{'2'} = ''; +#$selected{'ENCAP'}{'3'} = ''; +#$selected{'ENCAP'}{'4'} = ''; $selected{'ENCAP'}{$pppsettings{'ENCAP'}} = "selected='selected'"; + $checked{'METHOD'}{'STATIC'} = ''; $checked{'METHOD'}{'PPPOE'} = ''; -$checked{'METHOD'}{'PPPOE_PLUGIN'} = ''; $checked{'METHOD'}{'DHCP'} = ''; $checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'"; @@ -387,14 +409,30 @@ $checked{'DNS'}{'Automatic'} = ''; $checked{'DNS'}{'Manual'} = ''; $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; +$checked{'IPTV'}{'enable'} = ''; +$checked{'IPTV'}{'disable'} = ''; +$checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'"; + &Header::openpage($Lang::tr{'ppp setup'}, 1, ''); &Header::openbigbox('100%', 'left', '', $errormessage); -if ($errormessage) { +if ($netsettings{'RED_TYPE'} ne 'PPPOE') { + $errormessage = $Lang::tr{'dialup red not ppp'}; &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); - print "$errormessage\n"; - print " \n"; - &Header::closebox(); + print "$errormessage\n"; + print " \n"; + &Header::closebox(); + &Header::closebigbox(); + + &Header::closepage(); + exit(1); +} + +if ($errormessage) { + &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); + print "$errormessage\n"; + print " \n"; + &Header::closebox(); } @@ -406,20 +444,20 @@ print "
\n"; print < - $Lang::tr{'profile'} - - END ; for ($c = 1; $c <= $maxprofiles; $c++) { - print "\t\n"; + print "\t\n"; } print < - - - + + + +

@@ -433,232 +471,312 @@ END print < - $Lang::tr{'interface'}: - - +END +; +if ($netsettings{'RED_TYPE'} eq 'PPPOE' ) { +print <$Lang::tr{'modem'} + + + +END +; + +my $atmdev=`cat /proc/net/atm/devices | grep 0`; +chomp ($atmdev); +if ($atmdev ne '') { + print <PPPoE over ATM-BRIDGE + END ; -if ($netsettings{'RED_TYPE'} eq 'PPPOE') { - print "\t\n"; } -if ($netsettings{'RED_TYPE'} eq 'PPTP') { - print "\t\n"; } -if (-f "/proc/bus/usb/devices") { - print <ECI USB ADSL - - - - - - +#if (0) { +# print <ECI USB ADSL +# +# +# +# +# +# +#END +#; +#} +# print ""; + + print < + END ; -} - -# print ""; - print < - - - - USB: + if ($pppsettings{'TYPE'} =~ /^(modem)$/) { + print <$Lang::tr{'modem configuration'} END ; -if (-f "/proc/bus/usb/devices") { - my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; - if ($usb eq '') { - print "\t$Lang::tr{'not running'}\n"; - } else { - print "\t$usb\n"; - } } + print ""; + +#if (-f "/proc/bus/usb/devices") { +# USB: +# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; +# if ($usb eq '') { +# print "\t$Lang::tr{'not running'}\n"; +# } else { +# print "\t$usb\n"; +# } +#} + if ($pppsettings{'TYPE'}) { - print "

"; - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) { - print <

"; + + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) { + print < - $Lang::tr{'interface'}: - END ; - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { - print <$Lang::tr{'modem on com1'} - - - - - - - - - + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print <COM1 + + + + + + + + + + END ; - } - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { - print <$Lang::tr{'usb modem on acm0'} + + + +END +; + } + print " "} + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print < $Lang::tr{'computer to modem rate'} - + END ; - } - if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) { - print "$Lang::tr{'number'}\n"; - print "\n"; - if ($pppsettings{'TYPE'} eq 'modem' ) { - print "$Lang::tr{'modem speaker on'}\n"; - print "\n"; - } - } - } - if ($pppsettings{'TYPE'} eq 'modem') { - print <$Lang::tr{'number'}\n"; + print "\n"; + if ($pppsettings{'TYPE'} eq 'modem' ) { + print "$Lang::tr{'modem speaker on'}\n"; + print "\n"; + } + } + } + if ($pppsettings{'TYPE'} eq 'modem') { + print < - $Lang::tr{'dialing mode'} - + $Lang::tr{'dialing mode'} + + + + $Lang::tr{'optional at cmd'} 1 * + + + + $Lang::tr{'optional at cmd'} 2 * + + + + $Lang::tr{'optional at cmd'} 3 * + $Lang::tr{'send cr'} - + END -; +; } print < - $Lang::tr{'idle timeout'} - + $Lang::tr{'idle timeout'} + -END -; - if ( $netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) { - $pppsettings{'AUTOCONNECT'} = 'on'; - print "$Lang::tr{'connect on ipfire restart'}\n"; - print "\n"; - } else { - print "$Lang::tr{'connect on ipfire restart'}\n"; - print "\n"; - } -print < $Lang::tr{'connection debugging'}: - +

- $Lang::tr{'reconnection'}: + $Lang::tr{'reconnection'}: - $Lang::tr{'manual'} - - - $Lang::tr{'dod'} + $Lang::tr{'dod'} END ; if ($pppsettings{'TYPE'} ne 'isdn') { print < - $Lang::tr{'persistent'} + $Lang::tr{'persistent'} $Lang::tr{'backupprofile'}: - END ; - for ($c = 1; $c <= $maxprofiles; $c++) { - print "\t\n"; - } - print < + for ($c = 1; $c <= $maxprofiles; $c++) { + print "\t\n"; + } + print < END ; } print < - $Lang::tr{'dod for dns'} + $Lang::tr{'dod for dns'} - $Lang::tr{'holdoff'}: - + $Lang::tr{'holdoff'}: + - $Lang::tr{'maximum retries'} - + $Lang::tr{'maximum retries'} + END ; if ($pppsettings{'TYPE'} eq 'pptp') { + print <

- $Lang::tr{'pptp settings'} + $Lang::tr{'pptp settings'} - $Lang::tr{'phonebook entry'} - - + Peer + - $Lang::tr{'static ip'} - $Lang::tr{'router ip'} - + My Netconfig + +END +; +} + +if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/) +{ + +print < + $Lang::tr{'adsl settings'}: - $Lang::tr{'dhcp mode'} - $Lang::tr{'hostname'}: * - + + $Lang::tr{'encapsulation'}: + + + + + + + $Lang::tr{'vpi number'} + + $Lang::tr{'vci number'} + END ; } -if ($pppsettings{'TYPE'} eq 'pppoe') + + if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) { +print < + IPTV: + +END +; + if ( -e '/opt/pakfire/db/installed/meta-igmpproxy'){ +print < + $Lang::tr{'on'} + + + + $Lang::tr{'off'} + +END +; + } + else { + print "No IPTV possible install addon igmpproxy"; + } +} + +if ($pppsettings{'TYPE'} eq 'pppoe' || $pppsettings{'TYPE'} eq 'pppoeatm' || $pppsettings{'TYPE'} eq 'vdsl') { print <

- $Lang::tr{'pppoe settings'} + $Lang::tr{'pppoe settings'} - PPPoE plugin - $Lang::tr{'service name'} * - + $Lang::tr{'service name'} * + + - $Lang::tr{'pppoe'} - $Lang::tr{'concentrator name'} * - + $Lang::tr{'concentrator name'} * + + - MTU - - + MTU + + END ; @@ -667,63 +785,63 @@ END print <

- $Lang::tr{'authentication'} + $Lang::tr{'authentication'} - $Lang::tr{'username'} - - $Lang::tr{'password'} - + $Lang::tr{'username'} + + $Lang::tr{'password'} + - $Lang::tr{'method'} - + + + END ; if ($pppsettings{'TYPE'} eq 'modem') { print <$Lang::tr{'standard login script'} - - + + + END ; } print < - $Lang::tr{'script name'} * - + + $Lang::tr{'script name'} * +

- DNS: + DNS: - $Lang::tr{'automatic'} + $Lang::tr{'automatic'} - $Lang::tr{'manual'} + $Lang::tr{'manual'} - $Lang::tr{'primary dns'} - - $Lang::tr{'secondary dns'} - + $Lang::tr{'primary dns'} + + $Lang::tr{'secondary dns'} +



- $Lang::tr{'profile name'} - - + $Lang::tr{'profile name'} + + - $Lang::tr{'legend'}: - * $Lang::tr{'this field may be blank'} + $Lang::tr{'legend'}: + * $Lang::tr{'this field may be blank'} END @@ -739,68 +857,71 @@ print "\n"; sub updatesettings { - # make a link from the selected profile to the "default" one. - unlink("${General::swroot}/ppp/settings"); - link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - "${General::swroot}/ppp/settings"); - system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); + # make a link from the selected profile to the "default" one. + unlink("${General::swroot}/ppp/settings"); + link("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + "${General::swroot}/ppp/settings"); + system ("/usr/bin/touch", "${General::swroot}/ppp/updatesettings"); } sub writesecrets { - # write secrets file. - open(FILE, ">/${General::swroot}/ppp/secrets") or die "Unable to write secrets file."; - flock(FILE, 2); - my $username = $pppsettings{'USERNAME'}; - my $password = $pppsettings{'PASSWORD'}; - print FILE "'$username' * '$password'\n"; - chmod 0600, "${General::swroot}/ppp/secrets"; - close FILE; + # write secrets file. + open(FILE, ">/${General::swroot}/ppp/secrets") or die "Unable to write secrets file."; + flock(FILE, 2); + my $username = $pppsettings{'USERNAME'}; + my $password = $pppsettings{'PASSWORD'}; + print FILE "'$username' * '$password'\n"; + chmod 0600, "${General::swroot}/ppp/secrets"; + close FILE; } sub initprofile { - $pppsettings{'PROFILENAME'} = $Lang::tr{'unnamed'}; - $pppsettings{'COMPORT'} = 'ttyS0'; - $pppsettings{'DTERATE'} = 115200; - $pppsettings{'SPEAKER'} = 'off'; - $pppsettings{'RECONNECTION'} = 'manual'; - $pppsettings{'DIALONDEMANDDNS'} = 'off'; - $pppsettings{'AUTOCONNECT'} = 'off'; - $pppsettings{'SENDCR'} = 'off'; - $pppsettings{'USEIBOD'} = 'off'; - $pppsettings{'USEDOV'} = 'off'; - $pppsettings{'MODEM'} = 'PCIST'; - $pppsettings{'LINE'} = 'WO'; - $pppsettings{'ENCAP'} = '0'; - $pppsettings{'PHONEBOOK'} = 'RELAY_PPP1'; - $pppsettings{'PROTOCOL'} = 'RFC2364'; - $pppsettings{'METHOD'} = 'PPPOE_PLUGIN'; - if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) { - $pppsettings{'MTU'} = '1492'; - $pppsettings{'MRU'} = '1492'; - } else { - $pppsettings{'MTU'} = '1452'; - $pppsettings{'MRU'} = '1452'; - } - $pppsettings{'DIALMODE'} = 'T'; - $pppsettings{'MAXRETRIES'} = 5; - $pppsettings{'HOLDOFF'} = 30; - $pppsettings{'TIMEOUT'} = 15; - $pppsettings{'MODULATION'} = 'AUTO'; - $pppsettings{'AUTH'} = 'pap-or-chap'; - $pppsettings{'DNS'} = 'Automatic'; - $pppsettings{'DEBUG'} = 'off'; - $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; - - # Get PPPoE settings so we can see if PPPoE is enabled or not. - &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - - # empty profile partial pre-initialization - if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { - $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); - } else { - $pppsettings{'TYPE'}='modem'; + $pppsettings{'PROFILENAME'} = $Lang::tr{'unnamed'}; + $pppsettings{'COMPORT'} = 'ttyS0'; + $pppsettings{'DTERATE'} = 115200; + $pppsettings{'SPEAKER'} = 'off'; + $pppsettings{'RECONNECTION'} = 'persistent'; + $pppsettings{'DIALONDEMANDDNS'} = 'off'; + $pppsettings{'AUTOCONNECT'} = 'on'; + $pppsettings{'SENDCR'} = 'off'; + $pppsettings{'USEIBOD'} = 'off'; + $pppsettings{'USEDOV'} = 'off'; + $pppsettings{'MODEM'} = 'PCIST'; + $pppsettings{'LINE'} = 'WO'; + $pppsettings{'ENCAP'} = '0'; + $pppsettings{'VPI'} = '1'; + $pppsettings{'VCI'} = '32'; + $pppsettings{'PPTP_PEER'} = '10.0.0.138'; + $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255'; + $pppsettings{'PROTOCOL'} = 'RFC2364'; + $pppsettings{'MTU'} = '1492'; + $pppsettings{'MRU'} = '1492'; + $pppsettings{'DIALMODE'} = 'T'; + $pppsettings{'MAXRETRIES'} = 5; + $pppsettings{'HOLDOFF'} = 30; + $pppsettings{'TIMEOUT'} = 15; + $pppsettings{'MODULATION'} = 'AUTO'; + $pppsettings{'AUTH'} = 'pap-or-chap'; + $pppsettings{'DNS'} = 'Automatic'; + $pppsettings{'DEBUG'} = 'off'; + $pppsettings{'BACKUPPROFILE'} = $pppsettings{'PROFILE'}; + $pppsettings{'IPTVSERVERS'} = '192.168.2.51/32'; + $pppsettings{'IPTV'} = 'disable'; + + if ( -e '/usr/local/bin/igmpproxy'){ + $pppsettings{'IPTV'} = 'enable'; } + + # Get PPPoE settings so we can see if PPPoE is enabled or not. + &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); + + # empty profile partial pre-initialization + if ($netsettings{'CONFIG_TYPE'} =~ /^(1|2|3|4)$/) { + $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); + } else { + $pppsettings{'TYPE'}='modem'; + } }