OpenWrt
/
small-package
mirror of https://github.com/kenzok8/small-package
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update 2023-10-30 16:22:53

This commit is contained in:
github-actions[bot] 2023-10-30 16:22:53 +08:00
parent fce6c6130f
commit d9523272e2
4 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UA2F/src/cache.c
View File

@ -31,14 +31,7 @@ _Noreturn static void check_cache() {
} }
} }
static _Atomic bool cache_initialized = false;
void init_not_http_cache() { void init_not_http_cache() {
if (cache_initialized) {
return;
}
cache_initialized = true;
if (pthread_rwlock_init(&cacheLock, NULL) != 0) { if (pthread_rwlock_init(&cacheLock, NULL) != 0) {
syslog(LOG_ERR, "Failed to init cache lock"); syslog(LOG_ERR, "Failed to init cache lock");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);

8
UA2F/src/handler.c
View File

@ -111,7 +111,8 @@ static void send_verdict(
} }
} }
static _Atomic bool conntrack_info_available = true; static bool conntrack_info_available = true;
static bool cache_initialized = false;
static void add_to_cache(struct nf_packet *pkt) { static void add_to_cache(struct nf_packet *pkt) {
char *ip_str = ip_to_str(&pkt->orig.dst, pkt->orig.dst_port, pkt->orig.ip_version); char *ip_str = ip_to_str(&pkt->orig.dst, pkt->orig.dst_port, pkt->orig.ip_version);
@ -173,7 +174,10 @@ void handle_packet(struct nf_queue *queue, struct nf_packet *pkt) {
syslog(LOG_WARNING, "Packet has no conntrack. Switching to no cache mode."); syslog(LOG_WARNING, "Packet has no conntrack. Switching to no cache mode.");
syslog(LOG_WARNING, "Note that this may lead to performance degradation. Especially on low-end routers."); syslog(LOG_WARNING, "Note that this may lead to performance degradation. Especially on low-end routers.");
} else { } else {
init_not_http_cache(); if (!cache_initialized) {
init_not_http_cache();
cache_initialized = true;
}
} }
} }

4
hysteria/Makefile
View File

@ -5,12 +5,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hysteria PKG_NAME:=hysteria
PKG_VERSION:=2.1.1 PKG_VERSION:=2.2.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/apernet/hysteria/tar.gz/app/v$(PKG_VERSION)?
PKG_HASH:=a9ccbd7b38ccb9b8d0f3f75c18bd6846e32a58442dbdc2946629be4b3c5f6424 PKG_HASH:=d3e6809ac2b8e1c58e1c95cdb96bd44d99b17c7824bdd931d4d51c9e3818d402
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-app-v$(PKG_VERSION)
PKG_LICENSE:=MIT PKG_LICENSE:=MIT

4
luci-app-wrtbwmon/htdocs/luci-static/resources/view/wrtbwmon/details.js
View File

@ -136,8 +136,8 @@ function displayTable(tb, settings) {
} }
function formatSize(size, useBits, useMultiple) { function formatSize(size, useBits, useMultiple) {
var res = String.format('%%%s.2m%s'.format(useMultiple, (useBits ? 'bit' : 'B')), useBits ? size * 8 : size); // String.format automatically adds the i for KiB if the multiple is 1024
return useMultiple == '1024' ? res.replace(/([KMGTPEZ])/, '$&i') : res; return String.format('%%%s.2m%s'.format(useMultiple, (useBits ? 'bit' : 'B')), useBits ? size * 8 : size);
} }
function formatSpeed(speed, useBits, useMultiple) { function formatSpeed(speed, useBits, useMultiple) {