Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 47866master
parent
244173a093
commit
b0b8293b7e
@ -0,0 +1,170 @@ |
||||
#!/bin/sh /etc/rc.common |
||||
# Copyright (C) 2006-2015 OpenWrt.org |
||||
|
||||
. /lib/functions/system.sh |
||||
. /lib/functions/uci-defaults-new.sh |
||||
|
||||
detect_by_vlanports() { |
||||
local vlan0ports="$(nvram get vlan0ports)" |
||||
local vlan1ports="$(nvram get vlan1ports)" |
||||
local vlan2ports="$(nvram get vlan2ports)" |
||||
local cpuport="$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p")" |
||||
|
||||
if [ "${vlan0ports:0:9}" = "0 1 2 3 8" -a "${vlan1ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ] || \ |
||||
[ "${vlan1ports:0:9}" = "0 1 2 3 8" -a "${vlan2ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ] || \ |
||||
[ "${vlan2ports:0:9}" = "0 1 2 3 8" -a "${vlan1ports:0:3}" = "4 8" -a ${cpuport:-0} -eq 8 ]; |
||||
then |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0" |
||||
|
||||
elif [ "${vlan0ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \ |
||||
[ "${vlan1ports:0:9}" = "0 1 2 3 5" -a "${vlan2ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ] || \ |
||||
[ "${vlan2ports:0:9}" = "0 1 2 3 5" -a "${vlan1ports:0:3}" = "4 5" -a ${cpuport:-0} -eq 5 ]; |
||||
then |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" |
||||
|
||||
else |
||||
logger -t "01_detect" "Unable to determine network configuration" |
||||
ucidef_set_interface_lan "eth0" |
||||
fi |
||||
} |
||||
|
||||
detect_by_boardnum() { |
||||
local boardnum="$1" |
||||
|
||||
case "$boardnum" in |
||||
# WAP54G, Sitecom WL-105b |
||||
"2" | \ |
||||
"1024") |
||||
ucidef_set_interface_lan "eth0" |
||||
;; |
||||
|
||||
# Generic detection fallback |
||||
*) |
||||
detect_by_vlanports |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
detect_by_boardtype() { |
||||
local boardtype="$1" |
||||
local boardnum="$2" |
||||
|
||||
case "$boardtype" in |
||||
"bcm94710r4") |
||||
ucidef_set_interfaces_lan_wan "eth0" "eth1" |
||||
;; |
||||
|
||||
"0x0467") |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" |
||||
;; |
||||
|
||||
"0x042f" | \ |
||||
"0x0472") |
||||
# WL-500gP |
||||
if [ "$boardnum" = "45" ]; then |
||||
ucidef_add_switch "switch0" \ |
||||
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" |
||||
|
||||
# Generic BCM94704 |
||||
else |
||||
ucidef_set_interface_wan "eth1" |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" |
||||
|
||||
# MAC addresses on 4704 tend to be screwed up. Add a workaround here |
||||
local mac="$(nvram get et0macaddr)" |
||||
local pat="[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]" |
||||
pat="$pat:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]" |
||||
pat="$pat:[0-9a-fA-F][0-9a-fA-F]:[0-9a-fA-F][0-9a-fA-F]" |
||||
|
||||
case "$mac" in |
||||
$pat) |
||||
ucidef_set_interface_macaddr "lan" "$mac" |
||||
ucidef_set_interface_macaddr "wan" "$(macaddr_add "$mac" 1)" |
||||
;; |
||||
esac |
||||
fi |
||||
;; |
||||
|
||||
# Buffalo WBR-B11 and Buffalo WBR-G54 |
||||
"bcm94710ap") |
||||
ucidef_set_interface_wan "eth1" |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" |
||||
;; |
||||
|
||||
*) |
||||
detect_by_boardnum "$boardnum" |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
detect_by_model() { |
||||
local model="$1" |
||||
local boardtype="$2" |
||||
local boardnum="$3" |
||||
|
||||
# Netgear WGT634U exception |
||||
if grep -sqE 'mtd0: 000(6|a)0000' /proc/mtd; then |
||||
ucidef_add_switch "switch0" \ |
||||
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" |
||||
return |
||||
fi |
||||
|
||||
case "$model" in |
||||
"Asus WLHDD" | \ |
||||
"Asus WL300G") |
||||
ucidef_set_interface_lan "eth1" |
||||
;; |
||||
|
||||
"Asus WL330GE") |
||||
ucidef_add_switch "switch0" "4:lan" "5t@eth0" |
||||
;; |
||||
|
||||
"Asus WL500G" | \ |
||||
"Asus WL500W" | \ |
||||
"Microsoft MN-700") |
||||
ucidef_set_interfaces_lan_wan "eth0" "eth1" |
||||
;; |
||||
|
||||
"Asus WL500GP V2" | \ |
||||
"Buffalo WHR-G125" | \ |
||||
"Motorola WR850G" | \ |
||||
"Siemens SE505 V2") |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" |
||||
;; |
||||
|
||||
"Asus WL700") |
||||
ucidef_add_switch "switch0" \ |
||||
"0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" |
||||
;; |
||||
|
||||
"Dell TrueMobile 2300") |
||||
ucidef_set_interface_wan "eth1" |
||||
ucidef_add_switch "switch0" \ |
||||
"0:lan" "1:lan" "2:lan" "3:lan" "5@eth0" |
||||
;; |
||||
|
||||
*) |
||||
detect_by_boardtype "$boardtype" "$boardnum" |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
|
||||
local model="$(sed -ne 's/^machine[ \t]*: //p' /proc/cpuinfo)" |
||||
local boardtype="$(nvram get boardtype)" |
||||
local boardnum="$(nvram get boardnum)" |
||||
|
||||
board_config_update |
||||
|
||||
ucidef_set_board_id "$boardtype${boardnum:+:$boardnum}" |
||||
ucidef_set_model_name "$model" |
||||
|
||||
detect_by_model "$model" "$boardtype" "$boardnum" |
||||
|
||||
board_config_flush |
@ -1,238 +0,0 @@ |
||||
#!/bin/sh /etc/rc.common |
||||
# Copyright (C) 2006 OpenWrt.org |
||||
|
||||
START=05 |
||||
|
||||
start() { |
||||
[ -e /etc/config/network ] && { |
||||
local batch |
||||
|
||||
config_cb() { |
||||
case "$1" in |
||||
switch) |
||||
option_cb() { |
||||
case "$1" in |
||||
vlan[0-9]|vlan1[0-5]) |
||||
local id="${1#vlan}" |
||||
local ports="${2%\*}" |
||||
append batch "delete network.eth0.${1}${N}" |
||||
append batch "set network.eth0_${id}=switch_vlan${N}" |
||||
append batch "set network.eth0_${id}.device=eth0${N}" |
||||
append batch "set network.eth0_${id}.vlan=${id}${N}" |
||||
append batch "set network.eth0_${id}.ports='${ports}'${N}" |
||||
;; |
||||
esac |
||||
} |
||||
;; |
||||
switch_vlan) |
||||
option_cb() { :; } |
||||
batch="" |
||||
;; |
||||
esac |
||||
} |
||||
|
||||
config_load network |
||||
|
||||
[ -n "$batch" ] && { |
||||
logger -t netconfig "migrating switch config to new format ..." |
||||
echo "$batch${N}commit network" | uci batch |
||||
} |
||||
|
||||
exit 0 |
||||
} |
||||
|
||||
mkdir -p /etc/config |
||||
|
||||
local cpuport=5 |
||||
[ -e /sbin/swconfig ] && cpuport=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p") |
||||
local switchname=eth0 |
||||
[ -e /sbin/swconfig ] && switchname=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|switch0: \([^\\\\(]*\).*|\1|p") |
||||
local model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo) |
||||
|
||||
local network_defs=`( |
||||
if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then |
||||
# WGT634u |
||||
echo boardtype=wgt634u |
||||
else |
||||
strings "$(find_mtd_part nvram)" |
||||
fi |
||||
) | awk -v cpuport="$cpuport" -v model="$model" ' |
||||
function macinc(mac, maca, i, result) { |
||||
split(mac, maca, ":") |
||||
for (i = 1; i <= 6; i++) maca[i] = "0x" maca[i] |
||||
if (++maca[6] > 0xff) { |
||||
maca[5]++ |
||||
maca[6] = 0 |
||||
} |
||||
for (i = 1; i <= 6; i++) { |
||||
if (i != 1) result = result ":" |
||||
result = result sprintf("%02x", maca[i]) |
||||
} |
||||
return result |
||||
} |
||||
|
||||
BEGIN { |
||||
FS="=" |
||||
c["lan_ifname"]="eth0.1" |
||||
c["wan_ifname"]="eth0.2" |
||||
c["vlan1ports"]="1 2 3 4 5t" |
||||
c["vlan2ports"]="0 5t" |
||||
for (i = 0; i < 6; i++) { |
||||
if (mac_check != "") mac_check = mac_check ":" |
||||
mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]" |
||||
} |
||||
if (cpuport == "8") { |
||||
c["vlan1ports"]="1 2 3 4 8t" |
||||
c["vlan2ports"]="0 8t" |
||||
} |
||||
} |
||||
|
||||
($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") || ($1 ~ /macaddr/) || \ |
||||
($1 ~ /^vlan[0-9]{1,2}ports$/) { |
||||
nvram[$1] = $2 |
||||
} |
||||
|
||||
END { |
||||
if (((nvram["vlan0ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^4 8/ && (cpuport == "8"))) || \ |
||||
((nvram["vlan1ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan2ports"] ~ /^4 8/ && (cpuport == "8"))) || \ |
||||
((nvram["vlan2ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^4 8/ && (cpuport == "8")))) { |
||||
c["vlan1ports"] = "0 1 2 3 8t" |
||||
c["vlan2ports"] = "4 8t" |
||||
} |
||||
if (((nvram["vlan0ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5"))) || \ |
||||
((nvram["vlan1ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan2ports"] ~ /^4 5/ && (cpuport == "5"))) || \ |
||||
((nvram["vlan2ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5")))) { |
||||
c["vlan1ports"] = "0 1 2 3 5t" |
||||
c["vlan2ports"] = "4 5t" |
||||
} |
||||
if ((model == "Asus WLHDD") || (model == "Asus WL300G")) { |
||||
c["wan_ifname"] = "" |
||||
c["lan_ifname"] = "eth1" |
||||
} |
||||
if (model == "Asus WL330GE") { |
||||
c["wan_ifname"] = "" |
||||
c["lan_ifname"] = "eth0.1" |
||||
c["vlan1ports"] = "4 5t" |
||||
c["vlan2ports"] = "" |
||||
} |
||||
if ((model == "Asus WL500G") || (model == "Microsoft MN-700")) { |
||||
c["wan_ifname"] = "eth1" |
||||
c["lan_ifname"] = "eth0" |
||||
} |
||||
if ((model == "Asus WL500GP V2") || (model == "Buffalo WHR-G125")) { |
||||
c["vlan1ports"] = "0 1 2 3 5t" |
||||
c["vlan2ports"] = "4 5t" |
||||
} |
||||
if (model == "Dell TrueMobile 2300") { |
||||
c["lan_ifname"] = "eth0" |
||||
c["wan_ifname"] = "eth1" |
||||
c["vlan1ports"] = "0 1 2 3 4 5" |
||||
c["vlan2ports"] = "" |
||||
} |
||||
if (nvram["boardtype"] == "bcm94710r4") { |
||||
# Toshiba WRC-1000 |
||||
c["lan_ifname"] = "eth0" |
||||
c["wan_ifname"] = "eth1" |
||||
} |
||||
if ((nvram["boardtype"] == "wgt634u") || (nvram["boardtype"] == "0x0467")) { |
||||
c["vlan1ports"] = "0 1 2 3 5t" |
||||
c["vlan2ports"] = "4 5t" |
||||
} |
||||
if ((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) { |
||||
if (nvram["boardnum"] == "45") { |
||||
# WL-500gP |
||||
c["vlan1ports"] = "1 2 3 4 5t" |
||||
c["vlan2ports"] = "0 5t" |
||||
} else { |
||||
# Generic BCM94704 |
||||
c["vlan1ports"] = "0 1 2 3 4 5" |
||||
c["vlan2ports"] = "" |
||||
c["lan_ifname"] = "eth0" |
||||
c["wan_ifname"] = "eth1" |
||||
|
||||
# MAC addresses on 4704 tend to be screwed up. Add a workaround here |
||||
if (nvram["et0macaddr"] ~ mac_check) { |
||||
c["lan_macaddr"] = nvram["et0macaddr"] |
||||
c["wan_macaddr"] = macinc(c["lan_macaddr"]) |
||||
} |
||||
} |
||||
} |
||||
# Buffalo WBR-B11 and Buffalo WBR-G54 |
||||
if (nvram["boardtype"] == "bcm94710ap") { |
||||
c["vlan1ports"] = "0 1 2 3 4 5" |
||||
c["vlan2ports"] = "" |
||||
c["lan_ifname"] = "eth0" |
||||
c["wan_ifname"] = "eth1" |
||||
} |
||||
|
||||
# WAP54G |
||||
if ((nvram["boardnum"] == "2") || \ |
||||
(nvram["boardnum"] == "1024")) { |
||||
c["lan_ifname"]="eth0" |
||||
c["wan_ifname"]="" |
||||
} |
||||
|
||||
# Sitecom WL-105b |
||||
if ((nvram["boardum"] == "2") && \ |
||||
(nvram["GemtekPmonVer"] == "1")) { |
||||
c["lan_ifname"]="eth0" |
||||
c["wan_ifname"]="" |
||||
} |
||||
|
||||
# ASUS WL-700gE |
||||
# These are actually same as defaults above. For some reason this script applies |
||||
# Generic BCM94704 settings instead so we revert to proper settings here. |
||||
# Hopefully someone will fix this properly soon. |
||||
if (model == "Asus WL700") { |
||||
c["lan_ifname"]="eth0.1" |
||||
c["wan_ifname"]="eth0.2" |
||||
c["vlan1ports"]="1 2 3 4 5t" |
||||
c["vlan2ports"]="0 5t" |
||||
} |
||||
if ((model == "Motorola WR850G") || (model == "Siemens SE505 V2")) { |
||||
c["vlan1ports"]="0 1 2 3 5t" |
||||
c["vlan2ports"]="4 5t" |
||||
} |
||||
if (model == "Asus WL500W") { |
||||
c["lan_ifname"] = "eth0" |
||||
c["wan_ifname"] = "eth1" |
||||
c["vlan1ports"] = "0 1 2 3 4 5" |
||||
c["vlan2ports"] = "" |
||||
} |
||||
print "local vlan1ports=\"" c["vlan1ports"] "\";" |
||||
print "local vlan2ports=\"" c["vlan2ports"] "\";" |
||||
print "local lan_ifname=\"" c["lan_ifname"] "\";" |
||||
print "local lan_macaddr=\"" c["lan_macaddr"] "\";" |
||||
print "local wan_ifname=\"" c["wan_ifname"] "\";" |
||||
print "local wan_macaddr=\"" c["wan_macaddr"] "\";" |
||||
}'` |
||||
|
||||
. /lib/functions/uci-defaults.sh |
||||
|
||||
touch /etc/config/network |
||||
|
||||
eval "$network_defs" |
||||
|
||||
[ -n "$vlan1ports" -o -n "$vlan2ports" ] && { |
||||
local cfg=`ucidef_add_switch "$switchname" 1 1` |
||||
[ -n "$cfg" ] && uci rename network.$cfg=eth0 |
||||
[ -n "$vlan1ports" ] && { |
||||
cfg=`ucidef_add_switch_vlan "$switchname" 1 "$vlan1ports"` |
||||
} |
||||
[ -n "$vlan2ports" ] && { |
||||
cfg=`ucidef_add_switch_vlan "$switchname" 2 "$vlan2ports"` |
||||
} |
||||
} |
||||
|
||||
ucidef_set_interface_loopback |
||||
|
||||
ucidef_set_interface_lan "$lan_ifname" |
||||
[ -n "$lan_macaddr" ] && ucidef_set_interface_macaddr lan "$lan_macaddr" |
||||
|
||||
[ -n "$wan_ifname" ] && { |
||||
ucidef_set_interface_wan "$wan_ifname" |
||||
[ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr wan "$wan_macaddr" |
||||
} |
||||
|
||||
uci commit network |
||||
} |
Loading…
Reference in new issue