diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-12-20 12:02:13 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-12-20 12:02:13 +0100 |
commit | b5e9bdbdde10102023074d57086975b354019a22 (patch) | |
tree | a892d19fdd0cd7bf6068514d4728536e5216e976 /src/util | |
parent | e60f76eab3447fba5982d30f0e4e7ebecf4edc0b (diff) | |
download | gnunet-b5e9bdbdde10102023074d57086975b354019a22.tar.gz gnunet-b5e9bdbdde10102023074d57086975b354019a22.zip |
fix sendto bug
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/network.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/src/util/network.c b/src/util/network.c index b18030fcd..c4adefb8f 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -757,21 +757,17 @@ GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle *desc, | |||
757 | struct sockaddr *src_addr, | 757 | struct sockaddr *src_addr, |
758 | socklen_t *addrlen) | 758 | socklen_t *addrlen) |
759 | { | 759 | { |
760 | int ret; | 760 | int flags = 0; |
761 | int flags; | ||
762 | |||
763 | flags = 0; | ||
764 | 761 | ||
765 | #ifdef MSG_DONTWAIT | 762 | #ifdef MSG_DONTWAIT |
766 | flags |= MSG_DONTWAIT; | 763 | flags |= MSG_DONTWAIT; |
767 | #endif | 764 | #endif |
768 | ret = recvfrom (desc->fd, | 765 | return recvfrom (desc->fd, |
769 | buffer, | 766 | buffer, |
770 | length, | 767 | length, |
771 | flags, | 768 | flags, |
772 | src_addr, | 769 | src_addr, |
773 | addrlen); | 770 | addrlen); |
774 | return ret; | ||
775 | } | 771 | } |
776 | 772 | ||
777 | 773 | ||
@@ -853,10 +849,7 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc, | |||
853 | const struct sockaddr *dest_addr, | 849 | const struct sockaddr *dest_addr, |
854 | socklen_t dest_len) | 850 | socklen_t dest_len) |
855 | { | 851 | { |
856 | int ret; | 852 | int flags = 0; |
857 | int flags; | ||
858 | |||
859 | flags = 0; | ||
860 | 853 | ||
861 | #ifdef MSG_DONTWAIT | 854 | #ifdef MSG_DONTWAIT |
862 | flags |= MSG_DONTWAIT; | 855 | flags |= MSG_DONTWAIT; |
@@ -864,8 +857,12 @@ GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc, | |||
864 | #ifdef MSG_NOSIGNAL | 857 | #ifdef MSG_NOSIGNAL |
865 | flags |= MSG_NOSIGNAL; | 858 | flags |= MSG_NOSIGNAL; |
866 | #endif | 859 | #endif |
867 | ret = sendto (desc->fd, message, length, flags, dest_addr, dest_len); | 860 | return sendto (desc->fd, |
868 | return ret; | 861 | message, |
862 | length, | ||
863 | flags, | ||
864 | dest_addr, | ||
865 | dest_len); | ||
869 | } | 866 | } |
870 | 867 | ||
871 | 868 | ||