From 47f455239ba21f9c84db51f5314a86cc17796ba9 Mon Sep 17 00:00:00 2001 From: jaylin Date: Thu, 28 Dec 2023 22:36:39 +0800 Subject: [PATCH] * SYNC [core] nanonng sync * MDF Fix conlficts Signed-off-by: wayne Signed-off-by: jaylin --- src/compat/nanomsg/nn.c | 1 - src/core/nng_impl.h | 1 + src/sp/protocol/reqrep0/req.c | 1 - src/sp/protocol/reqrep0/req_test.c | 2 +- 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/compat/nanomsg/nn.c b/src/compat/nanomsg/nn.c index af4db5d3..e28f7929 100644 --- a/src/compat/nanomsg/nn.c +++ b/src/compat/nanomsg/nn.c @@ -1150,7 +1150,6 @@ nn_setsockopt(int s, int nnlevel, int nnopt, const void *valp, size_t sz) // (e.g. with legacy tests). (void) nng_socket_set_ms(sid, NNG_OPT_REQ_RESENDTICK, 10); } - return (0); } diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h index b6497eb2..3b9b89d7 100644 --- a/src/core/nng_impl.h +++ b/src/core/nng_impl.h @@ -1,4 +1,5 @@ // +// Copyright 2023 Garrett D'Amore // Copyright 2023 Staysail Systems, Inc. // Copyright 2017 Capitar IT Group BV // diff --git a/src/sp/protocol/reqrep0/req.c b/src/sp/protocol/reqrep0/req.c index b420c868..758686e4 100644 --- a/src/sp/protocol/reqrep0/req.c +++ b/src/sp/protocol/reqrep0/req.c @@ -913,7 +913,6 @@ static nni_option req0_sock_options[] = { .o_get = req0_sock_get_resend_tick, .o_set = req0_sock_set_resend_tick, }, - // terminate list { .o_name = NULL, diff --git a/src/sp/protocol/reqrep0/req_test.c b/src/sp/protocol/reqrep0/req_test.c index c115c8e7..84b74cea 100644 --- a/src/sp/protocol/reqrep0/req_test.c +++ b/src/sp/protocol/reqrep0/req_test.c @@ -233,7 +233,7 @@ test_req_resend_reconnect(void) // the retry from loss of our original peer. NUTS_PASS(nng_socket_set_ms(req, NNG_OPT_REQ_RESENDTIME, 60 * SECOND)); // And make sure the tick runs faster than our timeout! - NUTS_PASS(nng_socket_set_ms(req, NNG_OPT_REQ_RESENDTICK, SECOND/10)); + NUTS_PASS(nng_socket_set_ms(req, NNG_OPT_REQ_RESENDTICK, SECOND / 10)); NUTS_MARRY(rep1, req);