various cleanups

Author: shikokuchuo

R/aio.R

@@ -55,7 +55,7 @@ send_aio.nanoSocket <- function(con, data, mode = c("serial", "raw"), timeout =
   aio <- .Call(rnng_send_aio, con, data, timeout)
   is.integer(aio) && return(invisible(aio))
 
-  result <- NULL
+  data <- result <- NULL
   unresolv <- TRUE
   env <- new.env(hash = FALSE)
   makeActiveBinding(sym = "result", fun = function(x) {
@@ -84,7 +84,7 @@ send_aio.nanoContext <- function(con, data, mode = c("serial", "raw"), timeout =
   aio <- .Call(rnng_ctx_send_aio, con, data, timeout)
   is.integer(aio) && return(invisible(aio))
 
-  result <- NULL
+  data <- result <- NULL
   unresolv <- TRUE
   env <- new.env(hash = FALSE)
   makeActiveBinding(sym = "result", fun = function(x) {
@@ -112,7 +112,7 @@ send_aio.nanoStream <- function(con, data, mode = "raw", timeout = -2L) {
   aio <- .Call(rnng_stream_send_aio, con, data, timeout)
   is.integer(aio) && return(invisible(aio))
 
-  result <- NULL
+  data <- result <- NULL
   unresolv <- TRUE
   env <- new.env(hash = FALSE)
   makeActiveBinding(sym = "result", fun = function(x) {
@@ -191,7 +191,7 @@ recv_aio <- function(con,
                      timeout = -2L,
                      keep.raw = TRUE,
                      ...,
-                     n = 100000L) UseMethod("recv_aio")
+                     n = 65536L) UseMethod("recv_aio")
 
 #' @rdname recv_aio
 #' @method recv_aio nanoSocket
@@ -354,7 +354,7 @@ recv_aio.nanoStream <- function(con,
                                          "logical", "numeric", "raw"),
                                 timeout = -2L,
                                 keep.raw = TRUE,
-                                n = 100000L,
+                                n = 65536L,
                                 ...) {
 
   mode <- match.arg2(mode, c("character", "complex", "double", "integer",

R/messenger.R

@@ -19,9 +19,8 @@
 #'
 #'     \code{:q} is the command to quit.
 #'
-#'     NOTE: This is a proof of concept intended for use within internal
-#'     networks. Currently no measures are taken to verify the identity of
-#'     endpoints, and hence should not be used to transmit sensitive information.
+#'     NOTE: This is currently a proof of concept and should not be used for
+#'     critical applications.
 #'
 #' @export
 #'
@@ -43,6 +42,7 @@ messenger <- function(url) {
   }
   cat(sprintf("\n| url: %s\n", url), file = stdout())
   cat("| connecting... ", file = stderr())
+
   s <- suppressWarnings(.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())

R/sendrecv.R

@@ -142,7 +142,7 @@ send.nanoStream <- function(con,
 #' @param keep.raw [default TRUE] logical flag whether to keep the received raw
 #'     vector (useful for verification e.g. via hashing). If FALSE, will return
 #'     the converted data only.
-#' @param n <Streams> [default 100000L] the maximum number of bytes to receive.
+#' @param n <Streams> [default 65536L] the maximum number of bytes to receive.
 #'     Can be an over-estimate, but note that a buffer of this size is reserved.
 #' @param ... currently unused.
 #'
@@ -212,7 +212,7 @@ recv <- function(con,
                  block,
                  keep.raw = TRUE,
                  ...,
-                 n = 100000L) UseMethod("recv")
+                 n = 65536L) UseMethod("recv")
 
 #' @rdname recv
 #' @method recv nanoSocket
@@ -269,7 +269,7 @@ recv.nanoStream <- function(con,
                                      "logical", "numeric", "raw"),
                             block = TRUE,
                             keep.raw = TRUE,
-                            n = 100000L,
+                            n = 65536L,
                             ...) {
 
   mode <- match.arg2(mode, c("character", "complex", "double", "integer",

man/messenger.Rd

@@ -31,7 +31,7 @@ typedef struct nano_handle_s {
   nng_tls_config *cfg;
 } nano_handle;
 
-static void saio_complete(void *arg) {
+void saio_complete(void *arg) {
 
   nano_aio *saio = (nano_aio *) (arg);
   saio->result = nng_aio_result(saio->aio);
@@ -43,7 +43,7 @@ static void saio_complete(void *arg) {
 
 }
 
-static void raio_complete(void *arg) {
+void raio_complete(void *arg) {
 
   nano_aio *raio = (nano_aio *) (arg);
   raio->result = nng_aio_result(raio->aio);
@@ -55,7 +55,7 @@ static void raio_complete(void *arg) {
 
 }
 
-static void iaio_complete(void *arg) {
+void iaio_complete(void *arg) {
 
   nano_aio *iaio = (nano_aio *) (arg);
   iaio->result = nng_aio_result(iaio->aio);
@@ -65,7 +65,7 @@ static void iaio_complete(void *arg) {
 
 }
 
-static void saio_finalizer(SEXP xptr) {
+void saio_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -76,7 +76,7 @@ static void saio_finalizer(SEXP xptr) {
 
 }
 
-static void raio_finalizer(SEXP xptr) {
+void raio_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -89,7 +89,7 @@ static void raio_finalizer(SEXP xptr) {
 
 }
 
-static void isaio_finalizer(SEXP xptr) {
+void isaio_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -101,7 +101,7 @@ static void isaio_finalizer(SEXP xptr) {
 
 }
 
-static void iraio_finalizer(SEXP xptr) {
+void iraio_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -115,7 +115,7 @@ static void iraio_finalizer(SEXP xptr) {
 
 }
 
-static void haio_finalizer(SEXP xptr) {
+void haio_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -393,7 +393,7 @@ SEXP rnng_stream_recv_aio(SEXP stream, SEXP bytes, SEXP timeout) {
 
   nng_stream *sp = (nng_stream *) R_ExternalPtrAddr(stream);
   const nng_duration dur = (nng_duration) Rf_asInteger(timeout);
-  const size_t xlen = Rf_asInteger(bytes) + 1;
+  const size_t xlen = Rf_asInteger(bytes);
   int xc;
 
   nano_aio *iaio = R_Calloc(1, nano_aio);

man/recv.Rd

@@ -2,12 +2,53 @@
 
 #define NANONEXT_INTERNALS
 #define NANONEXT_PROTOCOLS
-#define NANONEXT_FINALIZERS
 #include "nanonext.h"
 
-/* statics ------------------------------------------------------------------ */
+/* mk_error ----------------------------------------------------------------- */
 
-static void context_finalizer(SEXP xptr) {
+SEXP mk_error(const int xc) {
+
+  SEXP err = PROTECT(Rf_ScalarInteger(xc));
+  Rf_classgets(err, Rf_mkString("errorValue"));
+  Rf_warning("%d | %s", xc, nng_strerror(xc));
+  UNPROTECT(1);
+  return err;
+
+}
+
+/* finalizers --------------------------------------------------------------- */
+
+void socket_finalizer(SEXP xptr) {
+
+  if (R_ExternalPtrAddr(xptr) == NULL)
+    return;
+  nng_socket *xp = (nng_socket *) R_ExternalPtrAddr(xptr);
+  nng_close(*xp);
+  R_Free(xp);
+
+}
+
+void dialer_finalizer(SEXP xptr) {
+
+  if (R_ExternalPtrAddr(xptr) == NULL)
+    return;
+  nng_dialer *xp = (nng_dialer *) R_ExternalPtrAddr(xptr);
+  nng_dialer_close(*xp);
+  R_Free(xp);
+
+}
+
+void listener_finalizer(SEXP xptr) {
+
+  if (R_ExternalPtrAddr(xptr) == NULL)
+    return;
+  nng_listener *xp = (nng_listener *) R_ExternalPtrAddr(xptr);
+  nng_listener_close(*xp);
+  R_Free(xp);
+
+}
+
+void context_finalizer(SEXP xptr) {
 
   if (R_ExternalPtrAddr(xptr) == NULL)
     return;
@@ -21,7 +62,7 @@ static void context_finalizer(SEXP xptr) {
 
 SEXP rnng_protocol_open(SEXP protocol) {
 
-  int pro = INTEGER(protocol)[0];
+  const int pro = *INTEGER(protocol);
   char *pname;
   int xc;
 
@@ -545,7 +586,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP bytes, SEXP timeout) {
 
   nng_stream *sp = (nng_stream *) R_ExternalPtrAddr(stream);
   const nng_duration dur = (nng_duration) Rf_asInteger(timeout);
-  const size_t xlen = Rf_asInteger(bytes) + 1;
+  const size_t xlen = Rf_asInteger(bytes);
   nng_iov iov;
   nng_aio *aiop;
   int xc;

man/recv_aio.Rd

@@ -33,50 +33,12 @@
 #include <R_ext/Visibility.h>
 
 #ifdef NANONEXT_INTERNALS
-static SEXP mk_error(const int xc) {
-
-  SEXP err = PROTECT(Rf_ScalarInteger(xc));
-  Rf_classgets(err, Rf_mkString("errorValue"));
-  Rf_warning("%d | %s", xc, nng_strerror(xc));
-  UNPROTECT(1);
-  return err;
-
-}
-#endif
-
-#ifdef NANONEXT_FINALIZERS
-static void socket_finalizer(SEXP xptr) {
-
-  if (R_ExternalPtrAddr(xptr) == NULL)
-    return;
-  nng_socket *xp = (nng_socket *) R_ExternalPtrAddr(xptr);
-  nng_close(*xp);
-  R_Free(xp);
-
-}
-
-static void dialer_finalizer(SEXP xptr) {
-
-  if (R_ExternalPtrAddr(xptr) == NULL)
-    return;
-  nng_dialer *xp = (nng_dialer *) R_ExternalPtrAddr(xptr);
-  nng_dialer_close(*xp);
-  R_Free(xp);
-
-}
-
-static void listener_finalizer(SEXP xptr) {
-
-  if (R_ExternalPtrAddr(xptr) == NULL)
-    return;
-  nng_listener *xp = (nng_listener *) R_ExternalPtrAddr(xptr);
-  nng_listener_close(*xp);
-  R_Free(xp);
-
-}
+extern SEXP mk_error(const int);
+extern void socket_finalizer(SEXP);
+extern void dialer_finalizer(SEXP);
+extern void listener_finalizer(SEXP);
 #endif
 
-/* define internal symbols */
 extern SEXP nano_AioSymbol;
 extern SEXP nano_ContextSymbol;
 extern SEXP nano_DataSymbol;
@@ -91,7 +53,6 @@ extern SEXP nano_StreamSymbol;
 extern SEXP nano_TextframesSymbol;
 extern SEXP nano_UrlSymbol;
 
-/* define functions */
 extern SEXP rnng_aio_call(SEXP);
 extern SEXP rnng_aio_get_msg(SEXP);
 extern SEXP rnng_aio_http(SEXP);