diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-07-06 11:14:11 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-07-06 11:14:11 +0000 |
commit | f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea (patch) | |
tree | b59a38ad9e2296b3d2c8cc3302f21cf6d3ecc458 /src/util | |
parent | 6db64c5eae089e1d81cafbb051f65412790d16bc (diff) | |
download | gnunet-f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea.tar.gz gnunet-f5beb3eaf163fc0bf2a4f86bd413d3ee6939cfea.zip |
-fix misc issues
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/bandwidth.c | 2 | ||||
-rw-r--r-- | src/util/disk.c | 10 | ||||
-rw-r--r-- | src/util/network.c | 6 | ||||
-rw-r--r-- | src/util/test_server.c | 1 |
4 files changed, 16 insertions, 3 deletions
diff --git a/src/util/bandwidth.c b/src/util/bandwidth.c index 364c46977..bc5c02d60 100644 --- a/src/util/bandwidth.c +++ b/src/util/bandwidth.c | |||
@@ -177,7 +177,7 @@ update_excess (struct GNUNET_BANDWIDTH_Tracker *av) | |||
177 | 500000LL) / 1000000LL; | 177 | 500000LL) / 1000000LL; |
178 | current_consumption = av->consumption_since_last_update__ - delta_avail; | 178 | current_consumption = av->consumption_since_last_update__ - delta_avail; |
179 | /* negative current_consumption means that we have savings */ | 179 | /* negative current_consumption means that we have savings */ |
180 | max_carry = av->available_bytes_per_s__ * av->max_carry_s__; | 180 | max_carry = (uint64_t) av->available_bytes_per_s__ * av->max_carry_s__; |
181 | if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE) | 181 | if (max_carry < GNUNET_SERVER_MAX_MESSAGE_SIZE) |
182 | max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE; | 182 | max_carry = GNUNET_SERVER_MAX_MESSAGE_SIZE; |
183 | left_bytes = max_carry + current_consumption; | 183 | left_bytes = max_carry + current_consumption; |
diff --git a/src/util/disk.c b/src/util/disk.c index 4624df7c1..d9ebde84f 100644 --- a/src/util/disk.c +++ b/src/util/disk.c | |||
@@ -527,14 +527,18 @@ char * | |||
527 | GNUNET_DISK_mkdtemp (const char *t) | 527 | GNUNET_DISK_mkdtemp (const char *t) |
528 | { | 528 | { |
529 | char *fn; | 529 | char *fn; |
530 | mode_t omask; | ||
530 | 531 | ||
532 | omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH); | ||
531 | fn = mktemp_name (t); | 533 | fn = mktemp_name (t); |
532 | if (fn != mkdtemp (fn)) | 534 | if (fn != mkdtemp (fn)) |
533 | { | 535 | { |
534 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn); | 536 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkdtemp", fn); |
535 | GNUNET_free (fn); | 537 | GNUNET_free (fn); |
538 | umask (omask); | ||
536 | return NULL; | 539 | return NULL; |
537 | } | 540 | } |
541 | umask (omask); | ||
538 | return fn; | 542 | return fn; |
539 | } | 543 | } |
540 | 544 | ||
@@ -587,14 +591,18 @@ GNUNET_DISK_mktemp (const char *t) | |||
587 | { | 591 | { |
588 | int fd; | 592 | int fd; |
589 | char *fn; | 593 | char *fn; |
594 | mode_t omask; | ||
590 | 595 | ||
596 | omask = umask (S_IWGRP | S_IWOTH | SIRGRP | S_IROTH); | ||
591 | fn = mktemp_name (t); | 597 | fn = mktemp_name (t); |
592 | if (-1 == (fd = mkstemp (fn))) | 598 | if (-1 == (fd = mkstemp (fn))) |
593 | { | 599 | { |
594 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn); | 600 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "mkstemp", fn); |
595 | GNUNET_free (fn); | 601 | GNUNET_free (fn); |
602 | umask (omask); | ||
596 | return NULL; | 603 | return NULL; |
597 | } | 604 | } |
605 | umask (omask); | ||
598 | if (0 != CLOSE (fd)) | 606 | if (0 != CLOSE (fd)) |
599 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn); | 607 | LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "close", fn); |
600 | return fn; | 608 | return fn; |
diff --git a/src/util/network.c b/src/util/network.c index e42dfc4dc..ba213b412 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -166,6 +166,12 @@ GNUNET_NETWORK_unix_precheck (const struct sockaddr_un *un) | |||
166 | int ret; | 166 | int ret; |
167 | 167 | ||
168 | s = socket (AF_UNIX, SOCK_STREAM, 0); | 168 | s = socket (AF_UNIX, SOCK_STREAM, 0); |
169 | if (-1 == s) | ||
170 | { | ||
171 | GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, | ||
172 | "Failed to open AF_UNIX socket"); | ||
173 | return; | ||
174 | } | ||
169 | ret = connect (s, | 175 | ret = connect (s, |
170 | (struct sockaddr *) un, | 176 | (struct sockaddr *) un, |
171 | sizeof (struct sockaddr_un)); | 177 | sizeof (struct sockaddr_un)); |
diff --git a/src/util/test_server.c b/src/util/test_server.c index f82ecb2b1..384a1cef0 100644 --- a/src/util/test_server.c +++ b/src/util/test_server.c | |||
@@ -239,7 +239,6 @@ task (void *cls) | |||
239 | GNUNET_MQ_handler_end () | 239 | GNUNET_MQ_handler_end () |
240 | }; | 240 | }; |
241 | 241 | ||
242 | |||
243 | sap[0] = (struct sockaddr *) &sa; | 242 | sap[0] = (struct sockaddr *) &sa; |
244 | slens[0] = sizeof (sa); | 243 | slens[0] = sizeof (sa); |
245 | sap[1] = NULL; | 244 | sap[1] = NULL; |