Browse Source

use system default now that auto scaling is supported...

still let users set this if needed...
tags/ggatessh-v1.0.0
John-Mark Gurney 5 years ago
parent
commit
f9cce3fb1b
4 changed files with 16 additions and 14 deletions
  1. +2
    -2
      ggatec/ggatec.8
  2. +2
    -2
      ggated/ggated.8
  3. +12
    -8
      shared/ggate.c
  4. +0
    -2
      shared/ggate.h

+ 2
- 2
ggatec/ggatec.8 View File

@@ -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


+ 2
- 2
ggated/ggated.8 View File

@@ -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.


+ 12
- 8
shared/ggate.c View File

@@ -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) {


+ 0
- 2
shared/ggate.h View File

@@ -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



Loading…
Cancel
Save