From dcb010903d945f09d5bcc4869f6a0c4a3d8bcdde Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Tue, 26 Dec 2017 13:13:17 +0100 Subject: [PATCH] layer2interface: remove layer2_interface adsl and vdsl --- .../broadcom/etc/init.d/layer2_interface_adsl | 163 ------------------ .../broadcom/etc/init.d/layer2_interface_vdsl | 105 ----------- 2 files changed, 268 deletions(-) delete mode 100755 layer2interface/broadcom/etc/init.d/layer2_interface_adsl delete mode 100755 layer2interface/broadcom/etc/init.d/layer2_interface_vdsl diff --git a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl b/layer2interface/broadcom/etc/init.d/layer2_interface_adsl deleted file mode 100755 index d244390bb..000000000 --- a/layer2interface/broadcom/etc/init.d/layer2_interface_adsl +++ /dev/null @@ -1,163 +0,0 @@ -#!/bin/sh /etc/rc.common - -. /lib/functions.sh -include /lib/network - -START=22 -USE_PROCD=1 - -checkpvc() { - local retur - local vpi=$1 - local vci=$2 - - retur=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3 ==test ) print $5 }') - - case $retur in - ''|*[!0-9]*) return 0 ;; - *) return $retur ;; - esac -} - -checkxtmlist() { - local dtype=$1 - local pcr - local scr - local mbs - local retur - - case $# in - 1) - pcr=0 - scr=0 - mbs=0 - ;; - 2) - pcr=$2 - scr=0 - mbs=0 - ;; - 4) - pcr=$2 - scr=$3 - mbs=$4 - ;; - esac - - retur=$(xtmctl operate tdte --show | awk -v test="$dtype" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2 ==test && $3==pcr && $4==scr && $5==mbs ) print $1 }') - - case $retur in - ''|*[!0-9]*) return 0 ;; - *) return $retur ;; - esac -} - -atm_inf_conf() { - local vpi - local vci - local link_type - local atmtype - local pcr - local scr - local mbs - local encaps - local ifname - local ret - local baseifname - config_get atmtype $1 atmtype - config_get link_type $1 link_type - config_get pcr $1 pcr - config_get scr $1 scr - config_get mbs $1 mbs - config_get vpi $1 vpi - config_get vci $1 vci - config_get ifname $1 ifname - config_get baseifname $1 baseifname - config_get name $1 name - config_get bridge $1 bridge - checkpvc $vpi $vci - ret=$? - - ifname="${ifname:-$baseifname.1}" - - if [ "$ret" -eq 0 ]; then - checkxtmlist $atmtype $pcr $scr $mbs - ret=$? - if [ "$ret" -eq 0 ]; then - case $atmtype in - ubr) xtmctl operate tdte --add "$atmtype";; - ubr_pcr ) xtmctl operate tdte --add "$atmtype" $pcr;; - cbr) xtmctl operate tdte --add "$atmtype" $pcr;; - nrtvbr) xtmctl operate tdte --add "$atmtype" $pcr $scr $mbs;; - rtvbr)xtmctl operate tdte --add "$atmtype" $pcr $scr $mbs;; - esac - fi - - case $link_type in - EoA)config_get encaps $1 encapseoa;; - PPPoA)config_get encaps $1 encapspppoa;; - IPoA)config_get encaps $1 encapsipoa;; - esac - - checkxtmlist $atmtype $pcr $scr $mbs - ret="$?" - xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret - xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 dt # low priority queue - xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 dt # mid priority queue upstream ACK's and ping from LAN will use this queue - xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 dt # high priority queue, internal traffic dhcp igmp dns and icmp - xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*} - xtmctl operate intf --state 1 enable - - brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" - fi -} - -remove_netdevices() { - local vpi - local vci - local rest - local x=0 - #local baseifname - local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'` - - for i in $vpivci - do - rest=${i#\/} - vpi=${rest%%\/*} - vci=${rest#*\/} - echo "xtmctl operate conn --delete 1.$vpi.$vci" - xtmctl operate conn --delete 1.$vpi.$vci - echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci" - xtmctl operate conn --deletenetdev 1.$vpi.$vci - done -} - -start_service() { - local adslstatus - echo "Starting ADSL" - config_load layer2_interface - config_get adslstatus adsl device - if [ "$adslstatus" == "up" ]; then - xtmctl start - config_load layer2_interface_adsl - config_foreach atm_inf_conf atm_bridge - fi -} - -stop_service() { - echo "Stopping ADSL" -#xtmctl stop causes IRQ issues" -# xtmctl stop - remove_netdevices -} - -reload_service() { - stop - start -} - -service_triggers() { - procd_add_reload_trigger layer2_interface_adsl -} - - diff --git a/layer2interface/broadcom/etc/init.d/layer2_interface_vdsl b/layer2interface/broadcom/etc/init.d/layer2_interface_vdsl deleted file mode 100755 index 7958bec02..000000000 --- a/layer2interface/broadcom/etc/init.d/layer2_interface_vdsl +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh /etc/rc.common - -. /lib/functions.sh -include /lib/network - -START=22 -USE_PROCD=1 - -checkptm() { - local retur - local ptmprio=$1 - local dslat=$2 - - if [ "$ptmprio" -eq 2 ]; then - ptmprio="high" - else - ptmprio="low" - fi - - retur=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }') - - case $retur in - ''|*[!0-9]*) return 0 ;; - *) return $retur ;; - esac -} - -ptm_inf_conf() { - local ret - local ptmprio - local dslat - local ifname - local bridge - - config_get ptmprio $1 ptmprio - config_get dslat $1 dslat - config_get ifname $1 ifname - config_get baseifname $1 baseifname - config_get bridge $1 bridge - - ifname="${ifname:-$baseifname.1}" - - checkptm $ptmprio $dslat - ret=$? - - if [ "$ret" -eq 0 ]; then - xtmctl operate conn --add $dslat.$ptmprio - xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 dt -1 -1 3000 # low priority queue - xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 dt -1 -1 3000 # mid priority queue upstream ACK's and ping from LAN will use this queue - xtmctl operate conn --addq $dslat.$ptmprio 7 wrr 1 dt -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp - xtmctl operate conn --createnetdev $dslat.$ptmprio ${ifname%%.*} - xtmctl operate intf --state 1 enable - xtmctl start - brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" - fi -} - -remove_netdevices() { - local delptm - local x=0 - - IFS=$'\n' - for i in `xtmctl operate conn --show | grep "PTM\|mode"` - do - if [ $x -eq 1 ]; then - delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}') - echo "xtmctl operate conn --delete $delptm" - xtmctl operate conn --delete $delptm - xtmctl operate conn --deletenetdev $delptm - fi - x=1 - done - unset IFS -} - -start_service() { - local vdslstatus - echo "Starting VDSL" - config_load layer2_interface - config_get vdslstatus vdsl device - - if [ "$vdslstatus" == "up" ]; then - xtmctl start - config_load layer2_interface_vdsl - config_foreach ptm_inf_conf vdsl_interface - fi -} - -stop_service() { - echo "Stopping VDSL" -# bug in broadcom stop casues IRQ issue -# xtmctl stop - remove_netdevices -} - -reload_service() { - stop - start -} - -service_triggers() { - procd_add_reload_trigger layer2_interface_vdsl -} - -