From f9cce3fb1b958b6056f6ff41c571c182a471d7be Mon Sep 17 00:00:00 2001
From: John-Mark Gurney <jmg@funkthat.com>
Date: Tue, 8 Oct 2019 16:50:39 -0700
Subject: [PATCH] use system default now that auto scaling is supported...
 still let users set this if needed...

---
 ggatec/ggatec.8 |  4 ++--
 ggated/ggated.8 |  4 ++--
 shared/ggate.c  | 20 ++++++++++++--------
 shared/ggate.h  |  2 --
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/ggatec/ggatec.8 b/ggatec/ggatec.8
index 6f761dc..98302d9 100644
--- a/ggatec/ggatec.8
+++ b/ggatec/ggatec.8
@@ -128,10 +128,10 @@ start to be canceled.
 Default is 1024.
 .It Fl R Ar rcvbuf
 Size of receive buffer to use.
-Default is 131072 (128kB).
+When not specified, the system default is used.
 .It Fl S Ar sndbuf
 Size of send buffer to use.
-Default is 131072 (128kB).
+When not specified, the system default is used.
 .It Fl s Ar sectorsize
 Sector size for
 .Nm ggate
diff --git a/ggated/ggated.8 b/ggated/ggated.8
index fc4fb03..4858c63 100644
--- a/ggated/ggated.8
+++ b/ggated/ggated.8
@@ -74,10 +74,10 @@ PID file that
 uses.
 .It Fl R Ar rcvbuf
 Size of receive buffer to use.
-Default is 131072 (128kB).
+When not specified, the system default is used.
 .It Fl S Ar sndbuf
 Size of send buffer to use.
-Default is 131072 (128kB).
+When not specified, the system default is used.
 .It Fl v
 Do not fork, run in foreground and print debug information on standard
 output.
diff --git a/shared/ggate.c b/shared/ggate.c
index 2f544f7..9911a49 100644
--- a/shared/ggate.c
+++ b/shared/ggate.c
@@ -271,8 +271,8 @@ g_gate_recv(int s, void *buf, size_t len, int flags)
 }
 
 int nagle = 1;
-unsigned rcvbuf = G_GATE_RCVBUF;
-unsigned sndbuf = G_GATE_SNDBUF;
+unsigned rcvbuf = 0;
+unsigned sndbuf = 0;
 
 void
 g_gate_socket_settings(int sfd)
@@ -290,12 +290,16 @@ g_gate_socket_settings(int sfd)
 	}
 	if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1)
 		g_gate_xlog("setsockopt(SO_REUSEADDR): %s.", strerror(errno));
-	bsize = rcvbuf;
-	if (setsockopt(sfd, SOL_SOCKET, SO_RCVBUF, &bsize, sizeof(bsize)) == -1)
-		g_gate_xlog("setsockopt(SO_RCVBUF): %s.", strerror(errno));
-	bsize = sndbuf;
-	if (setsockopt(sfd, SOL_SOCKET, SO_SNDBUF, &bsize, sizeof(bsize)) == -1)
-		g_gate_xlog("setsockopt(SO_SNDBUF): %s.", strerror(errno));
+	if (rcvbuf != 0) {
+		bsize = rcvbuf;
+		if (setsockopt(sfd, SOL_SOCKET, SO_RCVBUF, &bsize, sizeof(bsize)) == -1)
+			g_gate_xlog("setsockopt(SO_RCVBUF): %s.", strerror(errno));
+	}
+	if (sndbuf != 0) {
+		bsize = sndbuf;
+		if (setsockopt(sfd, SOL_SOCKET, SO_SNDBUF, &bsize, sizeof(bsize)) == -1)
+			g_gate_xlog("setsockopt(SO_SNDBUF): %s.", strerror(errno));
+	}
 	tv.tv_sec = 8;
 	tv.tv_usec = 0;
 	if (setsockopt(sfd, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv)) == -1) {
diff --git a/shared/ggate.h b/shared/ggate.h
index 9ea9010..ff50255 100644
--- a/shared/ggate.h
+++ b/shared/ggate.h
@@ -36,8 +36,6 @@
 
 #define	G_GATE_PORT		3080
 
-#define	G_GATE_RCVBUF		131072
-#define	G_GATE_SNDBUF		131072
 #define	G_GATE_QUEUE_SIZE	1024
 #define	G_GATE_TIMEOUT		0