mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-29 17:42:41 +00:00
Compare commits
14 Commits
staging-WI
...
staging-WI
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
54076ee967 | ||
|
|
3a8fc316f2 | ||
|
|
d85dc2a819 | ||
|
|
acca9737e4 | ||
|
|
6d2fd1de0d | ||
|
|
1d822a10d2 | ||
|
|
ebdc88ee1f | ||
|
|
778cc679a0 | ||
|
|
088d78faa7 | ||
|
|
5306f7db27 | ||
|
|
c8bffdc250 | ||
|
|
3a3de9e146 | ||
|
|
4d5c9a2d4c | ||
|
|
41aa4c2978 |
@@ -4,19 +4,19 @@ let fs = require("fs");
|
||||
let ubus = require('ubus').connect();
|
||||
|
||||
let gps_info = ubus.call('gps', 'info');
|
||||
let latitude = gps_info.latitude ?? 0;
|
||||
let longitude = gps_info.longitude ?? 0;
|
||||
let latitude = gps_info.latitude || 0;
|
||||
let longitude = gps_info.longitude || 0;
|
||||
|
||||
// afc-location.json file content
|
||||
let afc_location = {};
|
||||
afc_location.location_type = "ellipse";
|
||||
afc_location.location = longitude + ":" + latitude ;
|
||||
afc_location.height = gps_info.elevation ?? 0;
|
||||
afc_location.height = gps_info.elevation || 0;
|
||||
afc_location.height_type = "AMSL";
|
||||
afc_location.major_axis = gps_info.major_axis ?? 0;
|
||||
afc_location.minor_axis = gps_info.minor_axis ?? 0;
|
||||
afc_location.orientation = gps_info.major_orientation ?? 0;
|
||||
afc_location.vertical_tolerance = gps_info.vdop ?? 0;
|
||||
afc_location.major_axis = int(gps_info.major_axis) || 1;
|
||||
afc_location.minor_axis = int(gps_info.minor_axis) || 1;
|
||||
afc_location.orientation = gps_info.major_orientation || 0;
|
||||
afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
|
||||
|
||||
let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
|
||||
afc_location_json.write(afc_location);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
let libubus = require("ubus");
|
||||
import { open, readfile } from "fs";
|
||||
import { open, readfile, writefile } from "fs";
|
||||
import { wdev_create, wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open } from "common";
|
||||
|
||||
let uci = require('uci').cursor();
|
||||
let ubus = libubus.connect(null, 60);
|
||||
|
||||
hostapd.data.config = {};
|
||||
@@ -893,10 +894,21 @@ return {
|
||||
hostapd.ubus.disconnect();
|
||||
},
|
||||
afc_request: function(iface, data) {
|
||||
let ret = ubus.call("afc", "request", { data });
|
||||
if (type(ret) != "object")
|
||||
return;
|
||||
return ret.data;
|
||||
let wireless_config = uci.get_all('wireless');
|
||||
for (let l, afc_server in wireless_config) {
|
||||
if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
|
||||
hostapd.printf(`Sending AFC request: ${data}`);
|
||||
writefile("/tmp/afc-request.json", data);
|
||||
|
||||
system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
|
||||
|
||||
let afc_response = (readfile("/tmp/afc-response.json"));
|
||||
if (afc_response)
|
||||
return afc_response;
|
||||
else
|
||||
return;
|
||||
}
|
||||
}
|
||||
},
|
||||
bss_add: function(name, obj) {
|
||||
bss_event("add", name);
|
||||
|
||||
@@ -4,19 +4,19 @@ let fs = require("fs");
|
||||
let ubus = require('ubus').connect();
|
||||
|
||||
let gps_info = ubus.call('gps', 'info');
|
||||
let latitude = gps_info.latitude ?? 0;
|
||||
let longitude = gps_info.longitude ?? 0;
|
||||
let latitude = gps_info.latitude || 0;
|
||||
let longitude = gps_info.longitude || 0;
|
||||
|
||||
// afc-location.json file content
|
||||
let afc_location = {};
|
||||
afc_location.location_type = "ellipse";
|
||||
afc_location.location = longitude + ":" + latitude ;
|
||||
afc_location.height = gps_info.elevation ?? 0;
|
||||
afc_location.height = gps_info.elevation || 0;
|
||||
afc_location.height_type = "AMSL";
|
||||
afc_location.major_axis = gps_info.major_axis ?? 0;
|
||||
afc_location.minor_axis = gps_info.minor_axis ?? 0;
|
||||
afc_location.orientation = gps_info.major_orientation ?? 0;
|
||||
afc_location.vertical_tolerance = gps_info.vdop ?? 0;
|
||||
afc_location.major_axis = int(gps_info.major_axis) || 1;
|
||||
afc_location.minor_axis = int(gps_info.minor_axis) || 1;
|
||||
afc_location.orientation = gps_info.major_orientation || 0;
|
||||
afc_location.vertical_tolerance = int(gps_info.vdop) || 1;
|
||||
|
||||
let afc_location_json = fs.open("/etc/ucentral/afc-location.json", "w");
|
||||
afc_location_json.write(afc_location);
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
let libubus = require("ubus");
|
||||
import { open, readfile } from "fs";
|
||||
import { open, readfile, writefile } from "fs";
|
||||
import { wdev_remove, is_equal, vlist_new, phy_is_fullmac, phy_open, wdev_set_radio_mask } from "common";
|
||||
|
||||
let uci = require('uci').cursor();
|
||||
let ubus = libubus.connect(null, 60);
|
||||
|
||||
hostapd.data.config = {};
|
||||
@@ -1006,7 +1007,6 @@ let main_obj = {
|
||||
hostapd.data.ubus = ubus;
|
||||
hostapd.data.obj = ubus.publish("hostapd", main_obj);
|
||||
|
||||
|
||||
let auth_obj = {};
|
||||
hostapd.data.auth_obj = ubus.publish("hostapd-auth", auth_obj);
|
||||
|
||||
@@ -1026,10 +1026,21 @@ return {
|
||||
hostapd.ubus.disconnect();
|
||||
},
|
||||
afc_request: function(iface, data) {
|
||||
let ret = ubus.call("afc", "request", { data });
|
||||
if (type(ret) != "object")
|
||||
return;
|
||||
return ret.data;
|
||||
let wireless_config = uci.get_all('wireless');
|
||||
for (let l, afc_server in wireless_config) {
|
||||
if (afc_server['.type'] == 'afc-server' && afc_server.url && data) {
|
||||
hostapd.printf(`Sending AFC request: ${data}`);
|
||||
writefile("/tmp/afc-request.json", data);
|
||||
|
||||
system(`curl -s -X POST ${afc_server.url} -H \'accept: \*\/\*\' -H \'Authorization: Bearer ${afc_server.access_token}\' -H \'Content-Type: application/json\' -d \'${data}\' --output /tmp/afc-response.json`);
|
||||
|
||||
let afc_response = (readfile("/tmp/afc-response.json"));
|
||||
if (afc_response)
|
||||
return afc_response;
|
||||
else
|
||||
return;
|
||||
}
|
||||
}
|
||||
},
|
||||
bss_create: function(phy, name, obj) {
|
||||
phy = hostapd.data.config[phy];
|
||||
|
||||
@@ -100,6 +100,7 @@ endif
|
||||
ifdef CONFIG_TARGET_PROFILE
|
||||
TARGET_PROFILE=$(subst ",,$(CONFIG_TARGET_PROFILE))
|
||||
PATCH_PROFILE_NAME=patches-$(subst DEVICE_,,$(TARGET_PROFILE))
|
||||
FILES_PROFILE_NAME=files-$(subst DEVICE_,,$(TARGET_PROFILE))
|
||||
endif
|
||||
|
||||
QCASSDK_CONFIG_OPTS+= TOOL_PATH=$(TOOLCHAIN_BIN_PATH) \
|
||||
@@ -202,6 +203,15 @@ define patch_profile
|
||||
$(call PatchDir/Default,$(PKG_BUILD_DIR),./$(PATCH_PROFILE_NAME))
|
||||
endef
|
||||
|
||||
define files_profile
|
||||
|
||||
if [ -d "./$(FILES_PROFILE_NAME)" ]; then \
|
||||
$(CP) ./$(FILES_PROFILE_NAME)/* ./files/ ; \
|
||||
fi
|
||||
endef
|
||||
|
||||
Hooks/Prepare/Post += patch_profile
|
||||
Hooks/Prepare/Post += files_profile
|
||||
|
||||
$(eval $(call KernelPackage,qca-ssdk-qca-nohnat))
|
||||
$(eval $(call KernelPackage,qca-ssdk-qca-hnat))
|
||||
|
||||
317
feeds/qca-wifi-7/qca-ssdk-qca/files-zyxel_nwa130be/qca-ssdk
Executable file
317
feeds/qca-wifi-7/qca-ssdk-qca/files-zyxel_nwa130be/qca-ssdk
Executable file
@@ -0,0 +1,317 @@
|
||||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (c) 2018, 2021, The Linux Foundation. All rights reserved.
|
||||
# Copyright (c) 2022-2024, Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
#
|
||||
# Permission to use, copy, modify, and/or distribute this software for any
|
||||
# purpose with or without fee is hereby granted, provided that the above
|
||||
# copyright notice and this permission notice appear in all copies.
|
||||
#
|
||||
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
#
|
||||
|
||||
START=16
|
||||
|
||||
#!/bin/sh
|
||||
ruletype="ip4 ip6"
|
||||
side="wan lan"
|
||||
qwan="1 3 2 0 5 7 6 4"
|
||||
qlan="0 1 2 3 4 5 6 7"
|
||||
|
||||
function create_war_acl_rules(){
|
||||
for lw in $side
|
||||
do
|
||||
#echo $lw
|
||||
if [ "$lw" == "wan" ];then
|
||||
listid=254
|
||||
queue=$qwan
|
||||
portmap=0x20
|
||||
else
|
||||
listid=255
|
||||
queue=$qlan
|
||||
portmap=0x1e
|
||||
fi
|
||||
#echo $queue
|
||||
#echo "creating list $listid"
|
||||
ssdk_sh acl list create $listid 255
|
||||
ruleid=0
|
||||
for rt in $ruletype
|
||||
do
|
||||
for qid in $queue
|
||||
do
|
||||
cmd="ssdk_sh acl rule add $listid $ruleid 1 n 0 0"
|
||||
#echo $cmd
|
||||
if [ "$rt" == "ip4" ];then
|
||||
cmd="$cmd ip4 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
|
||||
#echo $cmd
|
||||
else
|
||||
cmd="$cmd ip6 n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n n"
|
||||
#echo $cmd
|
||||
fi
|
||||
if [ $ruleid -le 3 ];then
|
||||
#non-zero dscp
|
||||
cmd="$cmd y 0x0 0xff"
|
||||
elif [ $ruleid -le 7 ];then
|
||||
#zero dscp
|
||||
cmd="$cmd n"
|
||||
elif [ $ruleid -le 11 ];then
|
||||
#non-zero dscp
|
||||
cmd="$cmd y 0x0 0xff"
|
||||
else
|
||||
#zero dscp
|
||||
cmd="$cmd n"
|
||||
fi
|
||||
p=$((ruleid/2))
|
||||
cmd="$cmd y mask $((ruleid%2)) 0x1 y mask $((p%2)) 0x1 n n n n n n n n n n n n n n n y n n n n n n n y $qid n n 0 0 n n n n n n n n n n n n n n n n n n n n 0"
|
||||
#echo $cmd
|
||||
$cmd
|
||||
ruleid=`expr $ruleid + 1`
|
||||
done
|
||||
done
|
||||
ssdk_sh acl list bind $listid 0 1 $portmap
|
||||
done
|
||||
}
|
||||
|
||||
function create_war_cosmap(){
|
||||
ssdk_sh cosmap pri2q set 0 0
|
||||
ssdk_sh cosmap pri2q set 1 0
|
||||
ssdk_sh cosmap pri2q set 2 0
|
||||
ssdk_sh cosmap pri2q set 3 0
|
||||
ssdk_sh cosmap pri2q set 4 1
|
||||
ssdk_sh cosmap pri2q set 5 1
|
||||
ssdk_sh cosmap pri2q set 6 1
|
||||
ssdk_sh cosmap pri2q set 7 1
|
||||
ssdk_sh cosmap pri2ehq set 0 0
|
||||
ssdk_sh cosmap pri2ehq set 1 0
|
||||
ssdk_sh cosmap pri2ehq set 2 0
|
||||
ssdk_sh cosmap pri2ehq set 3 0
|
||||
ssdk_sh cosmap pri2ehq set 4 1
|
||||
ssdk_sh cosmap pri2ehq set 5 1
|
||||
ssdk_sh cosmap pri2ehq set 6 1
|
||||
ssdk_sh cosmap pri2ehq set 7 1
|
||||
}
|
||||
|
||||
function create_acl_byp_egstp_rules(){
|
||||
chip_ver=$1
|
||||
cmd="ssdk_sh servcode config set 1 n 0 0xfffefc7f 0xffbdff 0 0 0 0 0 0"
|
||||
if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
cmd="$cmd 0"
|
||||
fi
|
||||
#echo $cmd
|
||||
$cmd
|
||||
|
||||
ssdk_sh acl list create 56 48
|
||||
#action bypass eg stp check
|
||||
action="y n n n n n n n n n n 0 0 n n n n n n n n n n n n n y n n n n n n n n n n n n y n n n n n n n n n n n n n n n n n n"
|
||||
if [ "$chip_ver" == "0x2000" ]; then
|
||||
action="$action n n 0"
|
||||
elif [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
action="$action n n n 0"
|
||||
else
|
||||
action="$action 0"
|
||||
fi
|
||||
|
||||
for ruleid in $( seq 0 2 )
|
||||
do
|
||||
if [ "$ruleid" == "0" ];then
|
||||
cmd="ssdk_sh acl rule add 56 0 1 n 0 0 mac n n n n n y 01-80-c2-00-00-00 ff-ff-ff-ff-ff-ff n n n n n n n n n n n n n n n n n n n n n n n"
|
||||
elif [ "$ruleid" == "1" ];then
|
||||
cmd="ssdk_sh acl rule add 56 1 1 n 0 0 mac n n n n n n n yes 0x8809 0xffff n n n n n n n n n n n n n n n n n n n n n"
|
||||
else
|
||||
cmd="ssdk_sh acl rule add 56 2 1 n 0 0 mac n n n n n n n yes 0x888e 0xffff n n n n n n n n n n n n n n n n n n n n n"
|
||||
fi
|
||||
if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
cmd="$cmd n $action"
|
||||
else
|
||||
cmd="$cmd $action"
|
||||
fi
|
||||
#echo $cmd
|
||||
$cmd
|
||||
done
|
||||
ssdk_sh acl list bind 56 0 2 1
|
||||
}
|
||||
|
||||
function delete_war_acl_rules(){
|
||||
for lw in $side
|
||||
do
|
||||
#echo $lw
|
||||
if [ "$lw" == "wan" ];then
|
||||
listid=254
|
||||
queue=$qwan
|
||||
portmap=0x20
|
||||
else
|
||||
listid=255
|
||||
queue=$qlan
|
||||
portmap=0x1e
|
||||
fi
|
||||
ssdk_sh acl list unbind $listid 0 1 $portmap
|
||||
for rt in $ruletype
|
||||
do
|
||||
for qid in $queue
|
||||
do
|
||||
cmd="ssdk_sh acl rule del $listid 0 1"
|
||||
echo $cmd
|
||||
$cmd
|
||||
done
|
||||
done
|
||||
#echo "deleting list $listid"
|
||||
ssdk_sh acl list destroy $listid
|
||||
done
|
||||
}
|
||||
|
||||
function delete_war_cosmap(){
|
||||
ssdk_sh cosmap pri2q set 0 0
|
||||
ssdk_sh cosmap pri2q set 1 0
|
||||
ssdk_sh cosmap pri2q set 2 1
|
||||
ssdk_sh cosmap pri2q set 3 1
|
||||
ssdk_sh cosmap pri2q set 4 2
|
||||
ssdk_sh cosmap pri2q set 5 2
|
||||
ssdk_sh cosmap pri2q set 6 3
|
||||
ssdk_sh cosmap pri2q set 7 3
|
||||
ssdk_sh cosmap pri2ehq set 0 1
|
||||
ssdk_sh cosmap pri2ehq set 1 0
|
||||
ssdk_sh cosmap pri2ehq set 2 2
|
||||
ssdk_sh cosmap pri2ehq set 3 2
|
||||
ssdk_sh cosmap pri2ehq set 4 3
|
||||
ssdk_sh cosmap pri2ehq set 5 3
|
||||
ssdk_sh cosmap pri2ehq set 6 4
|
||||
ssdk_sh cosmap pri2ehq set 7 5
|
||||
}
|
||||
|
||||
function delete_acl_byp_egstp_rules(){
|
||||
chip_ver=$1
|
||||
cmd="ssdk_sh servcode config set 1 n 0 0xfffefcff 0xffbfff 0 0 0 0 0 0"
|
||||
if [ "$chip_ver" == "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
cmd="$cmd 0"
|
||||
fi
|
||||
#echo $cmd
|
||||
$cmd
|
||||
ssdk_sh acl list unbind 56 0 2 1
|
||||
ssdk_sh acl rule del 56 0 1
|
||||
ssdk_sh acl rule del 56 1 1
|
||||
ssdk_sh acl rule del 56 2 1
|
||||
ssdk_sh acl list destroy 56
|
||||
}
|
||||
|
||||
function edma_war_config_add(){
|
||||
create_war_cosmap
|
||||
ssdk_sh acl status set enable
|
||||
create_war_acl_rules
|
||||
}
|
||||
|
||||
function edma_war_config_del(){
|
||||
delete_war_acl_rules
|
||||
delete_war_cosmap
|
||||
}
|
||||
|
||||
function ipq50xx_serdes_monitor () {
|
||||
#if qca808x phy exist, need to monitor the serdes to avoid the effect for WIFI
|
||||
port_id=2
|
||||
old_linkstatus="DISABLE"
|
||||
phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
|
||||
if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd101" ]; then
|
||||
ssdk_sh debug phy set 29 0xb 0x300d
|
||||
ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
|
||||
|
||||
while true
|
||||
do
|
||||
cur_linkstatus=`ssdk_sh port linkstatus get $port_id | grep Status | awk -F ':' '{print $2}'`
|
||||
#when qca808x phy link status is from down to up, serdes tx would be enabled
|
||||
if [ "$cur_linkstatus" = "ENABLE" ] && [ "$old_linkstatus" = "DISABLE" ]; then
|
||||
ssdk_sh debug phy set 29 0xb 0xb00d
|
||||
ssdk_sh debug uniphy set 0 0x7ac 0xb00d 4
|
||||
fi
|
||||
#when qca808x phy link status is from up to down, serdes tx would be disabled
|
||||
if [ "$cur_linkstatus" = "DISABLE" ] && [ "$old_linkstatus" = "ENABLE" ]; then
|
||||
ssdk_sh debug phy set 29 0xb 0x300d
|
||||
ssdk_sh debug uniphy set 0 0x7ac 0x300d 4
|
||||
fi
|
||||
old_linkstatus=$cur_linkstatus
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
function ipq53xx_phy_amplitude_set () {
|
||||
#for qca808x phy sgmii, set half amplitude with src_half_swing register
|
||||
port_id=2
|
||||
phy_id_info=`ssdk_sh port phyid get $port_id | grep Org | awk -F '!' '{print $2}'`
|
||||
if [ "$phy_id_info" = "[Org ID]:0x004d[Rev ID]:0xd180" ]; then
|
||||
ssdk_sh debug phy set 5 0x40010087 0x208a
|
||||
ssdk_sh debug phy set 6 0x40010087 0x208a
|
||||
#Set the Reg0x67 bits[7:5]=3’b000 and bit4=1’b1
|
||||
ampl_val=$(eval "ssdk_sh debug phy get 5 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
|
||||
ssdk_sh debug phy set 5 0x40010067 $ampl_val
|
||||
ampl_val=$(eval "ssdk_sh debug phy get 6 0x40010067 | grep SSDK | grep -oE '0x[0-9a-fA-F]+' | sed 's/\(0x..\)./\11/'")
|
||||
ssdk_sh debug phy set 6 0x40010067 $ampl_val
|
||||
fi
|
||||
}
|
||||
|
||||
function ipq53xx_uniphy_amplitude_set () {
|
||||
#for ipq50xx sgmii, set half amplitude with tx_emp_lvl/margin_index and tx_margin
|
||||
ssdk_sh debug uniphy set 0 0x7ac 0xb10d 4
|
||||
ssdk_sh debug uniphy set 0 0x24 0 4
|
||||
ssdk_sh debug uniphy set 1 0x7ac 0xb10d 4
|
||||
ssdk_sh debug uniphy set 1 0x24 0 4
|
||||
}
|
||||
|
||||
ssdk_dependency() {
|
||||
counter=0
|
||||
[ -e /lib/modules/$(uname -r)/qca-ssdk.ko ] && [ ! -d /sys/module/qca_ssdk ] && {
|
||||
insmod qca-ssdk.ko
|
||||
}
|
||||
while [ ! -d /sys/ssdk ] && [ "$counter" -le 5 ]
|
||||
do
|
||||
sleep 1
|
||||
counter=$((counter+1))
|
||||
done
|
||||
}
|
||||
|
||||
start() {
|
||||
ssdk_dependency
|
||||
chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
|
||||
#The following commands should be uncommented to enable EDMA WAR
|
||||
if [ "$chip_ver" = "0x1401" ]; then
|
||||
#edma_war_config_add
|
||||
echo ''
|
||||
fi
|
||||
#The following commands should be uncommented to add acl egress stp bypass rules
|
||||
if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
#create_acl_byp_egstp_rules $chip_ver
|
||||
echo ''
|
||||
fi
|
||||
#The following commands should be uncommented to enable WAR for ipq50xx
|
||||
chip_type_info=`cat tmp/sysinfo/model`
|
||||
result=$(echo $chip_type_info | grep "IPQ5018")
|
||||
if [ "$result" != "" ]; then
|
||||
#ipq50xx_serdes_monitor &
|
||||
#ipq50xx_uniphy_amplitude_set
|
||||
#ipq50xx_phy_amplitude_set
|
||||
echo ''
|
||||
fi
|
||||
if [ "$chip_ver" = "0x2001" ]; then
|
||||
ipq53xx_uniphy_amplitude_set
|
||||
ipq53xx_phy_amplitude_set
|
||||
echo ''
|
||||
fi
|
||||
echo starting
|
||||
}
|
||||
|
||||
stop() {
|
||||
chip_ver=`ssdk_sh debug reg get 0 4 | grep Data | tr -d 'SSDK Init OK![Data]:'`
|
||||
#The following commands should be uncommented to disable EDMA WAR
|
||||
if [ "$chip_ver" = "0x1401" ]; then
|
||||
#edma_war_config_del
|
||||
echo ''
|
||||
fi
|
||||
#The following commands should be uncommented to delete acl egress stp bypass rules
|
||||
if [ "$chip_ver" = "0x1500" ] || [ "$chip_ver" = "0x1501" ] || [ "$chip_ver" = "0x2000" ] || [ "$chip_ver" = "0x2001" ] || [ "$chip_ver" = "0x2100" ]; then
|
||||
#delete_acl_byp_egstp_rules $chip_ver
|
||||
echo ''
|
||||
fi
|
||||
echo stoping
|
||||
}
|
||||
@@ -6,13 +6,16 @@ check_certificates() {
|
||||
|
||||
check_certificates
|
||||
|
||||
bootconfig_lookup() {
|
||||
case "$(fw_printenv -n cert_part)" in
|
||||
0) echo "0:BOOTCONFIG"
|
||||
;;
|
||||
1) echo "0:BOOTCONFIG1"
|
||||
;;
|
||||
esac
|
||||
tar_part_lookup() {
|
||||
part="$(fw_printenv -n cert_part)"
|
||||
if [ "$part" -eq 0 ]; then
|
||||
echo "$2"
|
||||
part=1
|
||||
else
|
||||
echo "$1"
|
||||
part=0
|
||||
fi
|
||||
fw_setenv cert_part $part
|
||||
}
|
||||
|
||||
. /lib/functions.sh
|
||||
@@ -35,13 +38,39 @@ sonicfi,rap7*)
|
||||
[ -n "$mtd" ] && mount -t ext4 /dev/mtdblock$mtd /certificates
|
||||
fi
|
||||
if [ ! -f /certificates/cert.pem ] || [ ! -f /certificates/key.pem ]; then
|
||||
bootconfig=$(bootconfig_lookup)
|
||||
if [ -n "$bootconfig" ]; then
|
||||
mmc_dev=$(echo $(find_mmc_part "$bootconfig") | sed 's/^.\{5\}//')
|
||||
part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
|
||||
if [ -n "part" ]; then
|
||||
mmc_dev=$(echo $(find_mmc_part "$part") | sed 's/^.\{5\}//')
|
||||
[ -n "$mmc_dev" ] && tar xf /dev/$mmc_dev -C /certificates
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
udaya,a5-id2)
|
||||
mtd=$(find_mtd_index certificates)
|
||||
if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
|
||||
mount -t squashfs /dev/mtdblock$mtd /mnt
|
||||
cp /mnt/* /certificates
|
||||
umount /mnt
|
||||
fi
|
||||
part=$(tar_part_lookup "insta1" "insta2")
|
||||
if [ -n "insta" ]; then
|
||||
mtd=$(find_mtd_index $part)
|
||||
[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
|
||||
fi
|
||||
;;
|
||||
sonicfi,rap6*)
|
||||
mtd=$(find_mtd_index certificates)
|
||||
if [ "$(head -c 4 /dev/mtd$mtd)" == "hsqs" ]; then
|
||||
mount -t squashfs /dev/mtdblock$mtd /mnt
|
||||
cp /mnt/* /certificates
|
||||
umount /mnt
|
||||
fi
|
||||
part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
|
||||
if [ -n "$part" ]; then
|
||||
mtd=$(find_mtd_index $part)
|
||||
[ -n "$mtd" ] && tar xf /dev/mtdblock$mtd -C /certificates
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
mtd=$(find_mtd_index certificates)
|
||||
|
||||
|
||||
@@ -1,25 +1,43 @@
|
||||
#!/bin/sh
|
||||
|
||||
bootconfig_lookup() {
|
||||
bootconfig="$(fw_printenv -n cert_part)"
|
||||
case "$(fw_printenv -n cert_part)" in
|
||||
0) echo "0:BOOTCONFIG1"
|
||||
bootconfig=1
|
||||
;;
|
||||
*) echo "0:BOOTCONFIG"
|
||||
bootconfig=0
|
||||
;;
|
||||
esac
|
||||
fw_setenv cert_part $bootconfig
|
||||
tar_part_lookup() {
|
||||
part="$(fw_printenv -n cert_part)"
|
||||
if [ "$part" -eq 0 ]; then
|
||||
echo "$2"
|
||||
part=1
|
||||
else
|
||||
echo "$1"
|
||||
part=0
|
||||
fi
|
||||
fw_setenv cert_part $part
|
||||
}
|
||||
|
||||
. /lib/functions.sh
|
||||
case "$(board_name)" in
|
||||
sonicfi,rap7110c-341x)
|
||||
cd /certificates
|
||||
tar cf /tmp/certs.tar
|
||||
bootconfig=$(bootconfig_lookup)
|
||||
mmc_dev=$(echo $(find_mmc_part $bootconfig) | sed 's/^.\{5\}//')
|
||||
dd if=/tmp/certs.tar of=/dev/$bootconfig
|
||||
tar cf /tmp/certs.tar .
|
||||
part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
|
||||
mmc_dev=$(echo $(find_mmc_part $part) | sed 's/^.\{5\}//')
|
||||
dd if=/tmp/certs.tar of=/dev/$mmc_dev
|
||||
;;
|
||||
udaya,a5-id2)
|
||||
cd /certificates
|
||||
tar cf /tmp/certs.tar .
|
||||
part=$(tar_part_lookup "insta1" "insta2")
|
||||
mtd=$(find_mtd_index $part)
|
||||
dd if=/tmp/certs.tar of=/dev/mtdblock$mtd
|
||||
;;
|
||||
sonicfi,rap6*)
|
||||
if [ "$(fw_printenv -n store_certs_disabled)" != "1" ]; then
|
||||
cd /certificates
|
||||
tar cf /tmp/certs.tar .
|
||||
part=$(tar_part_lookup "0:BOOTCONFIG" "0:BOOTCONFIG1")
|
||||
mtd=$(find_mtd_index $part)
|
||||
block_size=$(cat /sys/class/mtd/mtd$mtd/size)
|
||||
dd if=/tmp/certs.tar of=/tmp/certs_pad.tar bs=$block_size conv=sync
|
||||
mtd write /tmp/certs_pad.tar /dev/mtd$mtd
|
||||
rm -f /tmp/certs.tar /tmp/certs_pad.tar
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -6,6 +6,8 @@ STOP=01
|
||||
USE_PROCD=1
|
||||
|
||||
start_service() {
|
||||
[ -e "/tmp/rrm_timestamp" ] && rm -rf /tmp/rrm_timestamp
|
||||
[ -e "/tmp/rrm_chan_switch" ] && rm -rf /tmp/rrm_chan_switch
|
||||
rm -rf /tmp/threshold_breach_count*
|
||||
rm -rf /tmp/fixed_channel*
|
||||
rm -rf /tmp/chanutil_phy*
|
||||
|
||||
@@ -24,6 +24,10 @@ function stats_info_write(path, value) {
|
||||
file.close();
|
||||
}
|
||||
|
||||
function record_rrm_timestamp() {
|
||||
stats_info_write("/tmp/rrm_timestamp", time());
|
||||
}
|
||||
|
||||
// total number of radios: default=2
|
||||
let num_radios = 2;
|
||||
let phy_count;
|
||||
@@ -136,20 +140,122 @@ function channel_to_freq(band, channel) {
|
||||
return freq;
|
||||
}
|
||||
|
||||
function center_freq_calc(band, freq, bandwidth) {
|
||||
if (bandwidth == 40)
|
||||
return +freq + 10;
|
||||
if (bandwidth == 80)
|
||||
return +freq + 30;
|
||||
if (bandwidth == 160)
|
||||
return +freq + 70;
|
||||
if (bandwidth == 320)
|
||||
if (freq == 6115)
|
||||
return +freq - 10;
|
||||
else
|
||||
return +freq + 150;
|
||||
// using mapping to get correct center channel, especially for 6G radio
|
||||
function get_center_channel(channel, band, bw) {
|
||||
let center_channel = channel;
|
||||
let center_channel_map = {};
|
||||
|
||||
return +freq;
|
||||
switch (band) {
|
||||
case '5g':
|
||||
if (bw == 40) {
|
||||
center_channel_map = {
|
||||
"36": 38, "40": 38,
|
||||
"44": 46, "48": 46,
|
||||
"52": 54, "56": 54,
|
||||
"60": 62, "64": 62,
|
||||
"100": 102, "104": 102,
|
||||
"108": 110, "112": 110,
|
||||
"116": 118, "120": 118,
|
||||
"124": 126, "128": 126,
|
||||
"132": 134, "136": 134,
|
||||
"140": 142, "144": 142,
|
||||
"149": 151, "153": 151,
|
||||
"157": 159, "161": 159,
|
||||
"165": 167
|
||||
};
|
||||
} else if (bw == 80) {
|
||||
center_channel_map = {
|
||||
"36": 42, "40": 42, "44": 42, "48": 42,
|
||||
"52": 58, "56": 58, "60": 58, "64": 58,
|
||||
"100": 106, "104": 106, "108": 106, "112": 106,
|
||||
"116": 122, "120": 122, "124": 122, "128": 122,
|
||||
"132": 138, "136": 138, "140": 138, "144": 138,
|
||||
"149": 155, "153": 155, "157": 155, "161": 155,
|
||||
"165": 171
|
||||
};
|
||||
} else if (bw == 160) {
|
||||
center_channel_map = {
|
||||
"36": 50, "40": 50, "44": 50, "48": 50,
|
||||
"52": 50, "56": 50, "60": 50, "64": 50,
|
||||
"100": 114, "104": 114, "108": 114, "112": 114,
|
||||
"116": 114, "120": 114, "124": 114, "128": 114
|
||||
};
|
||||
}
|
||||
break;
|
||||
case '6g':
|
||||
if (bw == 40) {
|
||||
center_channel_map = {
|
||||
"1": 3, "5": 3, "9": 11, "13": 11,
|
||||
"17": 19, "21": 19, "25": 27, "29": 27,
|
||||
"33": 35, "37": 35, "41": 43, "45": 43,
|
||||
"49": 51, "53": 51, "57": 59, "61": 59,
|
||||
"65": 67, "69": 67, "73": 75, "77": 75,
|
||||
"81": 83, "85": 83, "89": 91, "93": 91,
|
||||
"97": 99, "101": 99, "105": 107, "109": 107,
|
||||
"113": 115, "117": 115, "121": 123, "125": 123,
|
||||
"129": 131, "133": 131, "137": 139, "141": 139,
|
||||
"145": 147, "149": 147, "153": 155, "157": 155,
|
||||
"161": 163, "165": 163, "169": 171, "173": 171,
|
||||
"177": 179, "181": 179, "185": 187, "189": 187,
|
||||
"193": 195, "197": 195, "201": 203, "205": 203,
|
||||
"209": 211, "213": 211, "217": 219, "221": 219,
|
||||
"225": 227
|
||||
};
|
||||
} else if (bw == 80) {
|
||||
center_channel_map = {
|
||||
"1": 7, "5": 7, "9": 7, "13": 7,
|
||||
"17": 23, "21": 23, "25": 23, "29": 23,
|
||||
"33": 39, "37": 39, "41": 39, "45": 39,
|
||||
"49": 55, "53": 55, "57": 55, "61": 55,
|
||||
"65": 71, "69": 71, "73": 71, "77": 71,
|
||||
"81": 87, "85": 87, "89": 87, "93": 87,
|
||||
"97": 103, "101": 103, "105": 103, "109": 103,
|
||||
"113": 119, "117": 119, "121": 119, "125": 119,
|
||||
"129": 135, "133": 135, "137": 135, "141": 135,
|
||||
"145": 151, "149": 151, "153": 151, "157": 151,
|
||||
"161": 167, "165": 167, "169": 167, "173": 167,
|
||||
"177": 183, "181": 183, "185": 183, "189": 183,
|
||||
"193": 199, "197": 199, "201": 199, "205": 199,
|
||||
"209": 215
|
||||
};
|
||||
} else if (bw == 160) {
|
||||
center_channel_map = {
|
||||
"1": 15, "5": 15, "9": 15, "13": 15,
|
||||
"17": 15, "21": 15, "25": 15, "29": 15,
|
||||
"33": 47, "37": 47, "41": 47, "45": 47,
|
||||
"49": 47, "53": 47, "57": 47, "61": 47,
|
||||
"65": 79, "69": 79, "73": 79, "77": 79,
|
||||
"81": 79, "85": 79, "89": 79, "93": 79,
|
||||
"97": 111, "101": 111, "105": 111, "109": 111,
|
||||
"113": 111, "117": 111, "121": 111, "125": 111,
|
||||
"129": 143, "133": 143, "137": 143, "141": 143,
|
||||
"145": 143, "149": 143, "153": 143, "157": 143,
|
||||
"161": 175, "165": 175, "169": 175, "173": 175,
|
||||
"177": 175, "181": 175, "185": 175, "189": 175,
|
||||
"193": 207
|
||||
};
|
||||
} else if (bw == 320) {
|
||||
center_channel_map = {
|
||||
"1": 31, "5": 31, "9": 31, "13": 31,
|
||||
"17": 31, "21": 31, "25": 31, "29": 31,
|
||||
"33": 63, "37": 63, "41": 63, "45": 63,
|
||||
"49": 63, "53": 63, "57": 63, "61": 63,
|
||||
"65": 63, "69": 63, "73": 63, "77": 63,
|
||||
"81": 63, "85": 63, "89": 63, "93": 63,
|
||||
"97": 127, "101": 127, "105": 127, "109": 127,
|
||||
"113": 127, "117": 127, "121": 127, "125": 127,
|
||||
"129": 127, "133": 127, "137": 127, "141": 127,
|
||||
"145": 127, "149": 127, "153": 127, "157": 127,
|
||||
"161": 191
|
||||
};
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (center_channel_map[channel])
|
||||
center_channel = center_channel_map[channel];
|
||||
|
||||
return center_channel;
|
||||
}
|
||||
|
||||
function interface_status_check(iface) {
|
||||
@@ -201,6 +307,9 @@ function check_current_channel(iface) {
|
||||
function hostapd_switch_channel(msg) {
|
||||
ulog_info(`[%s] Start switch channel to %d \n`, msg.iface, msg.channel);
|
||||
|
||||
// Channel switch in progress, set flag = 1
|
||||
stats_info_write("/tmp/rrm_chan_switch", 1);
|
||||
|
||||
let chan_switch_status = 0;
|
||||
let sec_channel_offset = null;
|
||||
|
||||
@@ -208,7 +317,8 @@ function hostapd_switch_channel(msg) {
|
||||
let bandwidth = replace(msg.htmode, /[^0-9]/g, '');
|
||||
|
||||
let target_freq = channel_to_freq(msg.band, msg.channel);
|
||||
let center_freq = center_freq_calc(msg.band, target_freq, bandwidth);
|
||||
let center_channel = get_center_channel(msg.channel, msg.band, bandwidth);
|
||||
let center_freq = channel_to_freq(msg.band, center_channel);
|
||||
if (bandwidth > 20)
|
||||
sec_channel_offset = 1;
|
||||
|
||||
@@ -245,9 +355,20 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
|
||||
ulog_info(`[%s] 5G radio might need some time to be UP (DFS enabled) \n`, iface);
|
||||
|
||||
let p = 0;
|
||||
// Max 65 seconds wait for the DFS enabled interface to be UP
|
||||
// Default max 70 seconds wait for the DFS enabled interface to be UP
|
||||
let timer = 70;
|
||||
|
||||
// get real timer from hostapd_cli command
|
||||
let check_cac_time = sprintf('hostapd_cli -i %s status | grep \"cac_time_left_seconds\" | awk -F "=" \'{print $2}\'', iface);
|
||||
let _cac_time = fs.popen(check_cac_time);
|
||||
let cac_time = trim(_cac_time.read('all'));
|
||||
_cac_time.close();
|
||||
|
||||
// if cac_time is a valid number, set timer to cac_time + 5 seconds
|
||||
if (cac_time > 0 && match(cac_time, /^[0-9]+$/)) {
|
||||
timer = int(cac_time) + 5;
|
||||
}
|
||||
|
||||
while (p < timer) {
|
||||
ulog_info(`[%s] Check#%d \n `, iface, p);
|
||||
|
||||
@@ -267,6 +388,9 @@ function switch_status_check(iface, dfs_enabled_5g_flag) {
|
||||
}
|
||||
}
|
||||
|
||||
// Channel switch done, set flag = 0
|
||||
stats_info_write("/tmp/rrm_chan_switch", 0);
|
||||
|
||||
let current_chan = check_current_channel(iface);
|
||||
return current_chan;
|
||||
}
|
||||
@@ -436,7 +560,7 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
|
||||
ulog_info(`[%s] Selected channel list from config (default channel list shall be used in case channels haven't been selected) = %s \n`, iface, (chan_list_valid || '[]'));
|
||||
|
||||
if (band == '2g' && bw >= 40) {
|
||||
ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio \n`, iface, bw);
|
||||
ulog_info(`[%s] It is highly recommended to NOT use %dMHz bandwidth for 2.4G radio (RRM will not work properly) \n`, iface, bw);
|
||||
} else if (band == '5g' && bw > 160) {
|
||||
ulog_info(`[%s] %dMHz bandwidth not supported for 5G radio. Please use a bandwidth of 160MHz or lower\n`, iface, bw);
|
||||
}
|
||||
@@ -568,9 +692,28 @@ function random_channel_selection(iface, band, htmode, chan_list_valid) {
|
||||
return random_channel;
|
||||
}
|
||||
|
||||
function check_center_channel(chosen_random_channel, current_channel, band, htmode) {
|
||||
let ret = false;
|
||||
let bw = replace(htmode, /[^0-9]/g, '');
|
||||
|
||||
if (band != '2g' || bw != 20) {
|
||||
// for 2G band or 20MHz bandwidth, center channel is the same as the channel
|
||||
let chosen_random_channel_center = get_center_channel(chosen_random_channel, band, bw);
|
||||
let current_channel_center = get_center_channel(current_channel, band, bw);
|
||||
|
||||
ulog_info(`Center channel of the chosen random channel (%d) = %d; Center channel of the current channel (%d) = %d \n`, chosen_random_channel, chosen_random_channel_center, current_channel, current_channel_center);
|
||||
|
||||
if (chosen_random_channel_center == current_channel_center)
|
||||
ret = true;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
|
||||
let chosen_random_channel = 0;
|
||||
let res = 0;
|
||||
let same_center_channel = false;
|
||||
|
||||
// random_channel_selection script will help to select random channel
|
||||
chosen_random_channel = random_channel_selection(iface, band, htmode, selected_channels);
|
||||
@@ -580,8 +723,15 @@ function algo_rcs(iface, current_channel, band, htmode, selected_channels) {
|
||||
ulog_info(`[%s] RCS assigned the same channel = %d; Skip channel switch \n`, iface, chosen_random_channel);
|
||||
res = 0;
|
||||
} else if (chosen_random_channel > 0) {
|
||||
ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
|
||||
res = 1;
|
||||
// check if the random channel has the same center channel as the current channel
|
||||
same_center_channel = check_center_channel(chosen_random_channel, current_channel, band, htmode);
|
||||
if (same_center_channel) {
|
||||
ulog_info(`[%s] RCS found channel %d with the same center channel as current channel %d; Skip channel switch \n`, iface, chosen_random_channel, current_channel);
|
||||
res = 0;
|
||||
} else {
|
||||
ulog_info(`[%s] RCS done ... random channel found = %d\n`, iface, chosen_random_channel);
|
||||
res = 1;
|
||||
}
|
||||
} else {
|
||||
ulog_info(`[%s] RCS scan FAIL. Retry Channel optimization at next cycle \n`, iface);
|
||||
res = 0;
|
||||
@@ -611,6 +761,8 @@ function channel_optimize() {
|
||||
return config.interval;
|
||||
}
|
||||
|
||||
record_rrm_timestamp();
|
||||
|
||||
let current_rf_down = {};
|
||||
let cool_down_f = {};
|
||||
let check_all_cool_down = 0;
|
||||
@@ -924,7 +1076,7 @@ function channel_optimize() {
|
||||
}
|
||||
} else {
|
||||
// revert back to the original channel
|
||||
ulog_info(`[%s] Channel %d has a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
|
||||
ulog_info(`[%s] Channel %d may have a cac_time longer than 60 seconds, RRM failed for this interval (you might want to avoid selecting this channel) \n`, radio_iface[l], init_payload.channel);
|
||||
}
|
||||
} else if (selected_algo == "ACS") {
|
||||
let random_wait_time = random_time_calc();
|
||||
@@ -940,6 +1092,9 @@ function channel_optimize() {
|
||||
check_all_threshold_breach >= 1: threshold breach count exceeded for one or more interfaces
|
||||
*/
|
||||
|
||||
// Channel switch in progress, set flag = 1
|
||||
stats_info_write("/tmp/rrm_chan_switch", 1);
|
||||
|
||||
// flag to check if 5G radio was restarted
|
||||
let radio_5g_restarted = 0;
|
||||
|
||||
@@ -1003,6 +1158,10 @@ function channel_optimize() {
|
||||
sleep(30000);
|
||||
}
|
||||
}
|
||||
|
||||
sleep(5000);
|
||||
// Channel switch done, set flag = 0
|
||||
stats_info_write("/tmp/rrm_chan_switch", 0);
|
||||
} else {
|
||||
if (threshold_breach_f[l] != 1) {
|
||||
ulog_info(`[%s] Threshold breach count (=%d) < Allowed consecutive Channel Utilization threshold breach count (=%d), will be checked again in the next interval \n`, radio_iface[l], threshold_breach_count[l], config.consecutive_threshold_breach);
|
||||
@@ -1016,6 +1175,7 @@ function channel_optimize() {
|
||||
}
|
||||
}
|
||||
ulog_info(`RRM with channel optimization finished; next RRM round starts in %d seconds \n`, config.interval/1000);
|
||||
record_rrm_timestamp();
|
||||
|
||||
return config.interval;
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-client
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
|
||||
PKG_MIRROR_HASH:=2e28e0aa61b74851c7daf3634ec34d303a603e881e6c5d1fd76c837dea527582
|
||||
PKG_MIRROR_HASH:=34c912efa9c0dcdbc6122296e236993484b24b3bc4de51608356304afc8df1c3
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_DATE:=2025-07-08
|
||||
PKG_SOURCE_VERSION:=69829f63ea172ce9bd19b7b02073746fe9cf6a52
|
||||
PKG_SOURCE_DATE:=2025-07-27
|
||||
PKG_SOURCE_VERSION:=c536f6957bd96e57301f9d540b75460119d2a69a
|
||||
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
|
||||
|
||||
@@ -6,9 +6,9 @@ config ucentral config
|
||||
option reporting 10
|
||||
|
||||
config timeouts timeouts
|
||||
option offline 120
|
||||
option offline 14400
|
||||
option validate 120
|
||||
option orphan 120
|
||||
option orphan 7200
|
||||
|
||||
#config event
|
||||
# option type dhcp
|
||||
|
||||
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
|
||||
PKG_MIRROR_HASH:=9b12cf94b94688aaf2245742ac1cd3d7a2bccade7e248c47c5f13a3dd7c07401
|
||||
PKG_MIRROR_HASH:=45575f1f345368d109f74dc5ae3c8648dadbebef37e2d8eadc95b4fca2fbf43f
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_DATE:=2025-07-11
|
||||
PKG_SOURCE_VERSION:=b971b73d4cedae6175926373adcdc37a04ced11c
|
||||
PKG_SOURCE_DATE:=2025-07-30
|
||||
PKG_SOURCE_VERSION:=30c73745c104d56f58d4f457956fe7ebac6e0f86
|
||||
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
|
||||
|
||||
@@ -22,7 +22,65 @@ let current_state;
|
||||
let online = false;
|
||||
|
||||
function self_healing() {
|
||||
let heal_wifi = false;
|
||||
let health_stat = json(fs.readfile('/tmp/ucentral.health'));
|
||||
let last_nw_restart_ts = int(fs.readfile('/tmp/ucentral.nw_restart_ts')) || 0;
|
||||
let time_passed_since_nw_restart = time() - last_nw_restart_ts;
|
||||
|
||||
if (health_stat) {
|
||||
if (health_stat.data.rrm_chanutil == false) {
|
||||
// RRM with Channel utilization abnormal, restart rrmd
|
||||
ulog(LOG_INFO, 'RRM with Channel utilization abnormal, restarting rrmd\n');
|
||||
system('/etc/init.d/rrmd restart');
|
||||
}
|
||||
|
||||
if (health_stat.sanity != 100) {
|
||||
for (let iface in health_stat.data.interfaces) {
|
||||
let iface_data = health_stat.data.interfaces[iface];
|
||||
if (iface_data.ssids) {
|
||||
// one of the VAPs have an issue: flag up!
|
||||
heal_wifi = true;
|
||||
ulog(LOG_INFO, 'Time passed since last network restart = %d seconds\n', time_passed_since_nw_restart);
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// all VAPs are healthy, no need to heal anything
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (fs.stat('/tmp/rrm_timestamp')) {
|
||||
let rrm_chan_switch_flag = int(fs.readfile('/tmp/rrm_chan_switch')) || 0;
|
||||
let last_rrm_timestamp = int(fs.readfile('/tmp/rrm_timestamp'));
|
||||
let time_passed_since_rrm = time() - last_rrm_timestamp;
|
||||
|
||||
if (rrm_chan_switch_flag == 1) {
|
||||
// RRM chan switch in progress, do not restart network!
|
||||
ulog(LOG_INFO, 'RRM channel switch in progress, cannot restart network \n');
|
||||
heal_wifi = false;
|
||||
}
|
||||
|
||||
if (time_passed_since_rrm < 180) {
|
||||
// RRM in progress, do not restart network!
|
||||
ulog(LOG_INFO, 'RRM with Channel utilization may still be in progress, cannot restart network \n');
|
||||
heal_wifi = false;
|
||||
}
|
||||
}
|
||||
|
||||
// keep a gap of at least 5 minutes between network restarts
|
||||
if (heal_wifi && time_passed_since_nw_restart > 300) {
|
||||
ulog(LOG_INFO, 'Restarting network \n');
|
||||
// update network restart timestamp
|
||||
let f = fs.open("/tmp/ucentral.nw_restart_ts", "w");
|
||||
if (f) {
|
||||
f.write(time());
|
||||
f.close();
|
||||
}
|
||||
|
||||
// restart network
|
||||
system('/etc/init.d/network restart');
|
||||
}
|
||||
}
|
||||
|
||||
let healthcheck;
|
||||
@@ -42,7 +100,7 @@ healthcheck = {
|
||||
},
|
||||
|
||||
spawn: function() {
|
||||
ulog(LOG_INFO, 'healtcheck execute\n');
|
||||
ulog(LOG_INFO, 'healthcheck execute\n');
|
||||
healthcheck.pid = uloop.process('/usr/share/ucentral/health.uc', [], {}, healthcheck.complete);
|
||||
},
|
||||
};
|
||||
@@ -207,7 +265,7 @@ let ubus_methods = {
|
||||
current_state = req.args.state;
|
||||
blink_timeout();
|
||||
ulog(LOG_INFO, 'set state -> ' + req.args.state + '\n');
|
||||
|
||||
|
||||
return state_handler[req.args.state](req.args);
|
||||
},
|
||||
args: {
|
||||
|
||||
@@ -0,0 +1,37 @@
|
||||
From 0b83834085bf536183b0683f4f86800dbe1e2d39 Mon Sep 17 00:00:00 2001
|
||||
From: John Crispin <john@phrozen.org>
|
||||
Date: Mon, 28 Jul 2025 07:49:07 +0200
|
||||
Subject: [PATCH] toolchain: use older gcc11 for legacy targets
|
||||
|
||||
Signed-off-by: John Crispin <john@phrozen.org>
|
||||
---
|
||||
toolchain/binutils/Config.version | 1 +
|
||||
toolchain/gcc/Config.version | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/toolchain/binutils/Config.version b/toolchain/binutils/Config.version
|
||||
index c9f8584480..5393d389a5 100644
|
||||
--- a/toolchain/binutils/Config.version
|
||||
+++ b/toolchain/binutils/Config.version
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
config BINUTILS_VERSION_2_37
|
||||
bool
|
||||
+ default y if TARGET_ipq40xx
|
||||
|
||||
config BINUTILS_VERSION_2_38
|
||||
bool
|
||||
diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version
|
||||
index 7126a0c883..b7de3d00e3 100644
|
||||
--- a/toolchain/gcc/Config.version
|
||||
+++ b/toolchain/gcc/Config.version
|
||||
@@ -1,5 +1,6 @@
|
||||
config GCC_VERSION_11
|
||||
default y if GCC_USE_VERSION_11
|
||||
+ default y if TARGET_ipq40xx
|
||||
bool
|
||||
|
||||
config GCC_VERSION_13
|
||||
--
|
||||
2.34.1
|
||||
|
||||
12
profiles/edgecore_spw2ac1200.yml
Normal file
12
profiles/edgecore_spw2ac1200.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
---
|
||||
profile: edgecore_spw2ac1200
|
||||
target: ipq40xx
|
||||
subtarget: generic
|
||||
description: Build image for the Edgecore spw2ac1200
|
||||
image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-edgecore_spw2ac1200-squashfs-nand-sysupgrade.bin
|
||||
packages:
|
||||
- ipq40xx
|
||||
include:
|
||||
- ucentral-ap
|
||||
- hostapd
|
||||
- target-ipq40xx
|
||||
12
profiles/hfcl_ion4.yml
Normal file
12
profiles/hfcl_ion4.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
---
|
||||
profile: hfcl_ion4
|
||||
target: ipq40xx
|
||||
subtarget: generic
|
||||
description: Build image for the HFCL ION4
|
||||
image: bin/targets/ipq40xx/generic/openwrt-ipq40xx-generic-hfcl_ion4-squashfs-nand-sysupgrade.bin
|
||||
packages:
|
||||
- ipq40xx
|
||||
include:
|
||||
- ucentral-ap
|
||||
- hostapd
|
||||
- target-ipq40xx
|
||||
Reference in New Issue
Block a user