fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-serverchan: bump to v1.48

Browse Source
This commit is contained in:
CN_SZTL 2020-03-24 05:11:00 +08:00
parent 1280133094
commit df0352da9d
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/ctcgfw/luci-app-serverchan/Makefile
View File

@ -6,8 +6,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-serverchan
PKG_VERSION:=1.47
PKG_RELEASE:=6
PKG_VERSION:=1.48
PKG_RELEASE:=7
include $(INCLUDE_DIR)/package.mk
@ -15,7 +15,7 @@ define Package/$(PKG_NAME)
SECTION:=luci
CATEGORY:=LuCI
SUBMENU:=3. Applications
DEPENDS:=+iputils-arping +curl +iw
DEPENDS:=+iputils-arping +curl
TITLE:=LuCI support for serverchan
PKGARCH:=all
endef

8
package/ctcgfw/luci-app-serverchan/root/usr/bin/serverchan/serverchan
View File

@ -323,8 +323,8 @@ function blackwhitelist(){
fi
# 如果 “仅关注接口选项打开”
elif [ ! -z "$serverchan_interface" ] ; then
local ip=`iw dev $serverchan_interface station dump | grep -i -w $1 | grep Station 2>/dev/null`
if [ ! -z "$ip" ];then local ip=`getinterface $1 | grep -i -w $serverchan_interface`;fi
local ip=`iw dev $serverchan_interface station dump | grep -i -w $1 | grep Station | grep -v "^$" 2>/dev/null`
if [ -z "$ip" ];then local ip=`getinterface $1 | grep -i -w $serverchan_interface | grep -v "^$"`;fi
if [ ! -z "$ip" ];then
echo 1
fi
@ -1086,7 +1086,7 @@ deltemp
serverchan_cron
# 限制并发进程
thread_num=3
thread_num=4
[ -e ${dir}fd1 ] || mkfifo ${dir}fd1
exec 5<>${dir}fd1
rm -f ${dir}fd1 >/dev/null 2>&1
@ -1144,7 +1144,7 @@ do
# 新设备接入检测
# 从 arp 缓存中读取 0x2 在线列表
if [ ! -f "${dir}ipAddress" ] ; then > ${dir}ipAddress;fi
IPLIST=$( cat /proc/net/arp | grep "0x2" | awk '{print $1}' | grep -v "^$" | sort -u ) && IPLISTrow=$(grep -c "" ${dir}ipAddress)
IPLIST=$( cat /proc/net/arp | grep "0x2\|0x6" | awk '{print $1}' | grep -v "^$" | sort -u ) && IPLISTrow=$(grep -c "" ${dir}ipAddress)
send_enable=`get_config send_enable`
for ip in $IPLIST; do
# 如果 “ip 列表不为空”