name the SO_SNDBUF options more consistently

client/client.c

@@ -102,7 +102,7 @@ struct {
     int otp_num_warn;
     int fragmentation_latency;
     int peer_ssl;
-    int peer_tcp_sndbuf;
+    int peer_tcp_socket_sndbuf;
     char *scopes[MAX_SCOPES];
     int num_scopes;
     int send_buffer_size;
@@ -626,7 +626,7 @@ void print_help (const char *name)
         "        )\n"
         "        (transport-mode=tcp?\n"
         "            (ssl? [--peer-ssl])\n"
-        "            [--peer-tcp-sndbuf <bytes / 0>]\n"
+        "            [--peer-tcp-socket-sndbuf <bytes / 0>]\n"
         "        )\n"
         "        [--send-buffer-size <num-packets>]\n"
         "        [--send-buffer-relay-size <num-packets>]\n"
@@ -676,7 +676,7 @@ int parse_arguments (int argc, char *argv[])
     options.otp_mode = SPPROTO_OTP_MODE_NONE;
     options.fragmentation_latency = PEER_DEFAULT_UDP_FRAGMENTATION_LATENCY;
     options.peer_ssl = 0;
-    options.peer_tcp_sndbuf = -1;
+    options.peer_tcp_socket_sndbuf = -1;
     options.send_buffer_size = PEER_DEFAULT_SEND_BUFFER_SIZE;
     options.send_buffer_relay_size = PEER_DEFAULT_SEND_BUFFER_RELAY_SIZE;
     options.max_macs = PEER_DEFAULT_MAX_MACS;
@@ -979,12 +979,12 @@ int parse_arguments (int argc, char *argv[])
         else if (!strcmp(arg, "--peer-ssl")) {
             options.peer_ssl = 1;
         }
-        else if (!strcmp(arg, "--peer-tcp-sndbuf")) {
+        else if (!strcmp(arg, "--peer-tcp-socket-sndbuf")) {
             if (1 >= argc - i) {
                 fprintf(stderr, "%s: requires an argument\n", arg);
                 return 0;
             }
-            if ((options.peer_tcp_sndbuf = atoi(argv[i + 1])) < 0) {
+            if ((options.peer_tcp_socket_sndbuf = atoi(argv[i + 1])) < 0) {
                 fprintf(stderr, "%s: wrong argument\n", arg);
                 return 0;
             }
@@ -1111,8 +1111,8 @@ int parse_arguments (int argc, char *argv[])
         return 0;
     }
     
-    if (!(!(options.peer_tcp_sndbuf >= 0) || options.transport_mode == TRANSPORT_MODE_TCP)) {
-        fprintf(stderr, "False: --peer-tcp-sndbuf => TCP\n");
+    if (!(!(options.peer_tcp_socket_sndbuf >= 0) || options.transport_mode == TRANSPORT_MODE_TCP)) {
+        fprintf(stderr, "False: --peer-tcp-socket-sndbuf => TCP\n");
         return 0;
     }
     
@@ -1496,7 +1496,7 @@ int peer_init_link (struct peer_data *peer)
             (options.peer_ssl ? peer->cert : NULL),
             (options.peer_ssl ? peer->cert_len : -1),
             data_mtu,
-            (options.peer_tcp_sndbuf >= 0 ? options.peer_tcp_sndbuf : PEER_DEFAULT_TCP_SNDBUF),
+            (options.peer_tcp_socket_sndbuf >= 0 ? options.peer_tcp_socket_sndbuf : PEER_DEFAULT_TCP_SOCKET_SNDBUF),
             recv_if,
             (StreamPeerIO_handler_error)peer_tcp_pio_handler_error, peer
         )) {

client/client.h

@@ -53,7 +53,7 @@
 // value related to how much out-of-order input we tolerate (see FragmentProtoAssembler num_frames argument)
 #define PEER_UDP_ASSEMBLER_NUM_FRAMES 4
 // socket send buffer (SO_SNDBUF) for peer TCP connections, <=0 to not set
-#define PEER_DEFAULT_TCP_SNDBUF 1048576
+#define PEER_DEFAULT_TCP_SOCKET_SNDBUF 1048576
 // keep-alive packet interval for p2p communication
 #define PEER_KEEPALIVE_INTERVAL 10000
 // keep-alive receive timer for p2p communication (after how long to consider the link down)

server/server.c

@@ -83,7 +83,7 @@ struct {
     int num_listen_addrs;
     char *comm_predicate;
     char *relay_predicate;
-    int client_sndbuf;
+    int client_socket_sndbuf;
 } options;
 
 // listen addresses
@@ -573,7 +573,7 @@ void print_help (const char *name)
         "        [--ssl --nssdb <string> --server-cert-name <string>]\n"
         "        [--comm-predicate <string>]\n"
         "        [--relay-predicate <string>]\n"
-        "        [--client-sndbuf <bytes / 0>]\n"
+        "        [--client-socket-sndbuf <bytes / 0>]\n"
         "Address format is a.b.c.d:port (IPv4) or [addr]:port (IPv6).\n",
         name
     );
@@ -603,7 +603,7 @@ int parse_arguments (int argc, char *argv[])
     options.num_listen_addrs = 0;
     options.comm_predicate = NULL;
     options.relay_predicate = NULL;
-    options.client_sndbuf = CLIENT_SOCKET_DEFAULT_SEND_BUFFER;
+    options.client_socket_sndbuf = CLIENT_DEFAULT_SOCKET_SNDBUF;
     
     for (int i = 1; i < argc; i++) {
         char *arg = argv[i];
@@ -728,12 +728,12 @@ int parse_arguments (int argc, char *argv[])
             options.relay_predicate = argv[i + 1];
             i++;
         }
-        else if (!strcmp(arg, "--client-sndbuf")) {
+        else if (!strcmp(arg, "--client-socket-sndbuf")) {
             if (1 >= argc - i) {
                 fprintf(stderr, "%s: requires an argument\n", arg);
                 return 0;
             }
-            if ((options.client_sndbuf = atoi(argv[i + 1])) < 0) {
+            if ((options.client_socket_sndbuf = atoi(argv[i + 1])) < 0) {
                 fprintf(stderr, "%s: wrong argument\n", arg);
                 return 0;
             }
@@ -806,8 +806,8 @@ void listener_handler (BListener *listener)
     }
     
     // limit socket send buffer, else our scheduling is pointless
-    if (options.client_sndbuf > 0) {
-        if (!BConnection_SetSendBuffer(&client->con, options.client_sndbuf) < 0) {
+    if (options.client_socket_sndbuf > 0) {
+        if (!BConnection_SetSendBuffer(&client->con, options.client_socket_sndbuf) < 0) {
             BLog(BLOG_WARNING, "BConnection_SetSendBuffer failed");
         }
     }

server/server.h

@@ -47,7 +47,7 @@
 // after how long of not hearing anything from the client we disconnect it
 #define CLIENT_NO_DATA_TIME_LIMIT 30000
 // SO_SNDBFUF socket option for clients
-#define CLIENT_SOCKET_DEFAULT_SEND_BUFFER 16384
+#define CLIENT_DEFAULT_SOCKET_SNDBUF 16384
 
 // maxiumum listen addresses
 #define MAX_LISTEN_ADDRS 16