From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 1 Feb 2021 18:57:43 +0000 (+0000)
Subject: Rename sockets -> listening_sockets
X-Git-Tag: 0.1.0~20
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4b278bb6c55866ca09939a6d1f2c21c8fade43a6;p=fireperf.git

Rename sockets -> listening_sockets

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/client.c b/src/client.c
index 401a4f8..7a848d7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -110,7 +110,7 @@ static int open_connection(struct fireperf_config* conf) {
 	}
 
 	// Chose a random port
-	int port = conf->port + (random() % conf->sockets);
+	int port = conf->port + (random() % conf->listening_sockets);
 
 	DEBUG(conf, "Opening socket %d (port %d)...\n", fd, port);
 
diff --git a/src/main.c b/src/main.c
index b21eb50..f5fc7f4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -179,11 +179,11 @@ int main(int argc, char* argv[]) {
 	struct fireperf_config conf = {
 		.keepalive_count = DEFAULT_KEEPALIVE_COUNT,
 		.keepalive_interval = DEFAULT_KEEPALIVE_INTERVAL,
+		.listening_sockets = DEFAULT_LISTENING_SOCKETS,
 		.loglevel = DEFAULT_LOG_LEVEL,
 		.mode = FIREPERF_MODE_NONE,
 		.port = DEFAULT_PORT,
 		.parallel = DEFAULT_PARALLEL,
-		.sockets = DEFAULT_SOCKETS,
 		.timeout = DEFAULT_TIMEOUT,
 	};
 	int r;
diff --git a/src/main.h b/src/main.h
index 5d848c0..4107107 100644
--- a/src/main.h
+++ b/src/main.h
@@ -28,7 +28,7 @@
 #define DEFAULT_LOG_LEVEL LOG_INFO
 #define DEFAULT_PARALLEL 1
 #define DEFAULT_PORT 5001
-#define DEFAULT_SOCKETS 10
+#define DEFAULT_LISTENING_SOCKETS 1
 #define DEFAULT_TIMEOUT 300
 
 #define MAX_PARALLEL (1 << 20)
@@ -56,7 +56,7 @@ struct fireperf_config {
 	int keepalive_count;
 	int keepalive_interval;
 	int port;
-	unsigned int sockets;
+	unsigned int listening_sockets;
 	unsigned long parallel;
 	unsigned int timeout;
 	int zero;
diff --git a/src/server.c b/src/server.c
index 0243360..e481cb3 100644
--- a/src/server.c
+++ b/src/server.c
@@ -261,7 +261,7 @@ static int handle_io_on_connection(struct fireperf_config* conf,
 }
 
 static int is_listening_socket(struct fireperf_config* conf, int* sockets, int fd) {
-	for (unsigned int i = 0; i < conf->sockets; i++) {
+	for (unsigned int i = 0; i < conf->listening_sockets; i++) {
 		if (sockets[i] == fd)
 			return 1;
 	}
@@ -274,7 +274,7 @@ int fireperf_server(struct fireperf_config* conf) {
 
 	DEBUG(conf, "Launching " PACKAGE_NAME " in server mode\n");
 
-	int sockets[conf->sockets];
+	int listening_sockets[conf->listening_sockets];
 
 	int epollfd = -1;
 	struct epoll_event events[EPOLL_MAX_EVENTS];
@@ -289,12 +289,12 @@ int fireperf_server(struct fireperf_config* conf) {
 	}
 
 	// Create listening sockets
-	for (unsigned int i = 0; i < conf->sockets; i++) {
+	for (unsigned int i = 0; i < conf->listening_sockets; i++) {
 		int sockfd = create_socket(conf, i);
 		if (sockfd < 0)
 			return 1;
 
-		sockets[i] = sockfd;
+		listening_sockets[i] = sockfd;
 
 		// Add listening socket to epoll
 		struct epoll_event ev = {
@@ -356,7 +356,7 @@ int fireperf_server(struct fireperf_config* conf) {
 			int fd = events[i].data.fd;
 
 			// The listening socket
-			if (is_listening_socket(conf, sockets, fd)) {
+			if (is_listening_socket(conf, listening_sockets, fd)) {
 				int connfd = accept_connection(conf, fd);
 				if (connfd < 0)
 					goto ERROR;
@@ -421,9 +421,9 @@ int fireperf_server(struct fireperf_config* conf) {
 	}
 
 ERROR:
-	for (unsigned int i = 0; i < conf->sockets; i++) {
-		if (sockets[i] > 0)
-			close(sockets[i]);
+	for (unsigned int i = 0; i < conf->listening_sockets; i++) {
+		if (listening_sockets[i] > 0)
+			close(listening_sockets[i]);
 	}
 
 	if (epollfd > 0)