Compare commits

..

23 Commits

Author SHA1 Message Date
Ionut-Alex Oprea
0b861b97bb inteno-netmode: update repo hash 2017-12-19 10:37:24 +01:00
Reidar Cederqvist
ccb4e65f34 inteno-netmode: add repo for netmoded source code 2017-12-19 10:37:24 +01:00
Kenneth Johansson
011f586731 fatrace: we need to flush every line when using a pipe.
/sbin/fatrace -c -t -f W |  grep "/etc/"

produced no output until internal printf buffer full and that is not so
useful.
2017-12-18 21:03:37 +01:00
Kenneth Johansson
90aff84618 fatrace: add kernel config option and patch for correct O_LAGEFILE.
The program only worked on x86.
2017-12-18 20:24:44 +01:00
Kenneth Johansson
e81718ab54 Add fatrace program. 2017-12-18 17:49:31 +01:00
Sukru Senli
498a53e080 questd-3.1.40 2017-12-17 13:09:40 +01:00
Sukru Senli
82f0e36033 questd: imonitor: do not restart quest if lan ifname is missing or is bridge 2017-12-17 13:07:30 +01:00
Erik Horemans
4c4c8dc576 new ice-client ice-client 5.0.1-RC0 2017-12-17 13:07:25 +01:00
Ionut-Alex Oprea
0ad032158b imonitor: increase questd memory limit to 20MB refs #13511 2017-12-17 13:07:25 +01:00
Anjan Chanda
1e957aeabf iop: select package wlng 2017-12-08 13:31:21 +01:00
Anjan Chanda
0a9e81aee6 Update feed [ feed_inteno_packages ] package [ wlng ]
-------------------------------------------------------------------------------
* e253b08 remove stray debug prints
-------------------------------------------------------------------------------
commit e253b080baac1ab0c81f1aa2c8faada254fbe484
Author: Anjan Chanda <anjan.chanda@inteno.se>
Date: 2017-12-08 12:53:49 +0100

    remove stray debug prints

Base directory -> /
 driver_mtk.c | 3 ---
 1 file changed, 3 deletions(-)
-------------------------------------------------------------------------------
2017-12-08 12:58:17 +01:00
Anjan Chanda
db6f345542 wlng: correct exported target flag 2017-12-08 16:14:32 +05:30
Anjan Chanda
85629b2009 wlng: include package 2017-12-07 20:55:49 +05:30
Reidar Cederqvist
a0c0cad5ee Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* a4c8de6 Merge remote-tracking branch 'origin/nvram_hv' into devel
* 16cb4dd questd: improve parsing
* 312ca10 questd: get nvram Hardware Version value
* 824c247 fix c99 warning
* 83a7011 questd: print rssi value from extender
* b554abd questd: get rssi value from extender
-------------------------------------------------------------------------------
commit a4c8de679ceae28dc418e1f779da7040b3c0e24f
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-06 14:56:33 +0100

    Merge remote-tracking branch 'origin/nvram_hv' into devel

Base directory -> /
 Makefile      |  2 +-
 dumper.c      | 19 +++++++++++++++
 network.c     | 30 ++++++++++++++---------
 network.h     |  7 +++++-
 system.c      |  5 ++++
 system.h      |  1 +
 wificontrol.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 7 files changed, 123 insertions(+), 17 deletions(-)
-------------------------------------------------------------------------------
commit 16cb4dda3909efef54b84d44fa11dc28f9763c8c
Author: Robin Stjerndorff <robin.stjerndorff@inteno.se>
Date: 2017-12-04 17:12:37 +0100

    questd: improve parsing

Base directory -> /
 dumper.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 312ca10075347ea1ca4d4a051d079ff5643a934e
Author: Robin Stjerndorff <robin.stjerndorff@inteno.se>
Date: 2017-12-04 16:27:27 +0100

    questd: get nvram Hardware Version value

Base directory -> /
 dumper.c | 20 ++++++++++++++++++++
 system.c |  5 +++++
 system.h |  1 +
 3 files changed, 26 insertions(+)
-------------------------------------------------------------------------------
commit 824c24781123b0cc83216486732e5a03823ec5ed
Author: Robin Stjerndorff <robin.stjerndorff@inteno.se>
Date: 2017-11-30 16:13:31 +0100

    fix c99 warning

Base directory -> /
 wificontrol.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit 83a7011877b6a7b1dcbcfd925037ffd77de5165f
Author: Robin Stjerndorff <robin.stjerndorff@inteno.se>
Date: 2017-11-23 15:37:56 +0100

    questd: print rssi value from extender

Base directory -> /
 network.c | 30 +++++++++++++++++++-----------
 network.h |  7 ++++++-
 2 files changed, 25 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit b554abd3fa7e0898095bfb575803081f716d3723
Author: Robin Stjerndorff <robin.stjerndorff@inteno.se>
Date: 2017-11-23 15:35:06 +0100

    questd: get rssi value from extender

Base directory -> /
 Makefile      |  2 +-
 wificontrol.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 71 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
2017-12-06 15:00:43 +01:00
Reidar Cederqvist
23203274e1 Revert "inteno-netmode: add repo for netmoded source code"
This reverts commit f2701fc6c1.
2017-12-04 14:25:47 +01:00
Reidar Cederqvist
ca0e860aad Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* c434011 add missing close for ioctl socket
-------------------------------------------------------------------------------
commit c434011a45f130f485f73ab44a2bbe55d41f9955
Author: Reidar Cederqvist <reidar.cederqvist@gmail.com>
Date: 2017-12-04 12:47:24 +0100

    add missing close for ioctl socket

Base directory -> /
 network.c | 1 +
 1 file changed, 1 insertion(+)
-------------------------------------------------------------------------------
2017-12-04 12:47:38 +01:00
Reidar Cederqvist
f2701fc6c1 inteno-netmode: add repo for netmoded source code 2017-12-04 09:08:57 +01:00
Ionut-Alex Oprea
42a8ce1819 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* d2f3a8f Merge branch 'uproxyd' into devel
* 10cba85 Define missing variable
* bc34921 mediatek: trigger auto channel selection based on busy time
-------------------------------------------------------------------------------
commit d2f3a8f4cbd812362906409c7022d31df908ac02
Author: Ionut-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2017-12-01 15:37:29 +0100

    Merge branch 'uproxyd' into devel

Base directory -> /
 .gitignore |   3 +
 Makefile   |  11 +-
 network.c  |   2 +-
 uproxyd.c  | 368 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 381 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 10cba850fb80668502ca5ce0bc57533089062741
Author: Jonas Höglund <jonas.hoglund@embeddednation.com>
Date: 2017-11-23 16:14:17 +0100

    Define missing variable

Base directory -> /
 port.c | 3 +++
 1 file changed, 3 insertions(+)
-------------------------------------------------------------------------------
commit bc34921baff1f6bc9d76920d8863010fa6b4e3cd
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2017-11-17 09:28:55 +0100

    mediatek: trigger auto channel selection based on busy time

Base directory -> /
 mediatek.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2017-12-01 15:41:11 +01:00
Reidar Cederqvist
041b6ee88f questd: start uproxy with questd 2017-11-30 14:40:41 +01:00
Reidar Cederqvist
9cfa0c0ce9 questd: change questd to uproxyd version 2017-11-30 14:40:23 +01:00
Ionut-Alex Oprea
f09e3ea1e5 Merge branch 'devel' into devel-new 2017-11-30 14:13:07 +01:00
Kenneth Johansson
a57fa2b48e adsl: new arguments to xtmlctl. 2017-11-30 13:43:09 +01:00
Kenneth Johansson
0493459fc2 vdsl: new command line and output on xtmctl. 2017-11-29 21:51:08 +01:00
25 changed files with 233 additions and 186 deletions

58
fatrace/Makefile Normal file
View File

@@ -0,0 +1,58 @@
#
# Copyright (C) 2006-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=fatrace
PKG_VERSION:=0.12
PKG_RELEASE:=1
PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
# support parallel build
#PKG_BUILD_PARALLEL:=1
#re create configure scripts if not present.
#PKG_FIXUP:=autoreconf
# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
# this way we don't need to pick out the resulting files from the build dir.
PKG_INSTALL:=1
PKG_CONFIG_DEPENDS := CONFIG_KERNEL_FANOTIFY
include $(INCLUDE_DIR)/package.mk
define Package/fatrace
CATEGORY:=Utilities
TITLE:=Report system wide file access events
URL:=
DEPENDS := +@KERNEL_FANOTIFY
endef
define Package/fatrace/description
Report system wide file access events.
endef
MAKE_INSTALL_FLAGS += PREFIX="/"
define Package/fatrace/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fatrace $(1)/sbin/
# $(CP) ./files/* $(1)/
endef
$(eval $(call BuildPackage,fatrace))

View File

@@ -0,0 +1,14 @@
diff --git a/fatrace.c b/fatrace.c
index 1c0899a..b7d1560 100644
--- a/fatrace.c
+++ b/fatrace.c
@@ -44,7 +44,8 @@
* http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1e2ee49f7
* O_LARGEFILE is usually 0, so hardcode it here
*/
-#define KERNEL_O_LARGEFILE 00100000
+//#define KERNEL_O_LARGEFILE 00100000
+#define KERNEL_O_LARGEFILE O_LARGEFILE
/* command line options */
static char* option_output = NULL;

View File

@@ -0,0 +1,12 @@
diff --git a/fatrace.c b/fatrace.c
index b7d1560..6179272 100644
--- a/fatrace.c
+++ b/fatrace.c
@@ -149,6 +149,7 @@ print_event(const struct fanotify_event_metadata *data,
printf ("%li.%06li ", event_time->tv_sec, event_time->tv_usec);
}
printf ("%s(%i): %s %s\n", procname, data->pid, mask2str (data->mask), pathname);
+ fflush(stdout);
}
/**

View File

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
export LOGIN:=$(shell whoami)
BASE_PKG_VERSION:=5.0.2
PKG_RELEASE:=RC15
BASE_PKG_VERSION:=5.0.1
PKG_RELEASE:=RC0
PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
export PKG_VERSION
###########################--RELEASE--################################
PKG_SOURCE_VERSION:=9976efee33243e044b89e74b3c05429aeb777038
PKG_SOURCE_VERSION:=4a0ebce9e55b0bd9b44bfe5e96e820336cc9dc0f
ifeq ($(CONFIG_ICE_OPEN),y)
TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp
PKG_VERSION:=3.0-2018-03-01
PKG_VERSION:=3.0-2017-11-24
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=0f8cae3d342b5bd0b7d394ccd763531c84f6c77c
PKG_SOURCE_VERSION:=d74b88913f676ebf9a210c4674555d080e57ff52
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

View File

@@ -5,29 +5,28 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=inteno-netmodes
PKG_RELEASE:=1
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_VERSION:=0.1.0
PKG_SOURCE_VERSION:=8c97bebc03c1c61553c30b9fcdcd63bf9abe439d
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
define Package/inteno-netmodes
CATEGORY:=Base system
DEPENDS:=+fping
TITLE:=Predefined Network Modes
CATEGORY:=Base system
DEPENDS:=+fping +ubus +libubox
TITLE:=Predefined Network Modes
endef
define Package/inteno-netmodes/description
Predefined Network Modes
endef
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./files/* $(PKG_BUILD_DIR)/
endef
define Build/Compile
endef
define Package/inteno-netmodes/install
$(CP) ./files/* $(1)/
endef

View File

@@ -3,9 +3,6 @@
. /lib/functions.sh
include /lib/network
# exit if no wet interface is available
uci show wireless | grep mode | grep -q wet || exit
ps | grep hotplug | grep button && exit
MTK=0
@@ -70,8 +67,6 @@ case "$ACTION" in
uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
uci commit network
ubus call network reload
sleep 1
ubus call network.device set_state "{\"name\":\"$wetif\", \"defer\":true}"
[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
ubus call router.network reload
@@ -94,8 +89,6 @@ case "$ACTION" in
uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
uci commit network
ubus call network reload
sleep 1
ubus call network.device set_state "{\"name\":\"$WANDEV\", \"defer\":true}"
[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
killall -9 wifi

View File

@@ -77,4 +77,17 @@ config wifi-device 'wl1'
option rifs_advert '0'
option maxassoc '32'
option doth '0'
option apsta '1'
config wifi-iface
option device 'wl1'
option ifname 'wl1'
option network 'wan'
option mode 'wet'
option ssid 'Inteno-$BSSID4'
option encryption 'psk2'
option cipher 'auto'
option wps_pbc '0'
option wmf_bss_enable '1'
option autoconf '1'

View File

@@ -77,6 +77,19 @@ config wifi-device 'wl1'
option rifs_advert '0'
option maxassoc '32'
option doth '0'
option apsta '1'
config wifi-iface
option device 'wl1'
option ifname 'wl1'
option network 'wan'
option mode 'wet'
option ssid 'Inteno-$BSSID4'
option encryption 'psk2'
option cipher 'auto'
option wps_pbc '0'
option wmf_bss_enable '1'
option autoconf '1'
config wifi-iface
option device 'wl1'

View File

@@ -162,14 +162,17 @@ done
repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'" | sed 's/.*\[\([0-9]\)\].*/\1/')
[ "$repeater_iface_num" ] && {
json_get_var ssid ssid
json_get_var key key
json_get_var encryption encryption
set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
[ -z "$repeater_iface_num" ] && {
[ "$from_gui" == "true" ] && restore "back"
exit
}
json_get_var ssid ssid
json_get_var key key
json_get_var encryption encryption
set_wireless_values "$repeater_iface_num" "$ssid" "$key" "$encryption"
json_load "`cat $file`"
json_select "wifi_ifaces"

View File

@@ -72,7 +72,6 @@ CONFIG_PACKAGE_juci-natalie-dect=y
CONFIG_PACKAGE_juci-netmode=y
CONFIG_PACKAGE_juci-network-netifd=y
CONFIG_PACKAGE_juci-owsd=y
CONFIG_PACKAGE_juci-openvpn=y
CONFIG_PACKAGE_juci-printer=y
CONFIG_PACKAGE_juci-realtime-graphs=y
CONFIG_PACKAGE_juci-samba=y
@@ -143,6 +142,7 @@ CONFIG_PACKAGE_usb-modeswitch=y
CONFIG_PACKAGE_usbreset=y
CONFIG_PACKAGE_wget=y
CONFIG_PACKAGE_wwan=y
CONFIG_PACKAGE_wlng=y
CONFIG_PACKAGE_xl2tpd=y
CONFIG_PACKAGE_zoneinfo-core=y
CONFIG_PACKAGE_zoneinfo-europe=y
@@ -174,7 +174,6 @@ CONFIG_BUSYBOX_CONFIG_LSMOD=y
CONFIG_BUSYBOX_CONFIG_LSPCI=y
CONFIG_BUSYBOX_CONFIG_LSUSB=y
CONFIG_BUSYBOX_CONFIG_MICROCOM=y
CONFIG_BUSYBOX_CONFIG_MPSTAT=y
CONFIG_BUSYBOX_CONFIG_RMMOD=y
CONFIG_BUSYBOX_CONFIG_STTY=y
CONFIG_BUSYBOX_CONFIG_TFTP=y

View File

@@ -36,7 +36,7 @@ _iop()
feeds_update genconfig generate_tarballs install_key \
scp_changes setup_host ssh_install_key ssh_sysupgrade \
ssh_sysupgrade_latest ssh_sysupgrade_latest_w status \
update_package update_feed_branches"
update_package"
if [ $COMP_CWORD -eq 1 ] ; then

View File

@@ -35,8 +35,7 @@ function feeds_update {
./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-mips
./scripts/feeds install -p feed_inteno_targets iopsys-brcm63xx-arm
./scripts/feeds install -p feed_inteno_targets iopsys-ramips
./scripts/feeds install -p feed_inteno_targets iopsys-realtek
# install all packages
./scripts/feeds install -a

View File

@@ -15,9 +15,8 @@ function genconfig {
LOCAL_MIRROR="http://mirror.inteno.se/mirror"
iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
iopsys_brcm63xx_arm="dg400 eg400 sdx_500rg f104w f104 dg400prime dg400primeb 963138REF_P502"
iopsys_brcm63xx_arm="dg400 eg400 f104w f104 dg400prime dg400primeb 963138REF_P502"
iopsys_ramips="ex400"
iopsys_realtek="rtl8685g"
ramips="mt7621"
target="bogus"
masterconfig=1
@@ -47,13 +46,6 @@ function genconfig {
fi
done
for p in $iopsys_realtek; do
if [ $p == $profile ]; then
target="iopsys_realtek"
return
fi
done
for p in $ramips; do
if [ $p == $profile ]; then
target="ramips"

View File

@@ -1,61 +0,0 @@
#!/bin/sh
# Exported interface
function update_feed_branches {
local release="$1"
local ipath="$(pwd)"
local branch="$2"
local curbranch
[ -n "$release" ] || {
echo "Usage: ./update_feeds <RELEASE> <BRANCH>"
echo ""
echo "If you do not give a branch as argument,"
echo "<RELEASE> branch will be updated to commit"
echo "hash given in feeds.conf for each feed repo"
exit 1
}
if [ -n "$branch" ]; then
echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo at branch $branch"
if git diff-index --quiet HEAD; then
curbranch=`git symbolic-ref HEAD 2>/dev/null`
curbranch=${curbranch##refs/heads/}
if [ -z $curbranch ]; then
curbranch=`git log -1 --pretty=format:"%H"`
fi
git checkout $branch || {
echo "couldn't checkout branch $branch"
exit 99
}
else
echo "You have unsaved changes."
exit 99
fi
else
echo "Updating release branch $release to specific commit hash given in feeds.conf for each feed repo"
fi
ifeeds="$(grep -r feed_inteno feeds.conf | awk '{print$2}' | cut -d'_' -f3 | tr '\n' ' ')"
for f in $ifeeds; do
commith=$(grep feed_inteno_$f feeds.conf | cut -d'^' -f2)
cd $ipath/feeds/feed_inteno_$f
git branch -D $release 2>/dev/null
echo "feed_inteno_$f: updating release branch $release to commit $commith"
git checkout $commith
git push origin :$release
git checkout -b $release
git push origin $release
cd $ipath
done
if [ -n "$branch" ]; then
echo "Release branch $release is updated to specific commit hash given in feeds.conf in in branch $branch for each feed repo"
git checkout $curbranch
else
echo "Release branch $release is updated to specific commit hash given in feeds.conf for each feed repo"
fi
}
register_command "update_feed_branches" "<release> [branch] Update branches in feeds from the current top level commit or specified top level branch"

View File

@@ -102,9 +102,9 @@ atm_inf_conf() {
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 # low priority queue
xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid priority queue upstream ACK's and ping from LAN will use this queue
xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
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

View File

@@ -55,6 +55,7 @@ addethernet() {
ifname="${ifname:-$baseifname.1}"
brcm_virtual_interface_rules "$baseifname" "$ifname" "$bridge" "$mac2"
}
boot() {
@@ -95,15 +96,12 @@ start_service() {
echo "Setting up Ethernet WAN"
config_load layer2_interface_ethernet
config_foreach addethernet ethernet_interface
/etc/init.d/layer2_interface_vlan start
}
stop_service() {
local ifname
config_load layer2_interface_ethernet
config_foreach removeethernet ethernet_interface
/etc/init.d/layer2_interface_vlan stop
sleep 1
}
reload_service() {
@@ -115,3 +113,4 @@ service_triggers() {
procd_add_reload_trigger layer2_interface_ethernet
}

View File

@@ -44,10 +44,10 @@ ptm_inf_conf() {
ret=$?
if [ "$ret" -eq 0 ]; then
xtmctl operate conn --add $dslat.$ptmprio 0 1
xtmctl operate conn --addq $dslat.$ptmprio 0 wrr 1 -1 -1 3000 # low priority queue
xtmctl operate conn --addq $dslat.$ptmprio 1 wrr 1 -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 -1 -1 3000 # high priority queue, internal traffic dhcp igmp dns and icmp
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
@@ -63,7 +63,7 @@ remove_netdevices() {
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"."$10}')
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

View File

@@ -356,7 +356,7 @@ wlmngr_finalize() {
local pcid="$(wlctl -i wl$idx revinfo | awk 'FNR == 2 {print}' | cut -d'x' -f2)"
local isac="$(db get hw.$pcid.is_ac)"
if [ "$isac" == "1" ]; then
#wlctl -i wl$idx msglevel +dfs 2>/dev/null
wlctl -i wl$idx msglevel +radar +dfs 2>/dev/null
dhdctl -i wl$idx dconpoll 200 2>/dev/null
fi
local rdrthrs="$(db get hw.$pcid.radarthrs)"
@@ -368,19 +368,6 @@ wlmngr_finalize() {
# this piece of code is -required- to make br-lan's mac work properly
# in all cases
sendarp -s br-lan -d br-lan
# set power percent
local pwrpercent="$(uci -q get wireless.wl$idx.txpower)"
pwrpercent=${pwrpercent:-100}
wlctl -i wl$idx pwr_percent $pwrpercent
# set message level
wlctl -i wl$idx msglevel 0x0 2>/dev/null
dhdctl -i wl$idx msglevel 0x0 2>/dev/null
for msg in $(uci -q get wireless.wl$idx.msglevel); do
wlctl -i wl$idx msglevel +$msg 2>/dev/null
dhdctl -i wl$idx msglevel +$msg 2>/dev/null
done
}
wlmngr_issueServiceCmd() {

View File

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=questd
PKG_VERSION:=3.1.40
PKG_SOURCE_VERSION:=f2ffd68750343bf3fb796926691ffaad87f9f382
PKG_SOURCE_VERSION:=b2794295fdf9469b6cd8ba1544f291d4b83a7d5a
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://public.inteno.se:/questd
@@ -58,6 +58,7 @@ define Package/questd/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/questd $(1)/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/wificontrol $(1)/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/graphd $(1)/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uproxyd $(1)/sbin/
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/netcheck $(1)/usr/bin/
endef

View File

@@ -17,6 +17,11 @@ start_service() {
procd_set_param respawn
procd_close_instance
procd_open_instance
procd_set_param command "/sbin/uproxyd"
procd_set_param respawn
procd_close_instance
pidof imonitor > /dev/null 2>&1 || /sbin/imonitor &
}
@@ -33,4 +38,3 @@ service_triggers()
reload_service() {
ubus -t 5 call router.network reload
}

View File

@@ -41,27 +41,22 @@ UBUS_TIMEOUT=5
BSDBIN=$(which bsd)
ACSDBIN=$(which acsd)
RESTART_ACSD=0
RESTART_BSD=0
DUALBAND=1
restart_questd()
{
logger -s -t $0[$$] "Restarting questd. $NPROC_NFAIL $MEM_NFAIL $PCPU_NFAIL $NNET_NFAIL"
killall -q -KILL questd
/etc/init.d/quest stop
killall -q -KILL questd
/etc/init.d/quest start
sleep 5
NPROC_NFAIL=0
MEM_NFAIL=0
PCPU_NFAIL=0
NNET_NFAIL=0
}
check_nproc()
{
local nproc="$@"
@@ -145,27 +140,9 @@ check_ubus_network_call() {
restart_bsd()
{
killall -q -15 bsd 2>/dev/null
[ "$(nvram get wl0_radio)" == "1" -a "$(nvram get wl1_radio)" == "1" ] || {
[ $DUALBAND -eq 1 ] && logger -s -t $0[$$] "Band Steering is deactivated; will be re-activated when both 2.4GHz and 5GHz radios are enabled."
DUALBAND=0
return 0
} && DUALBAND=1
logger -s -t $0[$$] "Restarting Band Steering daemon due to bsd hangup."
if [ $RESTART_BSD -eq 3 ]; then
wlctl -i wl0 down 2>/dev/null
wlctl -i wl1 down 2>/dev/null
wlctl -i wl0 up 2>/dev/null
wlctl -i wl1 up 2>/dev/null
RESTART_ACSD=0
RESTART_BSD=0
else
RESTART_BSD=$((RESTART_BSD+1))
fi
bsd &
logger -s -t $0[$$] "Restarting bsd."
killall -q -KILL bsd
bsd
}
check_bsdcall()
@@ -182,19 +159,9 @@ check_bsdcall()
restart_acsd()
{
logger -s -t $0[$$] "Restarting Auto Channel Selection daemon due to acsd high CPU usage."
killall -q -9 acsd 2>/dev/null
if [ $RESTART_ACSD -eq 3 ]; then
wlctl -i wl0 down 2>/dev/null
wlctl -i wl1 down 2>/dev/null
wlctl -i wl0 up 2>/dev/null
wlctl -i wl1 up 2>/dev/null
RESTART_ACSD=0
RESTART_BSD=0
else
RESTART_ACSD=$((RESTART_ACSD+1))
fi
acsd
logger -s -t $0[$$] "Restarting acsd."
killall -q -KILL acsd
acsd &
}
check_acsd()
@@ -206,7 +173,7 @@ check_acsd()
for p in $pcpu; do
p=${p%%%*}
if [ "$p" -ge "40" ]; then
if [ "$p" -ge "20" ]; then
return 1
fi
done
@@ -251,16 +218,17 @@ main()
fi
fi
# if [ "$BSDBIN" ] ; then
# bsdenabled="$(uci -q get wireless.bandsteering.enabled)"
# if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
# check_bsdcall || restart_bsd
# fi
# fi
if [ "$BSDBIN" ] ; then
config_load wireless
config_get_bool bsdenabled bandsteering enabled 0
if [ $bsdenabled == "1" -a "$(pidof wifi)" == "" ] ; then
check_bsdcall || restart_bsd
fi
fi
# if [ "$ACSDBIN" ] ; then
# check_acsd || restart_acsd
# fi
if [ "$ACSDBIN" ] ; then
check_acsd || restart_acsd
fi
# sleep
if [ "$sample" -lt "$SAMPLES" ]; then

View File

@@ -1,5 +1,8 @@
config testserver '1'
option server 'tptest.bredband.net'
option port '1640'
config testserver '2'
option server 'referens.sth.ip-performance.se'
option port '1642'

View File

@@ -16,7 +16,7 @@ define Package/voice-client
SECTION:=net
CATEGORY:=Network
TITLE:=voice-client
# DEPENDS:=@(asterisk13||asterisk18-mod)
DEPENDS:=+asterisk18-mod
endef
define Package/voice-client/description

51
wlng/Makefile Normal file
View File

@@ -0,0 +1,51 @@
#
# Copyright (C) 2017 Inteno
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wlng
PKG_VERSION:=1.0.1
PKG_SOURCE_VERSION:=e253b080baac1ab0c81f1aa2c8faada254fbe484
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=http://public.inteno.se:/wlng
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
include $(INCLUDE_DIR)/package.mk
ifeq ($(CONFIG_TARGET_iopsys_ramips_ex400),y)
WLNG_TARGET:=IOPSYS_MEDIATEK
else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
WLNG_TARGET:=IOPSYS_BROADCOM
KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
WLNG_TARGET:=IOPSYS_BROADCOM
else
$(info (UNEXPECTED CONFIG TARGET))
endif
export WLNG_TARGET
export KERNEL_DIR
define Package/wlng
CATEGORY:=Utilities
DEPENDS:=+libuci +libubox +ubus
TITLE:=Wifilife NextGen (802.11 kvr based client steering)
endef
define Package/wlng/description
wlng provides 802.11 kvr based AP assisted wifi client steering
service through UBUS.
endef
define Package/wlng/install
$(INSTALL_DIR) $(1)/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwld $(1)/sbin/
endef
$(eval $(call BuildPackage,wlng))