Rename sockets -> listening_sockets

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

diff --git a/src/client.c b/src/client.c
index 401a4f8708f69cdf8fba833841e5bc1f79877ab7..7a848d7c41b536083f7b29eaf768d4eb7e7bddc6 100644 (file)
--- 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 b21eb504ee462e344a8a4c73755bba573270f57e..f5fc7f42d7b47d771985bb721a5e122a9920c747 100644 (file)
--- 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 5d848c0be97d6aa44a5bcc528be376a6386ff3b8..410710749ce1a11a795ab553b52a1b5786ca169f 100644 (file)
--- 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 0243360dc4a67c63f59a2c49ad400aa04350aac2..e481cb321bbbb5b7a66346f728443afec4744e16 100644 (file)
--- 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)