diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-06-25 16:56:33 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-06-25 16:56:33 +0000 |
commit | d49a189d3d0b53680fb39983b346f6dfc14e6bc8 (patch) | |
tree | d546f8083efcae8a861a1b4ea3ed49219020d854 /src/transport/plugin_transport_udp.c | |
parent | 018719e628f3b8951d92d8dfb1a1771474fe8dc7 (diff) | |
download | gnunet-d49a189d3d0b53680fb39983b346f6dfc14e6bc8.tar.gz gnunet-d49a189d3d0b53680fb39983b346f6dfc14e6bc8.zip |
fixing christians overwritten changes
Diffstat (limited to 'src/transport/plugin_transport_udp.c')
-rw-r--r-- | src/transport/plugin_transport_udp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c index ee06d02de..0f74ce128 100644 --- a/src/transport/plugin_transport_udp.c +++ b/src/transport/plugin_transport_udp.c | |||
@@ -1337,7 +1337,7 @@ udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1337 | struct GNUNET_PeerIdentity *sender; | 1337 | struct GNUNET_PeerIdentity *sender; |
1338 | unsigned int buflen; | 1338 | unsigned int buflen; |
1339 | socklen_t fromlen; | 1339 | socklen_t fromlen; |
1340 | struct sockaddr addr; | 1340 | char addr[32]; |
1341 | ssize_t ret; | 1341 | ssize_t ret; |
1342 | int offset; | 1342 | int offset; |
1343 | int count; | 1343 | int count; |
@@ -1351,6 +1351,7 @@ udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1351 | const void *ca; | 1351 | const void *ca; |
1352 | size_t calen; | 1352 | size_t calen; |
1353 | 1353 | ||
1354 | |||
1354 | plugin->select_task = GNUNET_SCHEDULER_NO_TASK; | 1355 | plugin->select_task = GNUNET_SCHEDULER_NO_TASK; |
1355 | 1356 | ||
1356 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) | 1357 | if (tc->reason == GNUNET_SCHEDULER_REASON_SHUTDOWN) |
@@ -1369,7 +1370,7 @@ udp_plugin_select (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1369 | memset (&addr, 0, sizeof(addr)); | 1370 | memset (&addr, 0, sizeof(addr)); |
1370 | ret = | 1371 | ret = |
1371 | GNUNET_NETWORK_socket_recvfrom (udp_sock.desc, buf, buflen, | 1372 | GNUNET_NETWORK_socket_recvfrom (udp_sock.desc, buf, buflen, |
1372 | &addr, &fromlen); | 1373 | (struct sockaddr *)&addr, &fromlen); |
1373 | 1374 | ||
1374 | if (fromlen == sizeof (struct sockaddr_in)) | 1375 | if (fromlen == sizeof (struct sockaddr_in)) |
1375 | { | 1376 | { |