mirror of
https://github.com/FUjr/gl-infra-builder.git
synced 2025-12-17 09:34:51 +00:00
187 lines
5.5 KiB
Diff
187 lines
5.5 KiB
Diff
From 916a1e5f3f467b96962ad78ab989df2ed3406c30 Mon Sep 17 00:00:00 2001
|
|
From: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
Date: Thu, 7 Jul 2022 15:18:12 +0800
|
|
Subject: [PATCH] wireguard: support hotplug for gl
|
|
|
|
Signed-off-by: Jianhui Zhao <jianhui.zhao@gl-inet.com>
|
|
---
|
|
.../950-wireguard-support-hotplug.patch | 166 ++++++++++++++++++
|
|
1 file changed, 166 insertions(+)
|
|
create mode 100644 target/linux/generic/hack-5.4/950-wireguard-support-hotplug.patch
|
|
|
|
diff --git a/target/linux/generic/hack-5.4/950-wireguard-support-hotplug.patch b/target/linux/generic/hack-5.4/950-wireguard-support-hotplug.patch
|
|
new file mode 100644
|
|
index 0000000000..740b300e5b
|
|
--- /dev/null
|
|
+++ b/target/linux/generic/hack-5.4/950-wireguard-support-hotplug.patch
|
|
@@ -0,0 +1,166 @@
|
|
+Index: linux-5.4.188/drivers/net/wireguard/Makefile
|
|
+===================================================================
|
|
+--- linux-5.4.188.orig/drivers/net/wireguard/Makefile
|
|
++++ linux-5.4.188/drivers/net/wireguard/Makefile
|
|
+@@ -14,4 +14,5 @@ wireguard-y += allowedips.o
|
|
+ wireguard-y += ratelimiter.o
|
|
+ wireguard-y += cookie.o
|
|
+ wireguard-y += netlink.o
|
|
++wireguard-y += hotplug.o
|
|
+ obj-$(CONFIG_WIREGUARD) := wireguard.o
|
|
+Index: linux-5.4.188/drivers/net/wireguard/hotplug.c
|
|
+===================================================================
|
|
+--- /dev/null
|
|
++++ linux-5.4.188/drivers/net/wireguard/hotplug.c
|
|
+@@ -0,0 +1,82 @@
|
|
++#include <linux/workqueue.h>
|
|
++#include <linux/netlink.h>
|
|
++#include <linux/kobject.h>
|
|
++#include <linux/skbuff.h>
|
|
++#include <linux/if.h>
|
|
++
|
|
++#define SUBSYSTEM_NAME "wireguard"
|
|
++
|
|
++#define EVENT_BUF_SIZE 2048
|
|
++
|
|
++struct wg_event {
|
|
++ struct work_struct work;
|
|
++ char ifname[IFNAMSIZ];
|
|
++ const char *action;
|
|
++};
|
|
++
|
|
++
|
|
++/* -------------------------------------------------------------------------*/
|
|
++static int bh_event_add_var(struct sk_buff *skb, int argv,
|
|
++ const char *format, ...)
|
|
++{
|
|
++ static char buf[128];
|
|
++ char *s;
|
|
++ va_list args;
|
|
++ int len;
|
|
++
|
|
++ if (argv)
|
|
++ return 0;
|
|
++
|
|
++ va_start(args, format);
|
|
++ len = vsnprintf(buf, sizeof(buf), format, args);
|
|
++ va_end(args);
|
|
++
|
|
++ if (len >= sizeof(buf)) {
|
|
++ //WARN(1, "buffer size too small\n");
|
|
++ return -ENOMEM;
|
|
++ }
|
|
++
|
|
++ s = skb_put(skb, len + 1);
|
|
++ strcpy(s, buf);
|
|
++
|
|
++ return 0;
|
|
++}
|
|
++
|
|
++static void hotplug_work(struct work_struct *work)
|
|
++{
|
|
++ struct wg_event *event = container_of(work, struct wg_event, work);
|
|
++ struct sk_buff *skb;
|
|
++
|
|
++ skb = alloc_skb(EVENT_BUF_SIZE, GFP_KERNEL);
|
|
++ if (!skb)
|
|
++ goto out_free_event;
|
|
++
|
|
++ bh_event_add_var(skb, 0, "SUBSYSTEM=%s", SUBSYSTEM_NAME);
|
|
++ bh_event_add_var(skb, 0, "ACTION=%s", event->action);
|
|
++ bh_event_add_var(skb, 0, "ifname=%s", event->ifname);
|
|
++
|
|
++ NETLINK_CB(skb).dst_group = 1;
|
|
++ broadcast_uevent(skb, 0, 1, GFP_KERNEL);
|
|
++
|
|
++out_free_event:
|
|
++ kfree(event);
|
|
++}
|
|
++
|
|
++void wireguard_hotplug(const char *ifname, const char *action)
|
|
++{
|
|
++ struct wg_event *event;
|
|
++
|
|
++ if (!strcmp(ifname, "wgserver"))
|
|
++ return;
|
|
++
|
|
++ event = kzalloc(sizeof(struct wg_event), GFP_ATOMIC);
|
|
++ if (!event)
|
|
++ return;
|
|
++
|
|
++ memcpy(event->ifname, ifname, IFNAMSIZ);
|
|
++
|
|
++ event->action = action;
|
|
++
|
|
++ INIT_WORK(&event->work, hotplug_work);
|
|
++ schedule_work(&event->work);
|
|
++}
|
|
+Index: linux-5.4.188/drivers/net/wireguard/hotplug.h
|
|
+===================================================================
|
|
+--- /dev/null
|
|
++++ linux-5.4.188/drivers/net/wireguard/hotplug.h
|
|
+@@ -0,0 +1,13 @@
|
|
++#ifndef __HOTPLUG_H__
|
|
++#define __HOTPLUG_H__
|
|
++
|
|
++#define REKEY_GIVEUP_EVENT "REKEY-GIVEUP"
|
|
++#define REKEY_TIMEOUT_EVENT "REKEY-TIMEOUT"
|
|
++#define KEYPAIR_CREATED_EVENT "KEYPAIR-CREATED"
|
|
++
|
|
++extern void wireguard_hotplug(const char *ifname, const char *action);
|
|
++extern void wg_hotplug_init(void);
|
|
++extern void wg_hotplug_free(void);
|
|
++
|
|
++#endif
|
|
++
|
|
+Index: linux-5.4.188/drivers/net/wireguard/noise.c
|
|
+===================================================================
|
|
+--- linux-5.4.188.orig/drivers/net/wireguard/noise.c
|
|
++++ linux-5.4.188/drivers/net/wireguard/noise.c
|
|
+@@ -9,6 +9,7 @@
|
|
+ #include "messages.h"
|
|
+ #include "queueing.h"
|
|
+ #include "peerlookup.h"
|
|
++#include "hotplug.h"
|
|
+
|
|
+ #include <linux/rcupdate.h>
|
|
+ #include <linux/slab.h>
|
|
+@@ -817,6 +818,8 @@ bool wg_noise_handshake_begin_session(st
|
|
+ ret = wg_index_hashtable_replace(
|
|
+ handshake->entry.peer->device->index_hashtable,
|
|
+ &handshake->entry, &new_keypair->entry);
|
|
++
|
|
++ wireguard_hotplug(handshake->entry.peer->device->dev->name, KEYPAIR_CREATED_EVENT);
|
|
+ } else {
|
|
+ kzfree(new_keypair);
|
|
+ }
|
|
+Index: linux-5.4.188/drivers/net/wireguard/timers.c
|
|
+===================================================================
|
|
+--- linux-5.4.188.orig/drivers/net/wireguard/timers.c
|
|
++++ linux-5.4.188/drivers/net/wireguard/timers.c
|
|
+@@ -8,6 +8,7 @@
|
|
+ #include "peer.h"
|
|
+ #include "queueing.h"
|
|
+ #include "socket.h"
|
|
++#include "hotplug.h"
|
|
+
|
|
+ /*
|
|
+ * - Timer for retransmitting the handshake if we don't hear back after
|
|
+@@ -60,6 +61,8 @@ static void wg_expired_retransmit_handsh
|
|
+ if (!timer_pending(&peer->timer_zero_key_material))
|
|
+ mod_peer_timer(peer, &peer->timer_zero_key_material,
|
|
+ jiffies + REJECT_AFTER_TIME * 3 * HZ);
|
|
++
|
|
++ wireguard_hotplug(peer->device->dev->name, REKEY_GIVEUP_EVENT);
|
|
+ } else {
|
|
+ ++peer->timer_handshake_attempts;
|
|
+ pr_debug("%s: Handshake for peer %llu (%pISpfsc) did not complete after %d seconds, retrying (try %d)\n",
|
|
+@@ -73,6 +76,8 @@ static void wg_expired_retransmit_handsh
|
|
+ wg_socket_clear_peer_endpoint_src(peer);
|
|
+
|
|
+ wg_packet_send_queued_handshake_initiation(peer, true);
|
|
++
|
|
++ wireguard_hotplug(peer->device->dev->name, REKEY_TIMEOUT_EVENT);
|
|
+ }
|
|
+ }
|
|
+
|
|
--
|
|
2.25.1
|
|
|