X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpppsetup.cgi;h=443c201fa7584cbbe6e2a90823f4560bdc2a4237;hp=93098add92c34598d71cbbfd9a99b776ee3164d9;hb=ff7a39506abf741d8e57647453a6171a0cc563fd;hpb=986e08d996eadd906ecbe6c9ac8ad48aa78bd854 diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi index 93098add92..443c201fa7 100644 --- a/html/cgi-bin/pppsetup.cgi +++ b/html/cgi-bin/pppsetup.cgi @@ -1,17 +1,23 @@ #!/usr/bin/perl -# -# SmoothWall CGIs -# -# This code is distributed under the terms of the GPL -# -# (c) The SmoothWall Team -# -# Copyright (C) 03-Apr-2002 Guy Ellis -# - ISDN DOV support -# - ibod now an option -# - PCI ADSL support added -# -# $Id: pppsetup.cgi,v 1.17.2.49 2005/12/01 16:20:35 franck78 Exp $ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team # +# # +# 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; @@ -35,6 +41,11 @@ my $errormessage = ''; my $maxprofiles = 5; my $kernel=`/bin/uname -r | /usr/bin/tr -d '\012'`; +my %color = (); +my %mainsettings = (); +&General::readhash("${General::swroot}/main/settings", \%mainsettings); +&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); + &Header::showhttpheaders(); $pppsettings{'ACTION'} = ''; @@ -42,322 +53,267 @@ $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|alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) { - $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|usb\/ttyACM0|usb\/ttyACM1|usb\/ttyACM2|usb\/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; } - - my $drivererror = 0; - if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk)$/) { - my $modem = ''; - my $speedtouch = &Header::speedtouchversion; - if ($speedtouch >=0 && $speedtouch <=4) { - if ($speedtouch ==4) { $modem='v4_b'; } else { $modem='v0123'; } - $pppsettings{'MODEM'} = $modem; - } else { - $modem='v0123'; - $errormessage ="$Lang::tr{'unknown'} Rev $speedtouch"; - goto ERROR; - } - if (! -e "${General::swroot}/alcatelusb/firmware.$modem.bin") { - $errormessage = $Lang::tr{'no alcatelusb firmware'}; - $drivererror = 1; - goto ERROR; - } - } + 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'}; + + if ((!($pppsettings{'INET_VLAN'} =~ /^\d+$/)) || + ($pppsettings{'INET_VLAN'} eq '') || + ($pppsettings{'INET_VLAN'} > 4095) ) { + $errormessage = 'INET_VLAN - '.$Lang::tr{'invalid input'}; } + + if ((!($pppsettings{'IPTV_VLAN'} =~ /^\d+$/)) || + ($pppsettings{'IPTV_VLAN'} eq '') || + ($pppsettings{'IPTV_VLAN'} > 4095) ) { + $errormessage = 'IPTV_VLAN - '.$Lang::tr{'invalid input'}; } - if($pppsettings{'TYPE'} eq 'eciadsl' && (!(-e "${General::swroot}/eciadsl/synch.bin"))) { - $errormessage = $Lang::tr{'no eciadsl synch.bin file'}; - $drivererror = 1; - goto ERROR; } - - if($pppsettings{'TYPE'} eq 'fritzdsl' && (!(-e "/lib/modules/$kernel/misc/fcdslusb.o.gz"))) { - $errormessage = $Lang::tr{'no fritzdsl driver'}; - $drivererror = 1; - goto ERROR; } - - if( $pppsettings{'USEIBOD'} eq 'on' && $pppsettings{'COMPORT'} eq 'isdn1') { - $errormessage = $Lang::tr{'ibod for dual isdn only'}; - 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{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) { - 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'}; } - } - } +ERROR: + if ($errormessage) { + $pppsettings{'VALID'} = 'no'; } + else { + $pppsettings{'VALID'} = 'yes'; } - 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; } - } + # write cgi vars to the file. + &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%pppsettings); - if( $pppsettings{'PROTOCOL'} eq 'RFC1483' && $pppsettings{'METHOD'} ne 'PPPOE' && \ - $pppsettings{'RECONNECTION'} eq 'dialondemand' ) { - $errormessage = $Lang::tr{'invalid input'}; - goto ERROR; } + # make link and write secret file. + &updatesettings(); + &writesecrets(); - if( $pppsettings{'RECONNECTION'} eq 'dialondemand' && `/bin/cat ${General::swroot}/ddns/config` =~ /,on$/m ) { - $errormessage = $Lang::tr{'dod not compatible with ddns'}; - goto ERROR; } + &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); - if ( ($pppsettings{'TYPE'} =~ /^(bewanadsl)$/) && $pppsettings{'MODEM'} eq '') { - $errormessage = $Lang::tr{'no modem selected'}; - goto ERROR; } + # make link. + &updatesettings(); - 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'}; + # 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); -ERROR: - if ($errormessage) { - $pppsettings{'VALID'} = 'no'; } - else { - $pppsettings{'VALID'} = 'yes'; } + &writesecrets(); - # write cgi vars to the file. - &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%pppsettings); - - # make link and write secret file. - &updatesettings(); - &writesecrets(); - - &General::log("$Lang::tr{'profile saved'} $pppsettings{'PROFILENAME'}"); - if ($drivererror) { - my $refresh = ""; - my $title = $Lang::tr{'upload'}; - &Header::openpage($title, 0, $refresh); - } + &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); } -elsif ($pppsettings{'ACTION'} eq $Lang::tr{'select'}) +elsif ($pppsettings{'ACTION'} eq $Lang::tr{'delete'}) { - my $profile = $pppsettings{'PROFILE'}; - %temppppsettings = (); - $temppppsettings{'PROFILE'} = ''; - &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", - \%temppppsettings); + &General::log("$Lang::tr{'profile deleted'} $pppsettings{'PROFILENAME'}"); - # make link. - &updatesettings(); + my $profile = $pppsettings{'PROFILE'}; + truncate ("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", 0); - # 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); + %temppppsettings = (); + $temppppsettings{'PROFILE'} = ''; + &General::readhash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}", + \%temppppsettings); - &writesecrets(); + # make link. + &updatesettings(); - &General::log("$Lang::tr{'profile made current'} $pppsettings{'PROFILENAME'}"); + # 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{'delete'}) +elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'}) { - &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); } 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'}{'isdn'} = ''; $selected{'TYPE'}{'pppoe'} = ''; $selected{'TYPE'}{'pptp'} = ''; -$selected{'TYPE'}{'alcatelusb'} = ''; -$selected{'TYPE'}{'alcatelusbk'} = ''; -$selected{'TYPE'}{'pulsardsl'} = ''; -$selected{'TYPE'}{'eciadsl'} = ''; -$selected{'TYPE'}{'fritzdsl'} = ''; -$selected{'TYPE'}{'bewanadsl'} = ''; -$selected{'TYPE'}{'eagleusbadsl'} = ''; -$selected{'TYPE'}{'conexantusbadsl'} = ''; -$selected{'TYPE'}{'conexantpciadsl'} = ''; -$selected{'TYPE'}{'amedynusbadsl'} = ''; -$selected{'TYPE'}{'3cp4218usbadsl'} = ''; +$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'"; @@ -367,12 +323,16 @@ $selected{'COMPORT'}{'ttyS1'} = ''; $selected{'COMPORT'}{'ttyS2'} = ''; $selected{'COMPORT'}{'ttyS3'} = ''; $selected{'COMPORT'}{'ttyS4'} = ''; -$selected{'COMPORT'}{'usb/ttyACM0'} = ''; -$selected{'COMPORT'}{'usb/ttyACM1'} = ''; -$selected{'COMPORT'}{'usb/ttyACM2'} = ''; -$selected{'COMPORT'}{'usb/ttyACM3'} = ''; -$selected{'COMPORT'}{'isdn1'} = ''; -$selected{'COMPORT'}{'isdn2'} = ''; +$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'} = ''; @@ -382,6 +342,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'} = ''; @@ -392,7 +353,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'"; @@ -402,7 +362,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'} = ''; @@ -411,9 +371,6 @@ $checked{'SENDCR'}{$pppsettings{'SENDCR'}} = "checked='checked'"; $checked{'USEDOV'}{'off'} = ''; $checked{'USEDOV'}{'on'} = ''; $checked{'USEDOV'}{$pppsettings{'USEDOV'}} = "checked='checked'"; -$checked{'USEIBOD'}{'off'} = ''; -$checked{'USEIBOD'}{'on'} = ''; -$checked{'USEIBOD'}{$pppsettings{'USEIBOD'}} = "checked='checked'"; $checked{'MODEM'}{'PCIST'} = ''; $checked{'MODEM'}{'USB'} = ''; @@ -440,13 +397,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'"; @@ -462,15 +419,33 @@ $checked{'DNS'}{'Automatic'} = ''; $checked{'DNS'}{'Manual'} = ''; $checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'"; -&Header::openpage($Lang::tr{'ppp setup'}, 1, ''); +$checked{'IPTV'}{'enable'} = ''; +$checked{'IPTV'}{'disable'} = ''; +$checked{'IPTV'}{$pppsettings{'IPTV'}} = "checked='checked'"; + +if ($pppsettings{'INET_VLAN'} eq '') { $pppsettings{'INET_VLAN'}='7'; } +if ($pppsettings{'IPTV_VLAN'} eq '') { $pppsettings{'IPTV_VLAN'}='8'; } +&Header::openpage($Lang::tr{'ppp setup'}, 1, ''); &Header::openbigbox('100%', 'left', '', $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(); + &Header::closebigbox(); + + &Header::closepage(); + exit(1); +} + if ($errormessage) { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "$errormessage\n"; - print " \n"; - &Header::closebox(); + &Header::openbox('100%', 'center', $Lang::tr{'error messages'}); + print "$errormessage\n"; + print " \n"; + &Header::closebox(); } @@ -478,633 +453,427 @@ if ($errormessage) { ### Box for selecting profile ### print "
\n"; -&Header::openbox('100%', 'left', $Lang::tr{'profiles'}); +&Header::openbox('100%', 'center', $Lang::tr{'profile'}); print < + - - + - - - + + + +
$Lang::tr{'profile'}: - $Lang::tr{'profile'} +
+

+
END ; + &Header::closebox(); -&Header::openbox('100%', 'left', $Lang::tr{'connection'}.':'); +&Header::openbox('100%', 'center', $Lang::tr{'connection'}); + print < + - - + + END ; -} - print <Fritz!DSL - - - - - - - - + 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\n"; - } else { - print "\t\n"; - } } + print ""; + +#if (-f "/proc/bus/usb/devices") { +# +# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`; +# if ($usb eq '') { +# print "\t\n"; +# } else { +# print "\t\n"; +# } +#} + if ($pppsettings{'TYPE'}) { - print "
$Lang::tr{'interface'}: - $Lang::tr{'interface'}: +
USB:$Lang::tr{'not running'}
$usb
USB:$Lang::tr{'not running'}
$usb
"; - if ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn)$/) { - print <"; + + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) { + print < - - + + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print <COM1 + + + + + + + + + + END ; - } elsif ($pppsettings{'TYPE'} eq 'isdn') { - print <$Lang::tr{'isdn1'} - - + if ($pppsettings{'TYPE'} ne 'serial' ) { + print <$Lang::tr{'usb modem on acm0'} + + + END ; - } - if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { - print <$Lang::tr{'computer to modem rate'} - + } + print " "} + if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) { + print < + + END ; - } else { - print "\n"; - } - if ($pppsettings{'TYPE'} =~ /^(modem|isdn)$/ ) { - print "\n"; - print "\n"; - if ($pppsettings{'TYPE'} eq 'modem' ) { - print "\n"; - print "\n"; - } else { - print "\n"; - } - } - } - if ($pppsettings{'TYPE'} eq 'modem') { - print <\n"; + print "\n"; + if ($pppsettings{'TYPE'} eq 'modem' ) { + print "\n"; + print "\n"; + } + } + } + if ($pppsettings{'TYPE'} eq 'modem') { + print < - - - - + + -END -; -} - -print < - - - - -END -; - if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) { - $pppsettings{'AUTOCONNECT'} = 'on'; - print "\n"; - print "\n"; - } else { - print "\n"; - print "\n"; - } -print <$Lang::tr{'connection debugging'}: - + + - + + - + + -END -; -if ($pppsettings{'TYPE'} ne 'isdn') { -print < - - - + + END ; } -print < - - - - +print < - - - - + + -END -; - -if ($pppsettings{'TYPE'} eq 'isdn') { - print < -


$Lang::tr{'interface'}:$Lang::tr{'interface'}:$Lang::tr{'computer to modem rate'}
 
$Lang::tr{'number'}$Lang::tr{'modem speaker on'}
 
$Lang::tr{'number'}
$Lang::tr{'modem speaker on'}
$Lang::tr{'dialing mode'}$Lang::tr{'send cr'}$Lang::tr{'dialing mode'}
$Lang::tr{'idle timeout'} 
$Lang::tr{'connect on ipfire restart'}
$Lang::tr{'connect on ipfire restart'}$Lang::tr{'optional at cmd'} 1 *

$Lang::tr{'reconnection'}:		$Lang::tr{'optional at cmd'} 2 *
- $Lang::tr{'manual'}$Lang::tr{'optional at cmd'} 3 *
- $Lang::tr{'persistent'}$Lang::tr{'backupprofile'}: - $Lang::tr{'send cr'}
- $Lang::tr{'dod'}$Lang::tr{'dod for dns'}
$Lang::tr{'holdoff'}:$Lang::tr{'maximum retries'}$Lang::tr{'idle timeout'}
+ + + + + + - + - - - - - + + END ; -} - -if ($pppsettings{'TYPE'} eq 'pptp') -{ +if ($pppsettings{'TYPE'} ne 'isdn') { print < - -
$Lang::tr{'connection debugging'}:



$Lang::tr{'isdn settings'}		$Lang::tr{'reconnection'}:
$Lang::tr{'use ibod'}$Lang::tr{'use dov'}
$Lang::tr{'dod'}
- - - - - - - - - - - - - - - - - - - - - + + + + + +

$Lang::tr{'pptp settings'}
$Lang::tr{'phonebook entry'}
$Lang::tr{'static ip'}$Lang::tr{'router ip'}
 
$Lang::tr{'dhcp mode'}$Lang::tr{'hostname'}: *
$Lang::tr{'persistent'}
$Lang::tr{'backupprofile'}: - - + for ($c = 1; $c <= $maxprofiles; $c++) { + print "\t\n"; + } + print < END ; } -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ - print < -

$Lang::tr{'pppoe settings'}
- - + + + - - - - + + - - + + END ; -} -if ($pppsettings{'TYPE'} eq 'bewanadsl') + +if ($pppsettings{'TYPE'} eq 'pptp') { + print < - - - + - - + + -END -; -} -if ($pppsettings{'TYPE'} =~ /^(3cp4218usbadsl|bewanadsl)$/) -{ -print < - - - - - - - - - + + END ; } -if ($pppsettings{'TYPE'} eq 'eagleusbadsl') +if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/) { + print < - - - - - - - -END -; -} -if ($pppsettings{'TYPE'} eq 'eciadsl') -{ -print <$Lang::tr{'adsl settings'}: - - + + - - - -END -; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ -print < - - -END -; -} -if ($pppsettings{'TYPE'} eq 'alcatelusb') -{ - print ""; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/) -{ -print <$Lang::tr{'encapsulation'}: - + + + + END ; } -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|fritzdsl|bewanadsl|eagleusbadsl)$/) -{ + + if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) { print < - - + - - - END ; -} -if ($pppsettings{'TYPE'} eq 'alcatelusb') -{ - print ""; -} - -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl|fritzdsl)$/) -{ - if ($pppsettings{'TYPE'} ne 'fritzdsl') - { + if ( -e '/opt/pakfire/db/installed/meta-igmpproxy'){ print <$Lang::tr{'encapsulation'}: - - - - - - + + + + + + + + + + + + + + END ; } + else { + print ""; + } } -if ($pppsettings{'TYPE'} =~ /^(pppoe|alcatelusb|alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/) + +if ($pppsettings{'TYPE'} eq 'pppoe' || $pppsettings{'TYPE'} eq 'pppoeatm' || $pppsettings{'TYPE'} eq 'vdsl') { print < - - - - - + - - - - - + + + + + + + + - END ; } -if ($pppsettings{'TYPE'} =~ /^(alcatelusbk|amedynusbadsl|conexantusbadsl|conexantpciadsl|3cp4218usbadsl|pulsardsl|eciadsl|bewanadsl|eagleusbadsl)$/) -{ + print < - - - - - - - - - - - - - - - + - - - - - - - - - - - -END -; - if ($pppsettings{'TYPE'} =~ /^(eciadsl|eagleusbadsl)$/) - { -print < - - + + - - - - - + + END ; - } -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk|eciadsl|fritzdsl)$/) { - print ""; -} -if ($pppsettings{'TYPE'} =~ /^(alcatelusb|alcatelusbk)$/) { - my $speedtouch = &Header::speedtouchversion; - if (($speedtouch >= 0) && ($speedtouch <=4)) { - my $modem; - if ($speedtouch ==4) { $modem='v4_b'; } else { $modem='v0123'; } - print ""; - if (-e "${General::swroot}/alcatelusb/firmware.$modem.bin") { - print "\n"; - } else { - print "\n"; - } - } else { - print ""; - } -} elsif ($pppsettings{'TYPE'} eq 'eciadsl') { - print ""; - if (-e "${General::swroot}/eciadsl/synch.bin") { - print "\n"; - } else { - print "\n"; } -} elsif ($pppsettings{'TYPE'} eq 'fritzdsl') { - print ""; - if (-e "/lib/modules/$kernel/misc/fcdslusb.o.gz") { - print "\n"; - } else { - print "\n"; } -} + print < -

$Lang::tr{'adsl settings'}:
$Lang::tr{'dod for dns'}
$Lang::tr{'vpi number'}$Lang::tr{'vci number'}$Lang::tr{'holdoff'}:
 
$Lang::tr{'maximum retries'}


$Lang::tr{'modem'}: - Bewan ADSL PCI stBewan ADSL USB st$Lang::tr{'pptp settings'}
 
Peer
$Lang::tr{'modulation'}:$Lang::tr{'automatic'}ANSI T1.483G.DMTG.Lite
 
My Netconfig
$Lang::tr{'country'}: -
 
$Lang::tr{'modem'}: - $Lang::tr{'encapsulation'}: + +
 
$Lang::tr{'protocol'}: - RFC2364 PPPoA 
- - $Lang::tr{'vpi number'}$Lang::tr{'vci number'}
 
IPTV:
  - RFC 1483 / 2684 
- -
 
$Lang::tr{'on'}
$Lang::tr{'off'}
INET_VLANIPTV_VLAN
No IPTV possible install addon igmpproxy


  PPPoE plugin$Lang::tr{'service name'} *$Lang::tr{'pppoe settings'}
  $Lang::tr{'pppoe'}$Lang::tr{'concentrator name'} *$Lang::tr{'service name'} *
$Lang::tr{'concentrator name'} *


 
  $Lang::tr{'static ip'}$Lang::tr{'static ip'}:
  $Lang::tr{'gateway ip'}:MTU/MRU
  $Lang::tr{'netmask'}:
  $Lang::tr{'broadcast'}: *
 
MTU
  $Lang::tr{'dhcp mode'}$Lang::tr{'hostname'}: *MRU
 
$Lang::tr{'firmware'}:$Lang::tr{'present'} 
$Lang::tr{'not present'} 
$Lang::tr{'unknown'} Rev $speedtouch
$Lang::tr{'driver'}:$Lang::tr{'present'} 
$Lang::tr{'not present'} 
$Lang::tr{'driver'}:$Lang::tr{'present'} 
$Lang::tr{'not present'} 
+ - + - - - - + + + + - - + - - + + + -



$Lang::tr{'authentication'}		$Lang::tr{'authentication'}
$Lang::tr{'username'}$Lang::tr{'password'}$Lang::tr{'username'}$Lang::tr{'password'}
$Lang::tr{'method'}$Lang::tr{'method'}$Lang::tr{'script name'} *$Lang::tr{'script name'} *
- + - + - + - - - - - + - + + + + + - - - - + + - + - - + +



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

$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 @@ -1120,88 +889,73 @@ 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 ("/bin/touch", "${General::swroot}/ppp/updatesettings"); - if ($pppsettings{'TYPE'} eq 'eagleusbadsl') { - # eagle-usb.conf is in backup but link DSPcode.bin can't, so the link is created in rc.eagleusbadsl - open(FILE, ">/${General::swroot}/eagle-usb/eagle-usb.conf") or die "Unable to write eagle-usb.conf file"; - flock(FILE, 2); - # decimal to hexa - $modemsettings{'VPI'} = uc(sprintf('%X', $pppsettings{'VPI'})); - $modemsettings{'VCI'} = uc(sprintf('%X', $pppsettings{'VCI'})); - if( $pppsettings{'PROTOCOL'} eq 'RFC1483') { - $modemsettings{'Encapsulation'} =1+$pppsettings{'ENCAP'} - } elsif ( $pppsettings{'PROTOCOL'} eq 'RFC2364') { - $modemsettings{'Encapsulation'} =6-$pppsettings{'ENCAP'} - } - print FILE "\n"; - print FILE "VPI=$modemsettings{'VPI'}\n"; - print FILE "VCI=$modemsettings{'VCI'}\n"; - print FILE "Encapsulation=$modemsettings{'Encapsulation'}\n"; - print FILE "Linetype=0A\n"; - print FILE "RatePollFreq=00000009\n"; - print FILE "\n"; - close FILE; - } + # 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'; - $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 ISDN settings so we can see if ISDN is enabled or not. - $isdnsettings{'ENABLED'} = 'off'; - &General::readhash("${General::swroot}/isdn/settings", \%isdnsettings); - - # 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'} =~ /^(2|3|6|7)$/) { - $pppsettings{'TYPE'}=lc($netsettings{'RED_TYPE'}); - } elsif ($isdnsettings{'ENABLED'} eq 'on') { - $pppsettings{'TYPE'}='isdn'; - } 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'; + $pppsettings{'INET_VLAN'} = '7'; + $pppsettings{'IPTV_VLAN'} = '8'; + + 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'; + } }