dawn: refresh patches

HiGarfield · Jan 9, 2025 · 8a0e1bb · 8a0e1bb
1 parent bd9172f
commit 8a0e1bb
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/package/extra/dawn/patches/0001-datastorage-fix-use-after-free-compiler-error.patch b/package/extra/dawn/patches/0001-datastorage-fix-use-after-free-compiler-error.patch
@@ -0,0 +1,27 @@
+From 518ad70bd1340de7e63ae806524bfb1e5350959d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Mat=C4=9Bjek?= <martin.matejek@gmx.com>
+Date: Sun, 23 Oct 2022 22:05:48 +0200
+Subject: [PATCH 1/2] datastorage: fix use-after-free compiler error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Closes: #198
+
+Signed-off-by: Martin Matějek <martin.matejek@gmx.com>
+---
+ src/storage/datastorage.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/storage/datastorage.c
++++ b/src/storage/datastorage.c
+@@ -1332,8 +1332,8 @@ void insert_macs_from_file() {
+         }
+     }
+
+-    fclose(fp);
+     dawn_unregmem(fp);
++    fclose(fp);
+     if (line)
+     {
+         free(line);
diff --git a/...t-kick-if-data-rate-is-at-threshold.patch → ...t-kick-if-data-rate-is-at-threshold.patch b/...t-kick-if-data-rate-is-at-threshold.patch → ...t-kick-if-data-rate-is-at-threshold.patch
@@ -1,17 +1,15 @@
-From 734a2d650603c3f7a5c7ce2a1a5ac398ee20cf63 Mon Sep 17 00:00:00 2001
+From 1806e0fbc6f32d5db3c1efc357f870ad24c0e064 Mon Sep 17 00:00:00 2001
 From: HarvsG <11440490+HarvsG@users.noreply.github.com>
 Date: Fri, 15 Sep 2023 11:00:05 +0100
-Subject: [PATCH] don't kick if data rate is at threshold
+Subject: [PATCH 2/2] don't kick if data rate is at threshold
 
 ---
  src/storage/datastorage.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/src/storage/datastorage.c b/src/storage/datastorage.c
-index 7e6da46..655727a 100644
 --- a/src/storage/datastorage.c
 +++ b/src/storage/datastorage.c
-@@ -565,7 +565,7 @@ int kick_clients(struct dawn_mac bssid_mac, uint32_t id) {
+@@ -565,7 +565,7 @@ int kick_clients(struct dawn_mac bssid_m
                      // only use rx_rate for indicating if transmission is going on
                      // <= 6MBits <- probably no transmission
                      // tx_rate has always some weird value so don't use ist
@@ -20,6 +18,3 @@ index 7e6da46..655727a 100644
                          dawnlog_info("Client " MACSTR ": Don't kick due to active data transfer: RX rate %f exceeds %d limit\n", MAC2STR(j->client_addr.u8), rx_rate, dawn_metric.bandwidth_threshold);
                      }
                      else
--- 
-2.25.1
-