From 31afd2aaaeb76a12e232eab0fb6a550b73948737 Mon Sep 17 00:00:00 2001
From: David Härdeman <david@hardeman.nu>
Date: Mon, 22 Jun 2020 10:50:15 +0200
Subject: Make struct cfg global and make the corresponding changes throughout

---
 utils.c | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'utils.c')

diff --git a/utils.c b/utils.c
index ff18fb1..92e607d 100644
--- a/utils.c
+++ b/utils.c
@@ -169,11 +169,11 @@ debug_resource_usage()
 }
 
 void
-socket_set_low_latency(struct cfg *cfg, int sfd)
+socket_set_low_latency(int sfd)
 {
 	int option;
 
-	assert_return(cfg && sfd >= 0);
+	assert_return(sfd >= 0);
 
 	/* FIXME: could make this configurable */
 	option = true;
@@ -192,9 +192,9 @@ socket_set_low_latency(struct cfg *cfg, int sfd)
 }
 
 void
-connection_set_local(struct cfg *cfg, struct connection *conn, int fd)
+connection_set_local(struct connection *conn, int fd)
 {
-	assert_return(cfg && conn && fd >= 0);
+	assert_return(conn && fd >= 0);
 
 	conn->local.addrlen = sizeof(conn->local.storage);
 	if (getsockname(fd, (struct sockaddr *)&conn->local.storage,
@@ -205,48 +205,48 @@ connection_set_local(struct cfg *cfg, struct connection *conn, int fd)
 }
 
 void
-connection_set_remote(struct cfg *cfg, struct connection *conn, struct saddr *remote)
+connection_set_remote(struct connection *conn, struct saddr *remote)
 {
-	assert_return(cfg && conn && remote);
+	assert_return(conn && remote);
 
 	conn->remote = *remote;
 	saddr_set_addrstr(&conn->remote);
 }
 
-static void connect_next(struct cfg *cfg, struct uring_task *task, struct connection *conn);
+static void connect_next(struct uring_task *task, struct connection *conn);
 
 static void
-connect_cb(struct cfg *cfg, struct uring_task *task, int res)
+connect_cb(struct uring_task *task, int res)
 {
 	struct connection *conn;
 
-	assert_return(cfg && task && task->priv);
+	assert_return(task && task->priv);
 
 	conn = task->priv;
 	if (res < 0) {
 		debug(DBG_UR, "%s: connection to %s failed",
 		      task->name, conn->remote.addrstr);
-		uring_task_close_fd(cfg, task);
-		connect_next(cfg, task, conn);
+		uring_task_close_fd(task);
+		connect_next(task, conn);
 		return;
 	}
 
-	connection_set_local(cfg, conn, task->fd);
+	connection_set_local(conn, task->fd);
 
 	debug(DBG_UR, "%s: connection established %s -> %s",
 	      task->name, conn->local.addrstr, conn->remote.addrstr);
 
-	conn->callback(cfg, conn, true);
+	conn->cb(conn, true);
 }
 
 static void
-connect_next(struct cfg *cfg, struct uring_task *task, struct connection *conn)
+connect_next(struct uring_task *task, struct connection *conn)
 {
         struct saddr *remote, *tmp;
         int sfd;
         unsigned i;
 
-	assert_return(cfg && task && conn && conn->callback);
+	assert_return(task && conn && conn->cb);
 again:
 	assert_task_alive_or(DBG_UR, task, goto out);
 
@@ -267,7 +267,7 @@ again:
         }
 
 	conn->next_addr++;
-	connection_set_remote(cfg, conn, remote);
+	connection_set_remote(conn, remote);
         debug(DBG_MALLOC, "%s: attempting to connect to %s",
 	      task->name, conn->remote.addrstr);
 
@@ -277,28 +277,28 @@ again:
                 goto again;
         }
 
-	socket_set_low_latency(cfg, sfd);
+	socket_set_low_latency(sfd);
 
 	task->priv = conn;
         uring_task_set_fd(task, sfd);
-        uring_connect(cfg, task, &conn->remote, connect_cb);
+        uring_connect(task, &conn->remote, connect_cb);
 	return;
 
 out:
-	conn->callback(cfg, conn, false);
+	conn->cb(conn, false);
 }
 
 void
-connect_any(struct cfg *cfg, struct uring_task *task,
+connect_any(struct uring_task *task,
 	    struct list_head *addrs, struct connection *conn,
-	    void (*callback)(struct cfg *, struct connection *, bool res))
+	    connection_cb_t cb)
 {
-	assert_return(cfg && task && addrs && conn && callback);
+	assert_return(task && addrs && conn && cb);
 
 	conn->next_addr = 0;
 	conn->addrs = addrs;
-	conn->callback = callback;
-	connect_next(cfg, task, conn);
+	conn->cb = cb;
+	connect_next(task, conn);
 }
 
 uint16_t
-- 
cgit v1.2.3