* SYNC [core] nanonng sync

* MDF Fix conlficts Signed-off-by: wayne <[email protected]> Signed-off-by: jaylin <[email protected]>
emqx · Dec 28, 2023 · f4b5b9a · f4b5b9a
1 parent bcc61a0
commit f4b5b9a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -1,4 +1,5 @@
 //
+// Copyright 2023 Garrett D'Amore <[email protected]>
 // Copyright 2023 Staysail Systems, Inc. <[email protected]>
 // Copyright 2017 Capitar IT Group BV <[email protected]>
 //

diff --git 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
@@ -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);