X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Futil.c;h=03b14cdc536009400c4654eb4d3241315614c2ae;hb=7ef7e96fc2f3eb620fffb6f277339214efe83747;hp=da32cc550170c61af49b3cb84bc209f027ef3612;hpb=6aa4055ef0544ae85457c25c510fe3db04949c43;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/util.c b/src/util.c
index da32cc5..03b14cd 100755
--- a/src/util.c
+++ b/src/util.c
@@ -36,19 +36,24 @@
 
 #define URANDOM "/dev/urandom"
 
-int f = -1;
+static int f = -1;
 
 int __connman_util_get_random(uint64_t *val)
 {
-	int r = 0;
+	int r;
 
 	if (!val)
 		return -EINVAL;
 
-	if (read(f, val, sizeof(uint64_t)) < 0) {
+	r = read(f, val, sizeof(uint64_t));
+	if (r < 0) {
 		r = -errno;
 		connman_warn_once("Could not read from "URANDOM);
 		*val = random();
+	} else if (r != sizeof(uint64_t)) {
+		r = -EIO;
+		connman_warn_once("Short read from "URANDOM);
+		*val = random();
 	}
 
 	return r;
@@ -58,7 +63,7 @@ int __connman_util_init(void)
 {
 	int r = 0;
 
-	if (f > 0)
+	if (f >= 0)
 		return 0;
 
 	f = open(URANDOM, O_RDONLY);
@@ -81,8 +86,19 @@ int __connman_util_init(void)
 
 void __connman_util_cleanup(void)
 {
-	if (f > 0)
+	if (f >= 0)
 		close(f);
 
 	f = -1;
 }
+
+/**
+ * Return a random delay in range of zero to secs*1000 milli seconds.
+ */
+unsigned int __connman_util_random_delay_ms(unsigned int secs)
+{
+       uint64_t rand;
+
+       __connman_util_get_random(&rand);
+       return rand % (secs * 1000);
+}