###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
&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|pppoeatm)$/) {
- $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|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'} 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'} =~ /^(pppoeatm)$/) {
- 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{'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'}; }
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'} = '';
$selected{'COMPORT'}{'ttyS2'} = '';
$selected{'COMPORT'}{'ttyS3'} = '';
$selected{'COMPORT'}{'ttyS4'} = '';
-if ( $pppsettings{'TYPE'} ne '' ){
$selected{'COMPORT'}{'ttyACM0'} = '';
$selected{'COMPORT'}{'ttyACM1'} = '';
$selected{'COMPORT'}{'ttyACM2'} = '';
-$selected{'COMPORT'}{'ttyACM3'} = '';}
+$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'} = '';
$checked{'DIALONDEMANDDNS'}{$pppsettings{'DIALONDEMANDDNS'}} = "checked='checked'";
$checked{'AUTOCONNECT'}{'off'} = '';
-$checked{'AUTOCONNECT'}{'on'} = '';
+$checked{'AUTOCONNECT'}{'on'} = '';
$checked{'AUTOCONNECT'}{$pppsettings{'AUTOCONNECT'}} = "checked='checked'";
$checked{'SENDCR'}{'off'} = '';
$checked{'METHOD'}{'STATIC'} = '';
$checked{'METHOD'}{'PPPOE'} = '';
-$checked{'METHOD'}{'PPPOE_PLUGIN'} = '';
$checked{'METHOD'}{'DHCP'} = '';
$checked{'METHOD'}{$pppsettings{'METHOD'}} = "checked='checked'";
$checked{'DNS'}{'Manual'} = '';
$checked{'DNS'}{$pppsettings{'DNS'}} = "checked='checked'";
+$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 ($errormessage) {
+if ($netsettings{'RED_TYPE'} ne 'PPPOE') {
+ $errormessage = $Lang::tr{'dialup red not ppp'};
&Header::openbox('100%', 'center', $Lang::tr{'error messages'});
- print "<CLASS name='base'>$errormessage\n";
- print " </CLASS>\n";
- &Header::closebox();
+ print "<CLASS name='base'>$errormessage\n";
+ print " </CLASS>\n";
+ &Header::closebox();
+ &Header::closebigbox();
+
+ &Header::closepage();
+ exit(1);
+}
+
+if ($errormessage) {
+ &Header::openbox('100%', 'center', $Lang::tr{'error messages'});
+ print "<CLASS name='base'>$errormessage\n";
+ print " </CLASS>\n";
+ &Header::closebox();
}
print <<END
<table width='95%' cellspacing='0'>
<tr>
- <td align='left'>$Lang::tr{'profile'}</td>
- <td align='left'>
- <select name='PROFILE' style="width: 165px">
+ <td align='left'>$Lang::tr{'profile'}</td>
+ <td align='left'>
+ <select name='PROFILE' style="width: 165px">
END
;
for ($c = 1; $c <= $maxprofiles; $c++)
{
- print "\t<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
+ print "\t<option value='$c' $selected{'PROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
}
print <<END
- </select></td>
- <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'select'}' /></td>
- <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'delete'}' /></td>
- <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'restore'}' /></td>
+ </select></td>
+ <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'select'}' /></td>
+ <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'delete'}' /></td>
+ <td align='left'><input type='submit' name='ACTION' value='$Lang::tr{'restore'}' /></td>
</tr>
</table>
<br></br>
print <<END
<table width='95%' cellspacing='0'>
<tr>
- <td width='25%'>$Lang::tr{'interface'}:</td>
- <td width='25%'>
- <select name='TYPE' style="width: 165px">
+ <td width='25%'>$Lang::tr{'interface'}:</td>
+ <td width='25%'>
+ <select name='TYPE' style="width: 165px">
+END
+;
+if ($netsettings{'RED_TYPE'} eq 'PPPOE' ) {
+print <<END
<option value='modem' $selected{'TYPE'}{'modem'}>$Lang::tr{'modem'}</option>
<option value='serial' $selected{'TYPE'}{'serial'}>$Lang::tr{'serial'}</option>
+ <option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>
+ <option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>
+ <option value='vdsl' $selected{'TYPE'}{'vdsl'}>VDSL</option>
END
;
-if ($netsettings{'RED_TYPE'} eq 'PPPOE') {
- print "\t<option value='pppoe' $selected{'TYPE'}{'pppoe'}>PPPoE</option>\n";
-}
-if ($netsettings{'RED_TYPE'} eq 'PPTP') {
- print "\t<option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>\n";
-}
-my $atmdev=`cat /proc/net/atm/devices | grep 0`;
+
+my $atmdev=`cat /proc/net/atm/devices 2>/dev/null | grep 0`;
chomp ($atmdev);
if ($atmdev ne '') {
- print <<END
- <option value='pppoeatm' $selected{'TYPE'}{'pppoeatm'}>PPPoE over ATM-BRIDGE</option>
+ print <<END
+ <option value='pppoeatm' $selected{'TYPE'}{'pppoeatm'}>PPPoE over ATM-BRIDGE</option>
+ <option value='pptpatm' $selected{'TYPE'}{'pptpatm'}>PPTP over ATM-BRIDGE</option>
END
;
}
-
+}
#if (0) {
-# print <<END
-# <option value='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI USB ADSL</option>
-# <option value='eagleusbadsl' $selected{'TYPE'}{'eagleusbadsl'}>Eagle USB ADSL (Acer Allied-Telesyn Comtrend D-Link Sagem USR)</option>
-# <option value='conexantusbadsl' $selected{'TYPE'}{'conexantusbadsl'}>Conexant USB(Aetra Amigo Draytek Etec Mac Olitec Vitelcom Zoom)</option>
-# <option value='amedynusbadsl' $selected{'TYPE'}{'amedynusbadsl'}>Zyxel 630-11 / Asus AAM6000UG USB ADSL</option>
-# <option value='3cp4218usbadsl' $selected{'TYPE'}{'3cp4218usbadsl'}>3Com USB AccessRunner</option>
-# <option value='alcatelusb' $selected{'TYPE'}{'alcatelusb'}>Speedtouch USB ADSL user mode driver</option>
-# <option value='alcatelusbk' $selected{'TYPE'}{'alcatelusbk'}>Speedtouch USB ADSL kernel mode driver</option>
+# print <<END
+# <option value='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI USB ADSL</option>
+# <option value='eagleusbadsl' $selected{'TYPE'}{'eagleusbadsl'}>Eagle USB ADSL (Acer Allied-Telesyn Comtrend D-Link Sagem USR)</option>
+# <option value='conexantusbadsl' $selected{'TYPE'}{'conexantusbadsl'}>Conexant USB(Aetra Amigo Draytek Etec Mac Olitec Vitelcom Zoom)</option>
+# <option value='amedynusbadsl' $selected{'TYPE'}{'amedynusbadsl'}>Zyxel 630-11 / Asus AAM6000UG USB ADSL</option>
+# <option value='3cp4218usbadsl' $selected{'TYPE'}{'3cp4218usbadsl'}>3Com USB AccessRunner</option>
+# <option value='alcatelusb' $selected{'TYPE'}{'alcatelusb'}>Speedtouch USB ADSL user mode driver</option>
+# <option value='alcatelusbk' $selected{'TYPE'}{'alcatelusbk'}>Speedtouch USB ADSL kernel mode driver</option>
#END
#;
#}
-# print "<option value='fritzdsl' $selected{'TYPE'}{'fritzdsl'}>Fritz!DSL</option>";
+# print "<option value='fritzdsl' $selected{'TYPE'}{'fritzdsl'}>Fritz!DSL</option>";
- print <<END
+ print <<END
</select></td>
- <td colspan='1' width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}'></td>
+ <td colspan='1' width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}'></td>
END
;
- if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
- print <<END
- <td colspan='1' width='25%'><A HREF=modem.cgi>$Lang::tr{'modem configuration'}</A></td>
+ if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
+ print <<END
+
<td colspan='1' width='25%'><A HREF=modem.cgi>$Lang::tr{'modem configuration'}</A></td>
END
;
}
- print "</tr>";
+ print "</tr>";
#if (-f "/proc/bus/usb/devices") {
-# <td colspan='2' width='50%'>USB:</td>
-# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`;
-# if ($usb eq '') {
-# print "\t<td colspan='2' width='50%'>$Lang::tr{'not running'}</td></tr>\n";
-# } else {
-# print "\t<td colspan='2' width='50%'>$usb</td></tr>\n";
-# }
+# <td colspan='2' width='50%'>USB:</td>
+# my $usb=`lsmod | cut -d ' ' -f1 | grep -E "hci"`;
+# if ($usb eq '') {
+# print "\t<td colspan='2' width='50%'>$Lang::tr{'not running'}</td></tr>\n";
+# } else {
+# print "\t<td colspan='2' width='50%'>$usb</td></tr>\n";
+# }
#}
if ($pppsettings{'TYPE'}) {
- print "<tr><td colspan='4' width='100%'><br></br></td></tr>";
+ print "<tr><td colspan='4' width='100%'><br></br></td></tr>";
- if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) {
- print <<END
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/) {
+ print <<END
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'interface'}:</td>
- <td width='25%'><select name='COMPORT' style="width: 165px">
+ <td colspan='3' width='75%'>$Lang::tr{'interface'}:</td>
+ <td width='25%'><select name='COMPORT' style="width: 165px">
END
;
- if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
- print <<END
- <option value='ttyS0' $selected{'COMPORT'}{'ttyS0'}>$Lang::tr{'modem on com1'}</option>
- <option value='ttyS1' $selected{'COMPORT'}{'ttyS1'}>$Lang::tr{'modem on com2'}</option>
- <option value='ttyS2' $selected{'COMPORT'}{'ttyS2'}>$Lang::tr{'modem on com3'}</option>
- <option value='ttyS3' $selected{'COMPORT'}{'ttyS3'}>$Lang::tr{'modem on com4'}</option>
- <option value='ttyS4' $selected{'COMPORT'}{'ttyS4'}>$Lang::tr{'modem on com5'}</option>
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
+ print <<END
+ <option value='ttyS0' $selected{'COMPORT'}{'ttyS0'}>COM1</option>
+ <option value='ttyS1' $selected{'COMPORT'}{'ttyS1'}>COM2</option>
+ <option value='ttyS2' $selected{'COMPORT'}{'ttyS2'}>COM3</option>
+ <option value='ttyS3' $selected{'COMPORT'}{'ttyS3'}>COM4</option>
+ <option value='ttyS4' $selected{'COMPORT'}{'ttyS4'}>COM5</option>
+ <option value='ttyUSB0' $selected{'COMPORT'}{'ttyUSB0'}>ttyUSB0</option>
+ <option value='ttyUSB1' $selected{'COMPORT'}{'ttyUSB1'}>ttyUSB1</option>
+ <option value='ttyUSB2' $selected{'COMPORT'}{'ttyUSB2'}>ttyUSB2</option>
+ <option value='ttyUSB3' $selected{'COMPORT'}{'ttyUSB3'}>ttyUSB3</option>
+ <option value='rfcomm0' $selected{'COMPORT'}{'rfcomm0'}>rfcomm0 (bluetooth)</option>
+ <option value='rfcomm1' $selected{'COMPORT'}{'rfcomm1'}>rfcomm1 (bluetooth)</option>
END
;
- if ($pppsettings{'TYPE'} ne 'serial' ) {
- print <<END
- <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>$Lang::tr{'usb modem on acm0'}</option>
- <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>$Lang::tr{'usb modem on acm1'}</option>
- <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option>
- <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option>
+ if ($pppsettings{'TYPE'} ne 'serial' ) {
+ print <<END
+ <option value='ttyACM0' $selected{'COMPORT'}{'ttyACM0'}>$Lang::tr{'usb modem on acm0'}</option>
+ <option value='ttyACM1' $selected{'COMPORT'}{'ttyACM1'}>$Lang::tr{'usb modem on acm1'}</option>
+ <option value='ttyACM2' $selected{'COMPORT'}{'ttyACM2'}>$Lang::tr{'usb modem on acm2'}</option>
+ <option value='ttyACM3' $selected{'COMPORT'}{'ttyACM3'}>$Lang::tr{'usb modem on acm3'}</option>
END
;
- }
- print "</select></td> "}
- if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
- print <<END
+ }
+ print "</select></td> "}
+ if ($pppsettings{'TYPE'} =~ /^(modem|serial)$/ ) {
+ print <<END
<tr>
<td colspan='3' width='75%'>$Lang::tr{'computer to modem rate'}</td>
- <td width='25%'><select name='DTERATE' style="width: 165px">
- <option value='9600' $selected{'DTERATE'}{'9600'}>9600</option>
- <option value='19200' $selected{'DTERATE'}{'19200'}>19200</option>
- <option value='38400' $selected{'DTERATE'}{'38400'}>38400</option>
- <option value='57600' $selected{'DTERATE'}{'57600'}>57600</option>
- <option value='115200' $selected{'DTERATE'}{'115200'}>115200</option>
- <option value='230400' $selected{'DTERATE'}{'230400'}>230400</option>
- <option value='460800' $selected{'DTERATE'}{'460800'}>460800</option>
- <option value='921600' $selected{'DTERATE'}{'921600'}>921600</option>
- </select></td>
+ <td width='25%'><select name='DTERATE' style="width: 165px">
+ <option value='9600' $selected{'DTERATE'}{'9600'}>9600</option>
+ <option value='19200' $selected{'DTERATE'}{'19200'}>19200</option>
+ <option value='38400' $selected{'DTERATE'}{'38400'}>38400</option>
+ <option value='57600' $selected{'DTERATE'}{'57600'}>57600</option>
+ <option value='115200' $selected{'DTERATE'}{'115200'}>115200</option>
+ <option value='230400' $selected{'DTERATE'}{'230400'}>230400</option>
+ <option value='460800' $selected{'DTERATE'}{'460800'}>460800</option>
+ <option value='921600' $selected{'DTERATE'}{'921600'}>921600</option>
+ </select></td>
</tr>
END
;
- }
- if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) {
- print "<tr><td colspan='3' width='75%'>$Lang::tr{'number'}</td>\n";
- print "<td width='25%'><input type='text' name='TELEPHONE' value='$pppsettings{'TELEPHONE'}'></td><tr>\n";
- if ($pppsettings{'TYPE'} eq 'modem' ) {
- print "<tr><td colspan='3' width='75%'>$Lang::tr{'modem speaker on'}</td>\n";
- print "<td width='25%'><input type='checkbox' name='SPEAKER' $checked{'SPEAKER'}{'on'} /></td></tr>\n";
- }
- }
- }
- if ($pppsettings{'TYPE'} eq 'modem') {
- print <<END
+ }
+ if ($pppsettings{'TYPE'} =~ /^(modem)$/ ) {
+ print "<tr><td colspan='3' width='75%'>$Lang::tr{'number'}</td>\n";
+ print "<td width='25%'><input type='text' name='TELEPHONE' value='$pppsettings{'TELEPHONE'}'></td><tr>\n";
+ if ($pppsettings{'TYPE'} eq 'modem' ) {
+ print "<tr><td colspan='3' width='75%'>$Lang::tr{'modem speaker on'}</td>\n";
+ print "<td width='25%'><input type='checkbox' name='SPEAKER' $checked{'SPEAKER'}{'on'} /></td></tr>\n";
+ }
+ }
+ }
+ if ($pppsettings{'TYPE'} eq 'modem') {
+ print <<END
+<tr>
+ <td colspan='3' width='75%'>$Lang::tr{'dialing mode'}</td>
+ <td width='25%'><select name='DIALMODE' style="width: 165px">
+ <option value='T' $selected{'DIALMODE'}{'T'}>$Lang::tr{'tone'}</option>
+ <option value='P' $selected{'DIALMODE'}{'P'}>$Lang::tr{'pulse'}</option>
+ </select></td>
+</tr>
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'dialing mode'}</td>
- <td width='25%'><select name='DIALMODE' style="width: 165px">
- <option value='T' $selected{'DIALMODE'}{'T'}>$Lang::tr{'tone'}</option>
- <option value='P' $selected{'DIALMODE'}{'P'}>$Lang::tr{'pulse'}</option>
- </select></td>
+ <td colspan='3' width='75%'>$Lang::tr{'optional at cmd'} 1 <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='ADD_AT1' value='$pppsettings{'ADD_AT1'}'></td>
+</tr>
+<tr>
+ <td colspan='3' width='75%'>$Lang::tr{'optional at cmd'} 2 <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='ADD_AT2' value='$pppsettings{'ADD_AT2'}'></td>
+</tr>
+<tr>
+ <td colspan='3' width='75%'>$Lang::tr{'optional at cmd'} 3 <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='ADD_AT3' value='$pppsettings{'ADD_AT3'}'></td>
</tr>
<tr>
<td colspan='3' width='75%'>$Lang::tr{'send cr'}</td>
- <td width='50%'><input type='checkbox' name='SENDCR' $checked{'SENDCR'}{'on'} /></td>
+ <td width='50%'><input type='checkbox' name='SENDCR' $checked{'SENDCR'}{'on'} /></td>
</tr>
END
-;
+;
}
print <<END
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'idle timeout'}</td>
- <td width='25%'><input type='text' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
+ <td colspan='3' width='75%'>$Lang::tr{'idle timeout'}</td>
+ <td width='25%'><input type='text' name='TIMEOUT' value='$pppsettings{'TIMEOUT'}' /></td>
</tr>
<tr>
<td colspan='3' width='75%'>$Lang::tr{'connection debugging'}:</td>
- <td width='25%'><input type='checkbox' name='DEBUG' $checked{'DEBUG'}{'on'} /></td>
+ <td width='25%'><input type='checkbox' name='DEBUG' $checked{'DEBUG'}{'on'} /></td>
</tr>
<tr>
<td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'reconnection'}:</b></td>
+ <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'reconnection'}:</b></td>
</tr>
<tr>
- <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='dialondemand' $checked{'RECONNECTION'}{'dialondemand'}>$Lang::tr{'dod'}</td>
+ <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='dialondemand' $checked{'RECONNECTION'}{'dialondemand'}>$Lang::tr{'dod'}</td>
</tr>
END
;
if ($pppsettings{'TYPE'} ne 'isdn') {
print <<END
<tr>
- <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
+ <td colspan='4' width='100%'><input type='radio' name='RECONNECTION' value='persistent' $checked{'RECONNECTION'}{'persistent'}>$Lang::tr{'persistent'}</td>
</tr>
<tr>
<td colspan='3' width='75%'>$Lang::tr{'backupprofile'}:</td>
- <td width='25%'><select name='BACKUPPROFILE' style="width: 165px">
+ <td width='25%'><select name='BACKUPPROFILE' style="width: 165px">
END
;
- for ($c = 1; $c <= $maxprofiles; $c++) {
- print "\t<option value='$c' $selected{'BACKUPPROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
- }
- print <<END
- </select></td>
+ for ($c = 1; $c <= $maxprofiles; $c++) {
+ print "\t<option value='$c' $selected{'BACKUPPROFILE'}{$c}>$c. $profilenames[$c]</option>\n";
+ }
+ print <<END
+ </select></td>
</tr>
END
;
}
print <<END
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
+ <td colspan='3' width='75%'>$Lang::tr{'dod for dns'}</td>
<td width='25%'><input type='checkbox' name='DIALONDEMANDDNS' $checked{'DIALONDEMANDDNS'}{'on'} /></td>
</tr>
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'holdoff'}:</td>
- <td width='25%'><input type='text' name='HOLDOFF' value='$pppsettings{'HOLDOFF'}' /></td>
+ <td colspan='3' width='75%'>$Lang::tr{'holdoff'}:</td>
+ <td width='25%'><input type='text' name='HOLDOFF' value='$pppsettings{'HOLDOFF'}' /></td>
</tr>
<tr>
- <td colspan='3' width='75%'>$Lang::tr{'maximum retries'}</td>
- <td width='25%'><input type='text' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
+ <td colspan='3' width='75%'>$Lang::tr{'maximum retries'}</td>
+ <td width='25%'><input type='text' name='MAXRETRIES' value='$pppsettings{'MAXRETRIES'}' /></td>
</tr>
END
;
if ($pppsettings{'TYPE'} eq 'pptp')
{
+
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
+ <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pptp settings'}</b></td>
</tr>
<tr>
- <td width='25%'>$Lang::tr{'phonebook entry'}</td>
- <td colspan='2' width='50%'></td>
- <td width='25%'><input type='text' name='PHONEBOOK' value='$pppsettings{'PHONEBOOK'}' /></td>
+ <td width='25%'>Peer</td>
+ <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='STATIC' $checked{'METHOD'}{'STATIC'} />$Lang::tr{'static ip'}</td>
- <td colspan='2' width='50%'>$Lang::tr{'router ip'}</td>
- <td width='25%'><input type='text' name='ROUTERIP' value='$pppsettings{'ROUTERIP'}' /></td>
-</tr>
-<tr>
- <td width='25%'><input type='radio' name='METHOD' value='DHCP' $checked{'METHOD'}{'DHCP'} />$Lang::tr{'dhcp mode'}</td>
- <td colspan='2' width='50%'>$Lang::tr{'hostname'}: <img src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='DHCP_HOSTNAME' value='$pppsettings{'DHCP_HOSTNAME'}' /></td>
+ <td width='25%'>My Netconfig</td>
+ <td colspan='3'><input size=50 type='text' name='PPTP_NICCFG' value='$pppsettings{'PPTP_NICCFG'}' /></td>
</tr>
END
;
}
-if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/)
+
+if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)
{
print <<END
-</table>
-<table width='100%'>
<tr>
- <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
-</tr>
+ <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'adsl settings'}:</b></td>
<tr>
- <td> $Lang::tr{'encapsulation'}:</td>
- <td colspan='2' width='30%'>
- <select name='ENCAP'>
- <option value='0' $selected{'ENCAP'}{'0'}>LLC</option>
- <option value='1' $selected{'ENCAP'}{'1'}>VCmux</option>
- </select>
- </td>
+ <td> $Lang::tr{'encapsulation'}:</td>
+ <td colspan='2' width='30%'>
+ <select name='ENCAP'>
+ <option value='0' $selected{'ENCAP'}{'0'}>LLC</option>
+ <option value='1' $selected{'ENCAP'}{'1'}>VCmux</option>
+ </select>
+ </td>
</tr>
<tr>
- <td nowrap='nowrap'>$Lang::tr{'vpi number'}</td>
- <td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
- <td align='right'>$Lang::tr{'vci number'}</td>
- <td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
+ <td nowrap='nowrap'>$Lang::tr{'vpi number'}</td>
+ <td><input type='text' size='5' name='VPI' value='$pppsettings{'VPI'}' /></td>
+ <td align='right'>$Lang::tr{'vci number'}</td>
+ <td colspan='2'><input type='text' size='5' name='VCI' value='$pppsettings{'VCI'}' /></td>
</tr>
END
;
-}
+}
+
+ if ($pppsettings{'TYPE'} =~ /^(pppoe|vdsl|pppoeatm)$/) {
+print <<END
+<tr>
+ <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>IPTV:</b></td>
+</tr>
+END
+;
+ if ( -e '/opt/pakfire/db/installed/meta-igmpproxy'){
+print <<END
+ <tr>
+ <td colspan='3' width='100%'><input type='radio' name='IPTV' value='enable' $checked{'IPTV'}{'enable'}>$Lang::tr{'on'}</td>
+ <td colspan='1' rowspan='2' width='100%'><textarea name='IPTVSERVERS' cols='16' wrap='off'>
+END
+;
+ print $pppsettings{'IPTVSERVERS'};
+print <<END
+</textarea></td>
+ </tr>
+ <tr>
+ <td colspan='3' width='100%'><input type='radio' name='IPTV' value='disable' $checked{'IPTV'}{'disable'}>$Lang::tr{'off'}</td>
+ </tr>
+ <tr>
+ <td>INET_VLAN</td>
+ <td><input size=5 type='number' name='INET_VLAN' value='$pppsettings{'INET_VLAN'}' /></td>
+ <td>IPTV_VLAN</td>
+ <td><input size=5 type='number' name='IPTV_VLAN' value='$pppsettings{'IPTV_VLAN'}' /></td>
+ </tr>
+END
+;
+ }
+ else {
+ print "<tr><td colspan='4' width='100%'>No IPTV possible install addon igmpproxy</td></tr>";
+ }
+}
-if ($pppsettings{'TYPE'} eq 'pppoe' || $pppsettings{'TYPE'} eq 'pppoeatm')
+if ($pppsettings{'TYPE'} eq 'pppoe' || $pppsettings{'TYPE'} eq 'pppoeatm' || $pppsettings{'TYPE'} eq 'vdsl')
{
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
+ <td colspan='4' width='100%' bgcolor='$color{'color20'}'><b>$Lang::tr{'pppoe settings'}</b></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE_PLUGIN' $checked{'METHOD'}{'PPPOE_PLUGIN'} />PPPoE plugin</td>
- <td colspan='2' width='50%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
+ <td width='25%'>$Lang::tr{'service name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
+ <td width='25%'><input type='text' name='SERVICENAME' value='$pppsettings{'SERVICENAME'}' /></td>
</tr>
<tr>
- <td width='25%'><input type='radio' name='METHOD' value='PPPOE' $checked{'METHOD'}{'PPPOE'} />$Lang::tr{'pppoe'}</td>
- <td colspan='2' width='50%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
+ <td width='25%'>$Lang::tr{'concentrator name'} <img src='/blob.gif' alt='*' /></td>
+ <td colspan='2' width='50%'></td>
+ <td width='25%'><input type='text' name='CONCENTRATORNAME' value='$pppsettings{'CONCENTRATORNAME'}' /></td>
+</tr>
+END
+;
+}
+
+print <<END
+<tr><td colspan='4' width='100%'><br></br></td></tr>
+<tr>
+ <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>MTU/MRU</b></td>
+</tr>
+<tr>
+<tr>
+ <td width='25%'>MTU</td>
+ <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
</tr>
<tr>
- <td width='25%'>MTU</td>
- <td colspan='2' width='50%'></td>
- <td width='25%'><input type='text' name='MTU' value='$pppsettings{'MTU'}' /></td>
+ <td width='25%'>MRU</td>
+ <td width='25%'><input type='text' name='MRU' value='$pppsettings{'MRU'}' /></td>
</tr>
END
;
-}
print <<END
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
+ <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>$Lang::tr{'authentication'}</b></td>
</tr>
<tr>
- <td width='25%'>$Lang::tr{'username'}</td>
- <td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>
- <td width='25%'>$Lang::tr{'password'}</td>
- <td width='25%'><input type='password' name='PASSWORD' value='$pppsettings{'PASSWORD'}' /></td>
+ <td width='25%'>$Lang::tr{'username'}</td>
+ <td width='25%'><input type='text' name='USERNAME' value='$pppsettings{'USERNAME'}' /></td>
+ <td width='25%'>$Lang::tr{'password'}</td>
+ <td width='25%'><input type='password' name='PASSWORD' value='$pppsettings{'PASSWORD'}' /></td>
</tr>
<tr>
- <td width='25%'>$Lang::tr{'method'}</td>
- <td width='25%'><select name='AUTH' style="width: 165px">
- <option value='pap-or-chap' $selected{'AUTH'}{'pap-or-chap'}>$Lang::tr{'pap or chap'}</option>
- <option value='pap' $selected{'AUTH'}{'pap'}>PAP</option>
- <option value='chap' $selected{'AUTH'}{'chap'}>CHAP</option>
+ <td width='25%'>$Lang::tr{'method'}</td>
+ <td width='25%'><select name='AUTH' style="width: 165px">
+ <option value='pap-or-chap' $selected{'AUTH'}{'pap-or-chap'}>$Lang::tr{'pap or chap'}</option>
+ <option value='pap' $selected{'AUTH'}{'pap'}>PAP</option>
+ <option value='chap' $selected{'AUTH'}{'chap'}>CHAP</option>
END
;
if ($pppsettings{'TYPE'} eq 'modem') {
print <<END
- <option value='standard-login-script' $selected{'AUTH'}{'standard-login-script'}>$Lang::tr{'standard login script'}</option>
- <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'demon login script'}</option>
- <option value='other-login-script' $selected{'AUTH'}{'other-login-script'}>$Lang::tr{'other login script'}</option>
+ <option value='standard-login-script' $selected{'AUTH'}{'standard-login-script'}>$Lang::tr{'standard login script'}</option>
+ <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'demon login script'}</option>
+ <option value='other-login-script' $selected{'AUTH'}{'other-login-script'}>$Lang::tr{'other login script'}</option>
END
;
}
print <<END
- </select></td>
- <td width='25%'>$Lang::tr{'script name'} <img src='/blob.gif' alt='*' /></td>
- <td width='25%'><input type='text' name='LOGINSCRIPT' value='$pppsettings{'LOGINSCRIPT'}' /></td>
+ </select></td>
+
<td width='25%'>$Lang::tr{'script name'} <img src='/blob.gif' alt='*' /></td>
+ <td width='25%'><input type='text' name='LOGINSCRIPT' value='$pppsettings{'LOGINSCRIPT'}' /></td>
</tr>
<tr><td colspan='4' width='100%'><br></br></td></tr>
<tr>
- <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>DNS:</b></td>
+ <td bgcolor='$color{'color20'}' colspan='4' width='100%'><b>DNS:</b></td>
</tr>
<tr>
- <td colspan='4' width='100%'><input type='radio' name='DNS' value='Automatic' $checked{'DNS'}{'Automatic'} />$Lang::tr{'automatic'}</td>
+ <td colspan='4' width='100%'><input type='radio' name='DNS' value='Automatic' $checked{'DNS'}{'Automatic'} />$Lang::tr{'automatic'}</td>
</tr>
<tr>
- <td colspan='4' width='100%'><input type='radio' name='DNS' value='Manual' $checked{'DNS'}{'Manual'} />$Lang::tr{'manual'}</td>
+ <td colspan='4' width='100%'><input type='radio' name='DNS' value='Manual' $checked{'DNS'}{'Manual'} />$Lang::tr{'manual'}</td>
</tr>
<tr>
- <td width='25%'>$Lang::tr{'primary dns'}</td>
- <td width='25%'><input type='text' name='DNS1' value='$pppsettings{'DNS1'}'></td>
- <td width='25%'>$Lang::tr{'secondary dns'}</td>
- <td width='25%'><input type='text' name='DNS2' value='$pppsettings{'DNS2'}'></td>
+ <td width='25%'>$Lang::tr{'primary dns'}</td>
+ <td width='25%'><input type='text' name='DNS1' value='$pppsettings{'DNS1'}'></td>
+ <td width='25%'>$Lang::tr{'secondary dns'}</td>
+ <td width='25%'><input type='text' name='DNS2' value='$pppsettings{'DNS2'}'></td>
</tr>
<tr><td colspan='4' width='100%'><br></br><hr></hr><br></br></td></tr>
<tr>
- <td width='25%'>$Lang::tr{'profile name'}</td>
- <td width='25%'><input type='text' name='PROFILENAME' value='$pppsettings{'PROFILENAME'}'>
- <td colspan='2' width='50%'></td>
+ <td width='25%'>$Lang::tr{'profile name'}</td>
+ <td width='25%'><input type='text' name='PROFILENAME' value='$pppsettings{'PROFILENAME'}'>
+ <td colspan='2' width='50%'></td>
</tr>
<tr>
<td align='center' colspan='4' width='100%'><input type='submit' name='ACTION' value='$Lang::tr{'save'}'></td>
</tr>
<tr>
- <td colspan='2' width='50%'>$Lang::tr{'legend'}:</td>
- <td colspan='2' width='50%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
+ <td colspan='2' width='50%'>$Lang::tr{'legend'}:</td>
+
<td colspan='2' width='50%'><img src='/blob.gif' alt='*' /> $Lang::tr{'this field may be blank'}</td>
</tr>
</table>
END
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'} = '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{'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';
+ $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';
+ }
}
projects / people / pmueller / ipfire-2.x.git / blobdiff