Change in osmocom-bb[master]: Use osmo_fd_*_{disable,enable}

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/20770 )

Change subject: Use osmo_fd_*_{disable,enable}
......................................................................

Use osmo_fd_*_{disable,enable}

Change-Id: If4c7f946852d153bd472e5c704f8d517d26ca22e
Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d
---
M src/host/layer23/src/mobile/mncc_sock.c
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/host/layer23/src/mobile/mncc_sock.c b/src/host/layer23/src/mobile/mncc_sock.c
index 14adf07..5ea6feb 100644
--- a/src/host/layer23/src/mobile/mncc_sock.c
+++ b/src/host/layer23/src/mobile/mncc_sock.c
@@ -72,13 +72,13 @@
 
 	/* Actually enqueue the message and mark socket write need */
 	msgb_enqueue(&state->upqueue, msg);
-	state->conn_bfd.when |= OSMO_FD_WRITE;
+	osmo_fd_write_enable(&state->conn_bfd);
 	return 0;
 }
 
 void mncc_sock_write_pending(struct mncc_sock_state *state)
 {
-	state->conn_bfd.when |= OSMO_FD_WRITE;
+	osmo_fd_write_enable(&state->conn_bfd);
 }
 
 static void mncc_sock_close(struct mncc_sock_state *state)
@@ -92,7 +92,7 @@
 	osmo_fd_unregister(bfd);
 
 	/* re-enable the generation of ACCEPT for new connections */
-	state->listen_bfd.when |= OSMO_FD_READ;
+	osmo_fd_read_enable(&state->listen_bfd);
 
 	/* FIXME: make sure we don't enqueue anymore */
 
@@ -156,7 +156,7 @@
 		msg = llist_entry(state->upqueue.next, struct msgb, list);
 		mncc_prim = (struct gsm_mncc *)msg->data;
 
-		bfd->when &= ~OSMO_FD_WRITE;
+		osmo_fd_write_disable(bfd);
 
 		/* bug hunter 8-): maybe someone forgot msgb_put(...) ? */
 		if (!msgb_length(msg)) {
@@ -171,7 +171,7 @@
 			goto close;
 		if (rc < 0) {
 			if (errno == EAGAIN) {
-				bfd->when |= OSMO_FD_WRITE;
+				osmo_fd_write_enable(bfd);
 				break;
 			}
 			goto close;
@@ -226,7 +226,7 @@
 		LOGP(DMNCC, LOGL_NOTICE, "MNCC app connects but we already have "
 			"another active connection ?!?\n");
 		/* We already have one MNCC app connected, this is all we support */
-		state->listen_bfd.when &= ~OSMO_FD_READ;
+		osmo_fd_read_disable(&state->listen_bfd);
 		close(rc);
 		return 0;
 	}

-- 
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/20770
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: If4c7f946852d153bd472e5c704f8d517d26ca22e
Gerrit-Change-Number: 20770
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201111/a076729a/attachment.htm>