fix messenger connections over tcp

shikokuchuo · shikokuchuo · commit 423cf16ca39a · 2022-04-01T12:29:47.000+01:00
diff --git a/R/messenger.R b/R/messenger.R
@@ -44,7 +44,7 @@ messenger <- function(url) {
   }
   cat(sprintf("\n| url: %s\n", url), file = stdout())
   cat("| connecting... ", file = stderr())
-  s <- .Call(rnng_send, sock, writeBin(":c ", raw()), 2000L)
+  s <- .Call(rnng_send, sock, writeBin(":c ", raw()), 1000L)
   if (is.integer(s)) {
     cat(sprintf("\r| peer offline: %s\n", format.POSIXct(Sys.time())), file = stderr())
   } else {
diff --git a/src/sockets.c b/src/sockets.c
@@ -161,7 +161,7 @@ SEXP rnng_messenger(SEXP url) {
   }
   dlp = R_Calloc(1, nng_listener);
   xc = nng_listen(*sock, up, dlp, 0);
-  if (xc == 10) {
+  if (xc == 10 || xc == 15) {
     R_Free(dlp);
     nng_dialer *dlp = R_Calloc(1, nng_dialer);
     xc = nng_dial(*sock, up, dlp, 2u);

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ messenger <- function(url) {`
`44`	`44`	`}`
`45`	`45`	`cat(sprintf("\n\| url: %s\n", url), file = stdout())`
`46`	`46`	`cat("\| connecting... ", file = stderr())`
`47`		`- s <- .Call(rnng_send, sock, writeBin(":c ", raw()), 2000L)`
	`47`	`+ s <- .Call(rnng_send, sock, writeBin(":c ", raw()), 1000L)`
`48`	`48`	`if (is.integer(s)) {`
`49`	`49`	`cat(sprintf("\r\| peer offline: %s\n", format.POSIXct(Sys.time())), file = stderr())`
`50`	`50`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ SEXP rnng_messenger(SEXP url) {`
`161`	`161`	`}`
`162`	`162`	`dlp = R_Calloc(1, nng_listener);`
`163`	`163`	`xc = nng_listen(*sock, up, dlp, 0);`
`164`		`- if (xc == 10) {`
	`164`	`+ if (xc == 10 \|\| xc == 15) {`
`165`	`165`	`R_Free(dlp);`
`166`	`166`	`nng_dialer *dlp = R_Calloc(1, nng_dialer);`
`167`	`167`	`xc = nng_dial(*sock, up, dlp, 2u);`