]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Use connect fd
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Tue, 1 Nov 2016 00:11:02 +0000 (20:11 -0400)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Tue, 1 Nov 2016 00:11:02 +0000 (20:11 -0400)
src/modules/rlm_sigtran/libosmo-m3ua/sctp_m3ua_client.c

index bf4352aa2cabf74d4bd0841ca75e078248ab46e1..7b6463141d8c66de6b79276ef834980d69a54c4f 100644 (file)
@@ -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);