From 123e1439a284716c651eca037b95ba997e6c30db Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 27 Dec 2016 20:46:32 -0800 Subject: Send and receive now work. This fixes a few core issues, and improves readability for the message queue code as well. inproc delivery of messages works now. --- src/nng.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/nng.c') diff --git a/src/nng.c b/src/nng.c index fb2d0861..49671935 100644 --- a/src/nng.c +++ b/src/nng.c @@ -63,13 +63,13 @@ nng_recvmsg(nng_socket *s, nng_msg **msgp, int flags) nni_time expire; NNI_INIT_INT(); - if ((flags == NNG_FLAG_NONBLOCK) || (s->s_rcvtimeo == 0)) { expire = NNI_TIME_ZERO; } else if (s->s_rcvtimeo < 0) { expire = NNI_TIME_NEVER; } else { - expire = nni_clock() + s->s_rcvtimeo; + expire = nni_clock(); + expire += s->s_rcvtimeo; } return (nni_socket_recvmsg(s, msgp, expire)); @@ -88,7 +88,8 @@ nng_sendmsg(nng_socket *s, nng_msg *msg, int flags) } else if (s->s_sndtimeo < 0) { expire = NNI_TIME_NEVER; } else { - expire = nni_clock() + s->s_sndtimeo; + expire = nni_clock(); + expire += s->s_sndtimeo; } return (nni_socket_sendmsg(s, msg, expire)); -- cgit v1.2.3-70-g09d2