osmocom
/
osmo-pcap
mirror of https://gerrit.osmocom.org/osmo-pcap
11
0
Fork 0
Code Issues Releases Wiki Activity

Use osmo_fd_*_{disable,enable} 

Change-Id: I97e100b34e9d26cf5acaa57be12879787d4d2d2b
Depends: libosmocore.git Idb89ba7bc7c129a6304a76900d17f47daf54d17d
This commit is contained in:
Harald Welte 2020-10-19 13:07:06 +02:00
parent a9600141b8
commit 5899cb4fbf
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osmo_tls.c
View File

@ -191,10 +191,9 @@ static int need_handshake(struct osmo_tls_session *tls_session)
if (rc == 0) { if (rc == 0) {
/* handshake is done. start writing if we are allowed to */ /* handshake is done. start writing if we are allowed to */
LOGP(DTLS, LOGL_NOTICE, "TLS handshake done.\n"); LOGP(DTLS, LOGL_NOTICE, "TLS handshake done.\n");
osmo_fd_read_enable(&tls_session->wqueue->bfd);
if (!llist_empty(&tls_session->wqueue->msg_queue)) if (!llist_empty(&tls_session->wqueue->msg_queue))
tls_session->wqueue->bfd.when = OSMO_FD_WRITE | OSMO_FD_READ; osmo_fd_write_enable(&tls_session->wqueue->bfd);
else
tls_session->wqueue->bfd.when = OSMO_FD_READ;
tls_session->need_handshake = false; tls_session->need_handshake = false;
release_keys(tls_session); release_keys(tls_session);
if (tls_session->handshake_done) if (tls_session->handshake_done)
@ -227,7 +226,7 @@ static int tls_read(struct osmo_tls_session *sess)
static int tls_write(struct osmo_tls_session *sess) static int tls_write(struct osmo_tls_session *sess)
{ {
int rc; int rc;
sess->wqueue->bfd.when &= ~OSMO_FD_WRITE; osmo_fd_write_disable(&sess->wqueue->bfd);
if (llist_empty(&sess->wqueue->msg_queue)) if (llist_empty(&sess->wqueue->msg_queue))
return 0; return 0;
@ -252,7 +251,7 @@ static int tls_write(struct osmo_tls_session *sess)
} }
if (sess->need_resend || !llist_empty(&sess->wqueue->msg_queue)) if (sess->need_resend || !llist_empty(&sess->wqueue->msg_queue))
sess->wqueue->bfd.when |= OSMO_FD_WRITE; osmo_fd_write_enable(&sess->wqueue->bfd);
return rc; return rc;
} }