From 1e524c44f85e795067b1af508858e3aa52a67dad Mon Sep 17 00:00:00 2001
From: jD91mZM2 <me@krake.one>
Date: Wed, 17 Jun 2020 19:04:24 +0200
Subject: [PATCH] Add gdbserver + fix net=redir

---
 config/desktop.toml |  1 +
 cookbook            |  2 +-
 mk/qemu.mk          | 13 ++++++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/desktop.toml b/config/desktop.toml
index cfa80e9..4f8a73f 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -45,6 +45,7 @@ findutils = {}
 #games = {}
 #gawk = {}
 #gcc = {}
+gdbserver = {}
 #gears = {}
 #generaluser-gs = {}
 #gettext = {}
diff --git a/cookbook b/cookbook
index b51cb6b..e1cd72b 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit b51cb6b4e7252991b626ef780e2cdf488582ad86
+Subproject commit e1cd72b7759b446228b76b25c3bea97d5ce0bf21
diff --git a/mk/qemu.mk b/mk/qemu.mk
index 462c2b5..6b70c37 100644
--- a/mk/qemu.mk
+++ b/mk/qemu.mk
@@ -21,11 +21,14 @@ else
 	ifneq ($(bridge),)
 		QEMUFLAGS+=-netdev bridge,br=$(bridge),id=net0 -device e1000,netdev=net0,id=nic0
 	else
-		QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \
-					-object filter-dump,id=f1,netdev=net0,file=build/network.pcap
-	endif
-	ifeq ($(net),redir)
-		QEMUFLAGS+=-redir tcp:8023::8023 -redir tcp:8080::8080
+	    ifeq ($(net),redir)
+			# port 8080 and 8083 - webservers
+			# port 64126 - our gdbserver implementation
+			QEMUFLAGS+=-netdev user,id=net0,hostfwd=tcp::8080-:8080,hostfwd=tcp::8083-:8083,hostfwd=tcp::64126-:64126 -device e1000,netdev=net0,id=nic0
+		else
+			QEMUFLAGS+=-netdev user,id=net0 -device e1000,netdev=net0 \
+						-object filter-dump,id=f1,netdev=net0,file=build/network.pcap
+		endif
 	endif
 endif
 ifeq ($(vga),no)