Merge branch 'master' of github.com:fluent/fluent-bit

fluent · Sep 30, 2020 · 00e0742 · 00e0742
2 parents 155fafe + 11d1d79
commit 00e0742
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 37 deletions.
diff --git a/plugins/in_random/random.c b/plugins/in_random/random.c
@@ -22,17 +22,14 @@
 #include <fluent-bit/flb_config.h>
 #include <fluent-bit/flb_error.h>
 #include <fluent-bit/flb_pack.h>
+#include <fluent-bit/flb_random.h>
 #include <msgpack.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifdef _WIN32
-#  include <event2/util.h>
-#else
-#  include <fcntl.h>
-#endif
+#include <fcntl.h>
 
 #define DEFAULT_INTERVAL_SEC  1
 #define DEFAULT_INTERVAL_NSEC 0
@@ -53,8 +50,6 @@ struct flb_in_random_config {
 static int in_random_collect(struct flb_input_instance *ins,
                              struct flb_config *config, void *in_context)
 {
-    int fd;
-    int ret;
     uint64_t val;
     msgpack_packer mp_pck;
     msgpack_sbuffer mp_sbuf;
@@ -68,23 +63,9 @@ static int in_random_collect(struct flb_input_instance *ins,
         return -1;
     }
 
-#ifdef _WIN32
-    evutil_secure_rng_get_bytes(&val, sizeof(val));
-#else
-    fd = open("/dev/urandom", O_RDONLY);
-    if (fd == -1) {
+    if (flb_random_bytes((unsigned char *) &val, sizeof(uint64_t))) {
         val = time(NULL);
     }
-    else {
-        ret = read(fd, &val, sizeof(val));
-        if (ret == -1) {
-            perror("read");
-            close(fd);
-            return -1;
-        }
-        close(fd);
-    }
-#endif
 
     /* Initialize local msgpack buffer */
     msgpack_sbuffer_init(&mp_sbuf);

diff --git a/plugins/out_gelf/gelf.c b/plugins/out_gelf/gelf.c
@@ -24,6 +24,7 @@
 #include <fluent-bit/flb_gzip.h>
 #include <fluent-bit/flb_utils.h>
 #include <fluent-bit/flb_network.h>
+#include <fluent-bit/flb_random.h>
 #include <msgpack.h>
 
 #include <stdio.h>
@@ -321,8 +322,6 @@ static void cb_gelf_flush(const void *data, size_t bytes,
 static int cb_gelf_init(struct flb_output_instance *ins, struct flb_config *config,
                         void *data)
 {
-    int ret;
-    int fd;
     const char *tmp;
     struct flb_out_gelf_config *ctx = NULL;
 
@@ -408,21 +407,9 @@ static int cb_gelf_init(struct flb_output_instance *ins, struct flb_config *conf
     }
 
     /* init random seed */
-    fd = open("/dev/urandom", O_RDONLY);
-    if (fd == -1) {
+    if (flb_random_bytes((unsigned char *) &ctx->seed, sizeof(int))) {
         ctx->seed = time(NULL);
     }
-    else {
-        unsigned int val;
-        ret = read(fd, &val, sizeof(val));
-        if (ret > 0) {
-            ctx->seed = val;
-        }
-        else {
-            ctx->seed = time(NULL);
-        }
-        close(fd);
-    }
     srand(ctx->seed);
 
     ctx->fd = -1;