Add pptp options to webif

diff --git a/config/rootfiles/core/25/files b/config/rootfiles/core/25/files
index 42259e839907c8694d42af447d642a2b485aaa32..2bba9f37a93807133a1a604e1f53f2843b45fb41 100644 (file)
--- a/config/rootfiles/core/25/files
+++ b/config/rootfiles/core/25/files
@@ -86,3 +86,4 @@ usr/lib/libupnp.so.3
 usr/lib/libupnp.so.3.0.5
 usr/sbin/pptp
 etc/rc.d/init.d/networking/red
 usr/lib/libupnp.so.3.0.5
 usr/sbin/pptp
 etc/rc.d/init.d/networking/red

+srv/web/ipfire/cgi-bin/pppsetup.cgi

diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index f09e3724a6cba959dd77d7090f0367d62eb6eeea..4b261f3a603523b8d9fd42b657a3ef5c3c8ed161 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'})
 {
 }
 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'};
                 $errormessage = $Lang::tr{'invalid input'};
                 goto ERROR; }
         my $type = $pppsettings{'TYPE'};


@@ -142,20 +142,7 @@ elsif ($pppsettings{'ACTION'} eq $Lang::tr{'save'})
                 $errormessage = $Lang::tr{'only digits allowed in holdoff field'};
                 goto ERROR; }
 
                 $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; }
                 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'}{'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'} = '';
 $selected{'TYPE'}{$pppsettings{'TYPE'}} = "selected='selected'";
 $checked{'DEBUG'}{'off'} = '';
 $checked{'DEBUG'}{'on'} = '';


@@ -490,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='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
 ;
 
 END
 ;
 


@@ -498,14 +488,11 @@ chomp ($atmdev);
 if ($atmdev ne '') {
         print <<END
         <option value='pppoeatm' $selected{'TYPE'}{'pppoeatm'}>PPPoE over ATM-BRIDGE</option>
 if ($atmdev ne '') {
         print <<END
         <option value='pppoeatm' $selected{'TYPE'}{'pppoeatm'}>PPPoE over ATM-BRIDGE</option>

+        <option value='pptpatm' $selected{'TYPE'}{'pppoeatm'}>PPTP over ATM-BRIDGE</option>    

 END
 ;
 }
 }
 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>
 #if (0) {
 #       print <<END
 #       <option value='eciadsl' $selected{'TYPE'}{'eciadsl'}>ECI USB ADSL</option>


@@ -692,30 +679,25 @@ END
 
 if ($pppsettings{'TYPE'} eq 'pptp')
 {
 
 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>
 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>
+        <td width='25%'>Peer</td>
+        <td colspan='3'><input size=50 type='text' name='PPTP_PEER' value='$pppsettings{'PPTP_PEER'}' /></td>

 </tr>
 <tr>
 </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'}:&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
 ;
 }
 </tr>
 END
 ;
 }

-if ($pppsettings{'TYPE'} =~ /^(pppoeatm)$/)
+
+if ($pppsettings{'TYPE'} =~ /^(pppoeatm|pptpatm)$/)

 {
 
 print <<END
 {
 
 print <<END


@@ -880,7 +862,8 @@ sub initprofile
         $pppsettings{'ENCAP'} = '0';
         $pppsettings{'VPI'} = '1';
         $pppsettings{'VCI'} = '32';
         $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' ) {
         $pppsettings{'PROTOCOL'} = 'RFC2364';
         $pppsettings{'METHOD'} = 'PPPOE_PLUGIN';
         if ( $pppsettings{'METHOD'} eq 'PPPOE_PLUGIN' ) {

diff --git a/src/initscripts/init.d/networking/red b/src/initscripts/init.d/networking/red
index 24b7069e648e79dbdf57231a8137f41491e12c84..caa857263ddc9c3e844d7d1ca502456bcfc83d08 100644 (file)
--- a/src/initscripts/init.d/networking/red
+++ b/src/initscripts/init.d/networking/red
@@ -192,21 +192,29 @@ case "${1}" in
                        
                        PPP_NIC=${DEVICE}
                        
                        
                        PPP_NIC=${DEVICE}
                        

-                       if [ "$TYPE" == "pppoeatm" ]; then
+                       if [ "$TYPE" == "pppoeatm" ] || [ "$TYPE" == "pptpatm" ]; then

                                PPP_NIC=nas0            
                                boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
                                br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
                                sleep 1
                                PPP_NIC=nas0            
                                boot_mesg "Createing ATM-Bridge as $PPP_NIC ..."
                                br2684ctl -c0 -e${ENCAP} -a0.${VPI}.${VCI} >/dev/null 2>&1 &
                                sleep 1

-                               TYPE="pppoe"
+                               if [ "$TYPE" == "pppoeatm" ]; then
+                                       TYPE="pppoe"
+                               fi
+                               if [ "$TYPE" == "pptpatm" ]; then
+                                       TYPE="pptp"
+                               fi

                        fi
                        fi

-                       if [ "$TYPE" == "pppoe" ]; then                 
+                       if [ "$TYPE" == "pppoe" ] || [ "$TYPE" == "pptp" ]; then

                                if [ "$PPP_NIC" == "" ]; then
                                        boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
                                        echo_failure
                                        exit 0
                                fi
                                if [ "$PPP_NIC" == "" ]; then
                                        boot_mesg "No device for red interface given. Check netsetup or dialprofile!" ${FAILURE}
                                        echo_failure
                                        exit 0
                                fi

-                               boot_mesg "Bringing up the PPPoE interface on $PPP_NIC ..."
+                               boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."

                                ip addr flush dev $PPP_NIC >/dev/null 2>&1
                                ip addr flush dev $PPP_NIC >/dev/null 2>&1

+                               if [ "$TYPE" == "pptp" ]; then
+                                       ip addr add $PPTP_NICCFG dev $PPP_NIC
+                               fi

                                ip link set ${PPP_NIC} up
                        else
                                boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."
                                ip link set ${PPP_NIC} up
                        else
                                boot_mesg "Bringing up the PPP via ${TYPE} on ${COMPORT}..."


@@ -218,10 +226,10 @@ case "${1}" in
                        
                        ### Plugin Options
                        #                       
                        
                        ### Plugin Options
                        #                       

-                       [ "${METHOD}" == "PPPOE_PLUGIN" ] && \
-                               PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
-
-                               # PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so nic-$PPP_NIC"
+                       if [ "$TYPE" == "pppoe" ]; then
+                               [ "${METHOD}" == "PPPOE_PLUGIN" ] && \
+                                       PLUGOPTS="plugin /usr/lib/pppd/2.4.4/rp-pppoe.so"
+                       fi

 
                        ### Synchronous Mode
                        #
 
                        ### Synchronous Mode
                        #


@@ -279,9 +287,11 @@ case "${1}" in
                                fi
                        fi
                        
                                fi
                        fi
                        

-                       ### When using pppoe-plugin the device has to be the last option
-                       #
-                       [ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" $PPP_NIC"
+                       if [ "$TYPE" == "pppoe" ]; then
+                               ### When using pppoe-plugin the device has to be the last option
+                               #
+                               [ "${METHOD}" == "PPPOE_PLUGIN" ] && PLUGOPTS+=" $PPP_NIC"
+                       fi

                        
                        if [ "$TYPE" == "modem" ]; then
                                PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts"
                        
                        if [ "$TYPE" == "modem" ]; then
                                PLUGOPTS=" /dev/${COMPORT} ${DTERATE} connect /etc/ppp/dialer lock modem crtscts"


@@ -311,6 +321,12 @@ case "${1}" in
                                PPPOE_CMD="/usr/sbin/pppoe -p /var/run/ppp-ipfire.pid.pppoe -I $PPP_NIC"
                                PPPOE_CMD+=" -T 80 -U $PPPOE_SYNC $ACNAME $SERVICENAMEOPT"
                        fi
                                PPPOE_CMD="/usr/sbin/pppoe -p /var/run/ppp-ipfire.pid.pppoe -I $PPP_NIC"
                                PPPOE_CMD+=" -T 80 -U $PPPOE_SYNC $ACNAME $SERVICENAMEOPT"
                        fi

+
+                       ### PPTP ###
+                       #
+                       if [ "$TYPE" == "pptp" ]; then
+                               PPPOE_CMD="pptp $PPTP_PEER --nolaunchpppd"
+                       fi

                        
                        ### Run everything
                        #
                        
                        ### Run everything
                        #


@@ -327,70 +343,6 @@ case "${1}" in
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
 
                        /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1
                        /etc/rc.d/init.d/connectd start
 

-               elif [ "${TYPE}" == "PPTP" ]; then
-                       if ( ps ax | grep -q [p]ppd ); then
-                           boot_mesg "pppd is still running." ${FAILURE}
-                           echo_failure
-                           exit 1
-                       fi
-
-                       eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
-
-                       [ -c "/dev/ppp" ] || mknod /dev/ppp c 108 0
-
-                       PPP_NIC=${DEVICE}
-
-                       boot_mesg "Bringing up the PPTP interface on $PPP_NIC ..."
-                       ip addr flush dev $PPP_NIC >/dev/null 2>&1
-                       ip addr add 10.0.0.140/24 broadcast 10.0.0.255 dev $PPP_NIC
-
-                       ### DNS Config
-                       #
-                       if [ "${DNS}" == "Automatic" ]; then
-                               DNS="usepeerdns"
-                       else
-                               DNS=""
-                               echo nameserver=$DNS1 > /etc/ppp/resolv.conf
-                               echo nameserver=$DNS2 >> /etc/ppp/resolv.conf
-                       fi
-
-                       ###                      ###
-                       ### Configuring the pppd ###
-                       ###                      ###
-
-                       ### Dial On Demand
-                       #
-                       if [ "${RECONNECTION}" != "persistent" ]; then
-                               if [ "${TIMEOUT}" != "0" ] && [ "${TIMEOUT}" != "" ]; then
-                                       SECONDS=$[${TIMEOUT} * 60]
-                               else
-                                       SECONDS=300
-                               fi
-                               if [ "${RECONNECTION}" == "dialondemand" ]; then
-                                       touch /var/ipfire/red/dial-on-demand
-                                       DEMAND="demand persist idle ${SECONDS} 10.112.112.112:10.112.112.113"
-                                       DEMAND+=" ipcp-accept-remote ipcp-accept-local noipdefault ktune"
-                               fi
-                       fi
-
-                       ### Standard PPP options we always use
-                       #
-                       PPP_STD_OPTIONS="$DNS defaultroute noipdefault noauth"
-                       PPP_STD_OPTIONS+=" default-asyncmap hide-password nodetach"
-                       PPP_STD_OPTIONS+=" user ${USERNAME} remotename ${USERNAME} lcp-echo-interval 10"
-                       PPP_STD_OPTIONS+=" lcp-echo-failure 10"
-
-                       ### Debugging
-                       #
-                       if [ "${DEBUG}" == "on" ]; then
-                               DEBUG="debug"
-                       else
-                               DEBUG=""
-                       fi
-
-                       PPTP_CMD="pptp 10.0.0.138 --nolaunchpppd"
-
-                       /usr/sbin/pppd pty "$PPTP_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC >/dev/null 2>&1 &

                fi
                ;;
 
                fi
                ;;
 


@@ -439,7 +391,7 @@ case "${1}" in
                                echo_warning
                        fi
 
                                echo_warning
                        fi
 

-               if [ "$TYPE" == "PPPOE" ] || [ "$TYPE" == "PPTP" ]; then
+               elif [ "$TYPE" == "PPPOE" ]; then

                        boot_mesg "Bringing down the PPP interface ..."
                        ## Disable vnstat collection
                        /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
                        boot_mesg "Bringing down the PPP interface ..."
                        ## Disable vnstat collection
                        /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1


@@ -458,8 +410,8 @@ case "${1}" in
                                fi
                        fi
                fi
                                fi
                        fi
                fi

-

                killall -w -s KILL /usr/sbin/pppd >/dev/null 2>&1
                killall -w -s KILL /usr/sbin/pppd >/dev/null 2>&1

+               killall -w -s KILL pptp >/dev/null 2>&1

                killall -w -s KILL br2684ctl >/dev/null 2>&1
 
                ## Disable vnstat collection
                killall -w -s KILL br2684ctl >/dev/null 2>&1
 
                ## Disable vnstat collection