diff options
-rw-r--r-- | src/gns/gnunet-dns2gns.c | 11 | ||||
-rw-r--r-- | src/include/gnunet_network_lib.h | 2 | ||||
-rw-r--r-- | src/util/network.c | 8 |
3 files changed, 12 insertions, 9 deletions
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c index 73d5eab6c..f58303789 100644 --- a/src/gns/gnunet-dns2gns.c +++ b/src/gns/gnunet-dns2gns.c | |||
@@ -533,17 +533,20 @@ read_dns4 (void *cls) | |||
533 | return; /* read error!? */ | 533 | return; /* read error!? */ |
534 | } | 534 | } |
535 | { | 535 | { |
536 | char buf[size]; | 536 | char buf[size + 1]; |
537 | 537 | ||
538 | addrlen = sizeof (v4); | 538 | addrlen = sizeof (v4); |
539 | GNUNET_break (size == | 539 | GNUNET_break (size == |
540 | GNUNET_NETWORK_socket_recvfrom (listen_socket4, | 540 | GNUNET_NETWORK_socket_recvfrom (listen_socket4, |
541 | buf, | 541 | buf, |
542 | size, | 542 | size + 1, |
543 | (struct sockaddr *) &v4, | 543 | (struct sockaddr *) &v4, |
544 | &addrlen)); | 544 | &addrlen)); |
545 | handle_request (listen_socket4, &v4, addrlen, | 545 | handle_request (listen_socket4, |
546 | buf, size); | 546 | &v4, |
547 | addrlen, | ||
548 | buf, | ||
549 | size); | ||
547 | } | 550 | } |
548 | } | 551 | } |
549 | 552 | ||
diff --git a/src/include/gnunet_network_lib.h b/src/include/gnunet_network_lib.h index 8064140aa..beca83807 100644 --- a/src/include/gnunet_network_lib.h +++ b/src/include/gnunet_network_lib.h | |||
@@ -244,7 +244,7 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, | |||
244 | * How much data is available to be read on this descriptor? | 244 | * How much data is available to be read on this descriptor? |
245 | * | 245 | * |
246 | * @param desc socket | 246 | * @param desc socket |
247 | * @returns #GNUNET_NO if no data is available, or on error! | 247 | * @returns #GNUNET_SYSERR if no data is available, or on error! |
248 | */ | 248 | */ |
249 | ssize_t | 249 | ssize_t |
250 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc); | 250 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc); |
diff --git a/src/util/network.c b/src/util/network.c index 5aeb0157b..67f2801c5 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -770,7 +770,7 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, | |||
770 | * How much data is available to be read on this descriptor? | 770 | * How much data is available to be read on this descriptor? |
771 | * | 771 | * |
772 | * @param desc socket | 772 | * @param desc socket |
773 | * @returns #GNUNET_NO if no data is available, or on error! | 773 | * @returns #GNUNET_SYSERR if no data is available, or on error! |
774 | */ | 774 | */ |
775 | ssize_t | 775 | ssize_t |
776 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc) | 776 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc) |
@@ -784,9 +784,9 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc) | |||
784 | error = ioctl (desc->fd, | 784 | error = ioctl (desc->fd, |
785 | FIONREAD, | 785 | FIONREAD, |
786 | &pending); | 786 | &pending); |
787 | if (error == 0) | 787 | if (0 == error) |
788 | return (ssize_t) pending; | 788 | return (ssize_t) pending; |
789 | return GNUNET_NO; | 789 | return GNUNET_SYSERR; |
790 | #else | 790 | #else |
791 | u_long pending; | 791 | u_long pending; |
792 | 792 | ||
@@ -795,7 +795,7 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle *desc) | |||
795 | &pending); | 795 | &pending); |
796 | if (error != SOCKET_ERROR) | 796 | if (error != SOCKET_ERROR) |
797 | return (ssize_t) pending; | 797 | return (ssize_t) pending; |
798 | return GNUNET_NO; | 798 | return GNUNET_SYSERR; |
799 | #endif | 799 | #endif |
800 | } | 800 | } |
801 | 801 | ||