diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-01-19 14:52:38 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-01-19 14:52:38 +0000 |
commit | b23010f5708520611bf9addf75d839414275cfb8 (patch) | |
tree | 8cdfb58da16e9e9d37ccc6792ba4c996d752d80d | |
parent | e19d8a89a750b4283e4403ead1188f4ff50414b4 (diff) | |
download | gnunet-b23010f5708520611bf9addf75d839414275cfb8.tar.gz gnunet-b23010f5708520611bf9addf75d839414275cfb8.zip |
remove debug message
-rw-r--r-- | src/util/network.c | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/src/util/network.c b/src/util/network.c index 398f2b51a..5b1fa654d 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -361,15 +361,14 @@ GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc, | |||
361 | * @param desc socket | 361 | * @param desc socket |
362 | */ | 362 | */ |
363 | unsigned int | 363 | unsigned int |
364 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle * desc) | 364 | GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle |
365 | *desc) | ||
365 | { | 366 | { |
366 | int error; | 367 | int error; |
367 | unsigned int pending; | 368 | unsigned int pending; |
368 | 369 | ||
369 | /* How much is there to be read? */ | 370 | /* How much is there to be read? */ |
370 | error = ioctl(desc->fd, FIONREAD, &pending); | 371 | error = ioctl (desc->fd, FIONREAD, &pending); |
371 | GNUNET_log_from(GNUNET_ERROR_TYPE_INFO, "udp", _ | ||
372 | ("pending is %u bytes, error is %d\n"), pending, error); | ||
373 | 372 | ||
374 | if (error == 0) | 373 | if (error == 0) |
375 | return pending; | 374 | return pending; |
@@ -389,7 +388,8 @@ GNUNET_NETWORK_socket_recvfrom_amount (const struct GNUNET_NETWORK_Handle * desc | |||
389 | ssize_t | 388 | ssize_t |
390 | GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc, | 389 | GNUNET_NETWORK_socket_recvfrom (const struct GNUNET_NETWORK_Handle * desc, |
391 | void *buffer, size_t length, | 390 | void *buffer, size_t length, |
392 | struct sockaddr *src_addr, socklen_t *addrlen) | 391 | struct sockaddr * src_addr, |
392 | socklen_t * addrlen) | ||
393 | { | 393 | { |
394 | int ret; | 394 | int ret; |
395 | int flags; | 395 | int flags; |
@@ -733,7 +733,9 @@ GNUNET_NETWORK_fdset_handle_set (struct GNUNET_NETWORK_FDSet *fds, | |||
733 | #ifdef MINGW | 733 | #ifdef MINGW |
734 | HANDLE hw; | 734 | HANDLE hw; |
735 | GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE)); | 735 | GNUNET_DISK_internal_file_handle_ (h, &hw, sizeof (HANDLE)); |
736 | GNUNET_CONTAINER_slist_add (fds->handles, GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &hw, sizeof (HANDLE)); | 736 | GNUNET_CONTAINER_slist_add (fds->handles, |
737 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, | ||
738 | &hw, sizeof (HANDLE)); | ||
737 | 739 | ||
738 | #else | 740 | #else |
739 | int fd; | 741 | int fd; |
@@ -785,20 +787,23 @@ GNUNET_NETWORK_fdset_overlap (const struct GNUNET_NETWORK_FDSet *fds1, | |||
785 | return GNUNET_YES; | 787 | return GNUNET_YES; |
786 | #ifdef MINGW | 788 | #ifdef MINGW |
787 | { | 789 | { |
788 | struct GNUNET_CONTAINER_SList_Iterator *it; | 790 | struct GNUNET_CONTAINER_SList_Iterator *it; |
789 | 791 | ||
790 | for(it = GNUNET_CONTAINER_slist_begin (fds1->handles); GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; GNUNET_CONTAINER_slist_next (it)) | 792 | for (it = GNUNET_CONTAINER_slist_begin (fds1->handles); |
791 | { | 793 | GNUNET_CONTAINER_slist_end (it) != GNUNET_YES; |
792 | HANDLE *h; | 794 | GNUNET_CONTAINER_slist_next (it)) |
793 | 795 | { | |
794 | h = GNUNET_CONTAINER_slist_get (it, NULL); | 796 | HANDLE *h; |
795 | if (GNUNET_CONTAINER_slist_contains (fds2->handles, h, sizeof (HANDLE))) | 797 | |
796 | { | 798 | h = GNUNET_CONTAINER_slist_get (it, NULL); |
797 | GNUNET_CONTAINER_slist_iter_destroy (it); | 799 | if (GNUNET_CONTAINER_slist_contains |
798 | return GNUNET_YES; | 800 | (fds2->handles, h, sizeof (HANDLE))) |
799 | } | 801 | { |
800 | } | 802 | GNUNET_CONTAINER_slist_iter_destroy (it); |
801 | GNUNET_CONTAINER_slist_iter_destroy (it); | 803 | return GNUNET_YES; |
804 | } | ||
805 | } | ||
806 | GNUNET_CONTAINER_slist_iter_destroy (it); | ||
802 | } | 807 | } |
803 | #endif | 808 | #endif |
804 | return GNUNET_NO; | 809 | return GNUNET_NO; |
@@ -907,7 +912,8 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
907 | DWORD limit; | 912 | DWORD limit; |
908 | fd_set sock_read, sock_write, sock_except; | 913 | fd_set sock_read, sock_write, sock_except; |
909 | fd_set aread, awrite, aexcept; | 914 | fd_set aread, awrite, aexcept; |
910 | struct GNUNET_CONTAINER_SList *handles_read, *handles_write, *handles_except; | 915 | struct GNUNET_CONTAINER_SList *handles_read, *handles_write, |
916 | *handles_except; | ||
911 | 917 | ||
912 | int i; | 918 | int i; |
913 | struct timeval tvslice; | 919 | struct timeval tvslice; |
@@ -1014,8 +1020,8 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
1014 | 1020 | ||
1015 | { | 1021 | { |
1016 | GNUNET_CONTAINER_slist_add (handles_read, | 1022 | GNUNET_CONTAINER_slist_add (handles_read, |
1017 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &h, | 1023 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
1018 | sizeof (HANDLE)); | 1024 | &h, sizeof (HANDLE)); |
1019 | retcode++; | 1025 | retcode++; |
1020 | } | 1026 | } |
1021 | } | 1027 | } |
@@ -1039,8 +1045,8 @@ GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds, | |||
1039 | 1045 | ||
1040 | { | 1046 | { |
1041 | GNUNET_CONTAINER_slist_add (handles_except, | 1047 | GNUNET_CONTAINER_slist_add (handles_except, |
1042 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, &h, | 1048 | GNUNET_CONTAINER_SLIST_DISPOSITION_TRANSIENT, |
1043 | sizeof (HANDLE)); | 1049 | &h, sizeof (HANDLE)); |
1044 | retcode++; | 1050 | retcode++; |
1045 | } | 1051 | } |
1046 | } | 1052 | } |