From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Tue, 1 Nov 2016 00:11:02 +0000 (-0400)
Subject: Use connect fd
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3475e6adaa27fd992ec8eb7a42daeb0fe339df8d;p=thirdparty%2Ffreeradius-server.git

Use connect fd
---

diff --git a/src/modules/rlm_sigtran/libosmo-m3ua/sctp_m3ua_client.c b/src/modules/rlm_sigtran/libosmo-m3ua/sctp_m3ua_client.c
index bf4352aa2ca..7b6463141d8 100644
--- a/src/modules/rlm_sigtran/libosmo-m3ua/sctp_m3ua_client.c
+++ b/src/modules/rlm_sigtran/libosmo-m3ua/sctp_m3ua_client.c
@@ -319,7 +319,7 @@ static int m3ua_sctp_assoc_complete(struct osmo_fd *ofd, unsigned int what)
 
 	osmo_fd_unregister(ofd);	/* Remove our connect callback */
 
-	ret = getsockopt(fd->fd, SOL_SOCKET, SO_ERROR, &err, &len);
+	ret = getsockopt(ofd->fd, SOL_SOCKET, SO_ERROR, &err, &len);
 	if (ret < 0) {
 		LOGP(DINP, LOGL_ERROR, "Failed getting socket error: %s (%i).\n", strerror(errno), errno);
 	error:
@@ -399,12 +399,12 @@ static void m3ua_start(void *data)
 		return fail_link(link);
 	}
 
-	link->queue.bfd.fd = sctp;
-	link->queue.bfd.data = link;
-	link->queue.bfd.when = BSC_FD_READ | BSC_FD_EXCEPT;
-	link->queue.read_cb = m3ua_sctp_assoc_complete;
+	link->connect.fd = sctp;
+	link->connect.data = link;
+	link->connect.when = BSC_FD_READ | BSC_FD_EXCEPT;
+	link->connect.cb = m3ua_sctp_assoc_complete;
 
-	if (osmo_fd_register(&link->queue.bfd) != 0) {
+	if (osmo_fd_register(&link->connect) != 0) {
 		LOGP(DINP, LOGL_ERROR, "Failed to register fd\n");
 		close(sctp);
 		return fail_link(link);