diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-08-05 09:36:02 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-08-05 09:36:02 +0000 |
commit | fb567582ca24ac7450336782365e86a177d8a472 (patch) | |
tree | 053b29071811155a328bf8dec1f1c922997fe02f /src/transport/transport_api_peer_address_lookup.c | |
parent | ec057166095a225d45be16e66671e0f7f74cbef2 (diff) | |
download | gnunet-fb567582ca24ac7450336782365e86a177d8a472.tar.gz gnunet-fb567582ca24ac7450336782365e86a177d8a472.zip |
more refactoring
Diffstat (limited to 'src/transport/transport_api_peer_address_lookup.c')
-rw-r--r-- | src/transport/transport_api_peer_address_lookup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/transport/transport_api_peer_address_lookup.c b/src/transport/transport_api_peer_address_lookup.c index 2da4b6c69..c63856d4a 100644 --- a/src/transport/transport_api_peer_address_lookup.c +++ b/src/transport/transport_api_peer_address_lookup.c | |||
@@ -134,7 +134,6 @@ GNUNET_TRANSPORT_peer_address_lookup (const struct GNUNET_CONFIGURATION_Handle * | |||
134 | void *peer_address_callback_cls) | 134 | void *peer_address_callback_cls) |
135 | { | 135 | { |
136 | struct PeerAddressLookupMessage msg; | 136 | struct PeerAddressLookupMessage msg; |
137 | struct GNUNET_TIME_Absolute abs_timeout; | ||
138 | struct AddressLookupCtx *peer_address_lookup_cb; | 137 | struct AddressLookupCtx *peer_address_lookup_cb; |
139 | struct GNUNET_CLIENT_Connection *client; | 138 | struct GNUNET_CLIENT_Connection *client; |
140 | 139 | ||
@@ -144,16 +143,14 @@ GNUNET_TRANSPORT_peer_address_lookup (const struct GNUNET_CONFIGURATION_Handle * | |||
144 | peer_address_callback (peer_address_callback_cls, NULL); | 143 | peer_address_callback (peer_address_callback_cls, NULL); |
145 | return; | 144 | return; |
146 | } | 145 | } |
147 | abs_timeout = GNUNET_TIME_relative_to_absolute (timeout); | ||
148 | |||
149 | msg.header.size = htons (sizeof(struct PeerAddressLookupMessage)); | 146 | msg.header.size = htons (sizeof(struct PeerAddressLookupMessage)); |
150 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP); | 147 | msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP); |
151 | msg.timeout = GNUNET_TIME_absolute_hton (abs_timeout); | 148 | msg.timeout = GNUNET_TIME_relative_hton (timeout); |
152 | memcpy(&msg.peer, peer, sizeof(struct GNUNET_PeerIdentity)); | 149 | memcpy(&msg.peer, peer, sizeof(struct GNUNET_PeerIdentity)); |
153 | peer_address_lookup_cb = GNUNET_malloc (sizeof (struct AddressLookupCtx)); | 150 | peer_address_lookup_cb = GNUNET_malloc (sizeof (struct AddressLookupCtx)); |
154 | peer_address_lookup_cb->cb = peer_address_callback; | 151 | peer_address_lookup_cb->cb = peer_address_callback; |
155 | peer_address_lookup_cb->cb_cls = peer_address_callback_cls; | 152 | peer_address_lookup_cb->cb_cls = peer_address_callback_cls; |
156 | peer_address_lookup_cb->timeout = abs_timeout; | 153 | peer_address_lookup_cb->timeout = GNUNET_TIME_relative_to_absolute (timeout); |
157 | peer_address_lookup_cb->client = client; | 154 | peer_address_lookup_cb->client = client; |
158 | GNUNET_assert (GNUNET_OK == | 155 | GNUNET_assert (GNUNET_OK == |
159 | GNUNET_CLIENT_transmit_and_get_response (client, | 156 | GNUNET_CLIENT_transmit_and_get_response (client, |