Skip to content

ZOOKEEPER-4943:The error handling method is more robust and has a stronger guarantee of randomness #2275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

ZOOKEEPER-4943:The error handling method is more robust and has a stronger guarantee of randomness #2275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions zookeeper-client/zookeeper-client-c/src/zookeeper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* limitations under the License.
*/

#include <asm-generic/errno-base.h>
#if !defined(DLL_EXPORT) && !defined(USE_STATIC_LIB)
# define USE_STATIC_LIB
#endif
Expand Down Expand Up @@ -718,7 +719,9 @@ static void setup_random()
int seed;
int fd = open("/dev/urandom", O_RDONLY);
if (fd == -1) {
seed = getpid();
struct timeval tv;
gettimeofday(&tv, NULL);
seed = getpid() ^ tv.tv_sec ^ tv.tv_usec;
} else {
int seed_len = 0;

Expand All @@ -731,12 +734,22 @@ static void setup_random()
* signal (errno == EINTR) in which case we need to retry.
*/
int rc = read(fd, (char *)&seed + seed_len, sizeof(seed) - seed_len);
assert(rc > 0 || errno == EINTR);
if (rc > 0) {
seed_len += rc;
if (rc <= 0) {
if (errno == EINTR) {
continue;
}
break;
}
seed_len += rc;
}
close(fd);

/* If not enough bytes are read, use a backup random source. */
if (seed_len < sizeof(seed)) {
struct timeval tv;
gettimeofday(&tv, NULL);
seed ^= getpid() ^ tv.tv_sec ^ tv.tv_usec;
}
}
srandom(seed);
srand48(seed);
Expand Down