Fix pppsetup.cgi - pppoe over atm selection

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / pppsetup.cgi

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 51693544832858cd1ce82806d7fbeec91bed3c5b..acb3c0d4e8c52c7b45001c02d3c31aa5cafe72e6 100644 (file)
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -63,7 +63,7 @@ if ($pppsettings{'ACTION'} ne '' &&
 }
 elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 {
-        unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|pppoeatm)$/) {
+        unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|pppoeatm|pptpatm)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
         my $type = $pppsettings{'TYPE'};
@@ -72,7 +72,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
 }
 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)$/) {
+        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)$/) {
@@ -142,20 +142,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 $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{'TYPE'} =~ /^(pppoeatm|pptpatm)$/) {
                 if ( ($pppsettings{'VPI'} eq '') || ($pppsettings{'VCI'} eq '') ) {
                         $errormessage = $Lang::tr{'invalid vpi vpci'};
                         goto ERROR; }
@@ -315,6 +302,8 @@ $selected{'TYPE'}{'modem'} = '';
 $selected{'TYPE'}{'serial'} = '';
 $selected{'TYPE'}{'pppoe'} = '';
 $selected{'TYPE'}{'pptp'} = '';
+$selected{'TYPE'}{'pppoeatm'} = '';
+$selected{'TYPE'}{'pptpatm'} = '';
 $selected{'TYPE'}{$pppsettings{'TYPE'}} = "selected='selected'";
 $checked{'DEBUG'}{'off'} = '';
 $checked{'DEBUG'}{'on'} = '';
@@ -325,11 +314,16 @@ $selected{'COMPORT'}{'ttyS1'} = '';
 $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'} = '';
@@ -485,6 +479,7 @@ 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>
 END
 ;
 
@@ -493,14 +488,11 @@ chomp ($atmdev);
 if ($atmdev ne '') {
         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 ($netsettings{'RED_TYPE'} eq 'PPTP') {#
-#        print "\t<option value='pptp' $selected{'TYPE'}{'pptp'}>PPTP</option>\n";
-#}
-#
 #if (0) {
 #       print <<END
 #       <option value='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI USB ADSL</option>
@@ -557,6 +549,12 @@ END
                 <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' ) {
@@ -605,6 +603,18 @@ END
                 <option value='P' $selected{'DIALMODE'}{'P'}>$Lang::tr{'pulse'}</option>
         </select></td>
 </tr>
+<tr>
+        <td colspan='3' width='75%'>$Lang::tr{'optional at cmd'}&nbsp;1&nbsp;<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'}&nbsp;2&nbsp;<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'}&nbsp;3&nbsp;<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>
@@ -669,30 +679,25 @@ 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>
 </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>
-</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>
+        <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='DHCP' $checked{'METHOD'}{'DHCP'} />$Lang::tr{'dhcp mode'}</td>
-        <td colspan='2' width='50%'>$Lang::tr{'hostname'}:&nbsp;<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
@@ -857,7 +862,8 @@ sub initprofile
         $pppsettings{'ENCAP'} = '0';
         $pppsettings{'VPI'} = '1';
         $pppsettings{'VCI'} = '32';
-        $pppsettings{'PHONEBOOK'} = 'RELAY_PPP1';
+        $pppsettings{'PPTP_PEER'} = '10.0.0.138';
+       $pppsettings{'PPTP_NICCFG'} = '10.0.0.140/24 broadcast 10.0.0.255';
         $pppsettings{'PROTOCOL'} = 'RFC2364';
         $pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
         if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) {