From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 4 Jan 2024 14:00:32 +0000 (-0500)
Subject: socket() is a function.  Use another name
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a61269c21741fcba4f9b8bc13b5e75212716177;p=thirdparty%2Ffreeradius-server.git

socket() is a function.  Use another name
---

diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index a7449a918db..3cfc9e28889 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -430,14 +430,14 @@ static void fr_network_suspend(fr_network_t *nr)
 		{ 0 }
 	};
 	fr_rb_iter_inorder_t	iter;
-	fr_network_socket_t		*socket;
+	fr_network_socket_t	*s;
 
 	if (nr->suspended) return;
 
-	for (socket = fr_rb_iter_init_inorder(&iter, nr->sockets);
-	     socket;
-	     socket = fr_rb_iter_next_inorder(&iter)) {
-		fr_event_filter_update(socket->nr->el, socket->listen->fd, FR_EVENT_FILTER_IO, pause_read);
+	for (s = fr_rb_iter_init_inorder(&iter, nr->sockets);
+	     s != NULL;
+	     s = fr_rb_iter_next_inorder(&iter)) {
+		fr_event_filter_update(s->nr->el, s->listen->fd, FR_EVENT_FILTER_IO, pause_read);
 	}
 	nr->suspended = true;
 }
@@ -449,14 +449,14 @@ static void fr_network_unsuspend(fr_network_t *nr)
 		{ 0 }
 	};
 	fr_rb_iter_inorder_t	iter;
-	fr_network_socket_t		*socket;
+	fr_network_socket_t	*s;
 
 	if (!nr->suspended) return;
 
-	for (socket = fr_rb_iter_init_inorder(&iter, nr->sockets);
-	     socket;
-	     socket = fr_rb_iter_next_inorder(&iter)) {
-		fr_event_filter_update(socket->nr->el, socket->listen->fd, FR_EVENT_FILTER_IO, resume_read);
+	for (s = fr_rb_iter_init_inorder(&iter, nr->sockets);
+	     s != NULL;
+	     s = fr_rb_iter_next_inorder(&iter)) {
+		fr_event_filter_update(s->nr->el, s->listen->fd, FR_EVENT_FILTER_IO, resume_read);
 	}
 	nr->suspended = false;
 }
@@ -2034,17 +2034,17 @@ static int cmd_socket_list(FILE *fp, UNUSED FILE *fp_err, void *ctx, UNUSED fr_c
 {
 	fr_network_t const		*nr = ctx;
 	fr_rb_iter_inorder_t	iter;
-	fr_network_socket_t		*socket;
+	fr_network_socket_t		*s;
 
 	// @todo - note that this isn't thread-safe!
 
-	for (socket = fr_rb_iter_init_inorder(&iter, nr->sockets);
-	     socket;
-	     socket = fr_rb_iter_next_inorder(&iter)) {
-		if (!socket->listen->app_io->get_name) {
-			fprintf(fp, "%s\n", socket->listen->app_io->common.name);
+	for (s = fr_rb_iter_init_inorder(&iter, nr->sockets);
+	     s != NULL;
+	     s = fr_rb_iter_next_inorder(&iter)) {
+		if (!s->listen->app_io->get_name) {
+			fprintf(fp, "%s\n", s->listen->app_io->common.name);
 		} else {
-			fprintf(fp, "%d\t%s\n", socket->number, socket->listen->app_io->get_name(socket->listen));
+			fprintf(fp, "%d\t%s\n", s->number, s->listen->app_io->get_name(s->listen));
 		}
 	}
 	return 0;
diff --git a/src/lib/util/udp.c b/src/lib/util/udp.c
index d1cdd958f7e..4c1c7301e88 100644
--- a/src/lib/util/udp.c
+++ b/src/lib/util/udp.c
@@ -32,7 +32,7 @@ RCSID("$Id$")
 
 /** Send a packet via a UDP socket.
  *
- * @param[in] socket		we're reading from.
+ * @param[in] sock		we're reading from.
  * @param[in] flags		to pass to send(), or sendto()
  * @param[in] data		to data to send
  * @param[in] data_len		length of data to send
@@ -40,28 +40,25 @@ RCSID("$Id$")
  *	- 0 on success.
  *	- -1 on failure.
  */
-int udp_send(fr_socket_t const *socket, int flags, void *data, size_t data_len)
+int udp_send(fr_socket_t const *sock, int flags, void *data, size_t data_len)
 {
 	int ret;
 
-	if (unlikely(socket->proto != IPPROTO_UDP)) {
-		fr_strerror_printf("Invalid proto type %u", socket->proto);
-		return -1;
-	}
+	fr_assert(sock->proto == IPPROTO_UDP);
 
 	if (flags & UDP_FLAGS_CONNECTED) {
-		ret = (send(socket->fd, data, data_len, 0) == (ssize_t)data_len) ? 0 : -1;
+		ret = (send(sock->fd, data, data_len, 0) == (ssize_t)data_len) ? 0 : -1;
 	} else {
 		struct sockaddr_storage	dst, src;
 		socklen_t		sizeof_dst, sizeof_src;
 
 		if (fr_ipaddr_to_sockaddr(&dst, &sizeof_dst,
-					  &socket->inet.dst_ipaddr, socket->inet.dst_port) < 0) return -1;
+					  &sock->inet.dst_ipaddr, sock->inet.dst_port) < 0) return -1;
 		if (fr_ipaddr_to_sockaddr(&src, &sizeof_src,
-					  &socket->inet.src_ipaddr, socket->inet.src_port) < 0) return -1;
+					  &sock->inet.src_ipaddr, sock->inet.src_port) < 0) return -1;
 
-		ret = sendfromto(socket->fd, data, data_len, 0,
-				 socket->inet.ifindex,
+		ret = sendfromto(sock->fd, data, data_len, 0,
+				 sock->inet.ifindex,
 				 (struct sockaddr *)&src, sizeof_src,
 				 (struct sockaddr *)&dst, sizeof_dst);
 	}