diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-11-29 20:47:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-11-29 20:47:18 +0000 |
commit | 71ea5bd2d05058008e604ffd42993be9c7250e04 (patch) | |
tree | a5074671ddfaa9d1621a4182fc95a91a98b3d536 /src/core | |
parent | b335777fd435142c16eb05e86c8a64a4b1a45447 (diff) | |
download | gnunet-71ea5bd2d05058008e604ffd42993be9c7250e04.tar.gz gnunet-71ea5bd2d05058008e604ffd42993be9c7250e04.zip |
-fixing indentation
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/core_api.c | 4 | ||||
-rw-r--r-- | src/core/gnunet-core-list-connections.c | 31 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 26 | ||||
-rw-r--r-- | src/core/gnunet-service-core_neighbours.c | 8 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 10 | ||||
-rw-r--r-- | src/core/test_core_quota_compliance.c | 16 |
6 files changed, 45 insertions, 50 deletions
diff --git a/src/core/core_api.c b/src/core/core_api.c index a279874d7..281a851e0 100644 --- a/src/core/core_api.c +++ b/src/core/core_api.c | |||
@@ -1424,8 +1424,8 @@ GNUNET_CORE_notify_transmit_ready (struct GNUNET_CORE_Handle *handle, int cork, | |||
1424 | } | 1424 | } |
1425 | 1425 | ||
1426 | /* Order entries by deadline, but SKIP 'HEAD' (as we may have transmitted | 1426 | /* Order entries by deadline, but SKIP 'HEAD' (as we may have transmitted |
1427 | that request already or might even already be approved to transmit that | 1427 | * that request already or might even already be approved to transmit that |
1428 | message to core) */ | 1428 | * message to core) */ |
1429 | pos = pr->pending_head; | 1429 | pos = pr->pending_head; |
1430 | if (pos != NULL) | 1430 | if (pos != NULL) |
1431 | pos = pos->next; /* skip head */ | 1431 | pos = pos->next; /* skip head */ |
diff --git a/src/core/gnunet-core-list-connections.c b/src/core/gnunet-core-list-connections.c index e0d95d0f8..c93f50981 100644 --- a/src/core/gnunet-core-list-connections.c +++ b/src/core/gnunet-core-list-connections.c | |||
@@ -98,11 +98,11 @@ dump_pc (struct PrintContext *pc) | |||
98 | * @param address NULL on error, otherwise 0-terminated printable UTF-8 string | 98 | * @param address NULL on error, otherwise 0-terminated printable UTF-8 string |
99 | */ | 99 | */ |
100 | static void | 100 | static void |
101 | process_resolved_address (void *cls, | 101 | process_resolved_address (void *cls, const struct GNUNET_PeerIdentity *peer, |
102 | const struct GNUNET_PeerIdentity *peer, | 102 | const struct GNUNET_HELLO_Address *address) |
103 | const struct GNUNET_HELLO_Address *address) | ||
104 | { | 103 | { |
105 | struct PrintContext *pc = cls; | 104 | struct PrintContext *pc = cls; |
105 | |||
106 | // struct AddressStringList *new_address; | 106 | // struct AddressStringList *new_address; |
107 | 107 | ||
108 | if (address == NULL) | 108 | if (address == NULL) |
@@ -111,16 +111,16 @@ process_resolved_address (void *cls, | |||
111 | return; | 111 | return; |
112 | } | 112 | } |
113 | 113 | ||
114 | /* This does exactly the same as gnunet-transport -i !*/ | 114 | /* This does exactly the same as gnunet-transport -i ! */ |
115 | /* | 115 | /* |
116 | new_address = GNUNET_malloc (sizeof (struct AddressStringList)); | 116 | * new_address = GNUNET_malloc (sizeof (struct AddressStringList)); |
117 | #if VERBOSE | 117 | * #if VERBOSE |
118 | fprintf (stderr, "Received address %s\n", address); | 118 | * fprintf (stderr, "Received address %s\n", address); |
119 | #endif | 119 | * #endif |
120 | 120 | * | |
121 | new_address->address_string = GNUNET_strdup ("FIXME"); | 121 | * new_address->address_string = GNUNET_strdup ("FIXME"); |
122 | GNUNET_CONTAINER_DLL_insert (pc->address_list_head, pc->address_list_tail, | 122 | * GNUNET_CONTAINER_DLL_insert (pc->address_list_head, pc->address_list_tail, |
123 | new_address); | 123 | * new_address); |
124 | */ | 124 | */ |
125 | } | 125 | } |
126 | 126 | ||
@@ -143,12 +143,9 @@ connected_peer_callback (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
143 | #endif | 143 | #endif |
144 | pc = GNUNET_malloc (sizeof (struct PrintContext)); | 144 | pc = GNUNET_malloc (sizeof (struct PrintContext)); |
145 | pc->peer = *peer; | 145 | pc->peer = *peer; |
146 | GNUNET_TRANSPORT_peer_get_active_addresses (cfg, | 146 | GNUNET_TRANSPORT_peer_get_active_addresses (cfg, peer, GNUNET_YES, |
147 | peer, | ||
148 | GNUNET_YES, | ||
149 | GNUNET_TIME_UNIT_MINUTES, | 147 | GNUNET_TIME_UNIT_MINUTES, |
150 | &process_resolved_address, | 148 | &process_resolved_address, pc); |
151 | pc); | ||
152 | } | 149 | } |
153 | #if VERBOSE | 150 | #if VERBOSE |
154 | else | 151 | else |
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 5448d5d0f..4098b45b1 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -343,13 +343,14 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client, | |||
343 | "Client asked for transmission to `%s'\n", | 343 | "Client asked for transmission to `%s'\n", |
344 | GNUNET_i2s (&req->peer)); | 344 | GNUNET_i2s (&req->peer)); |
345 | #endif | 345 | #endif |
346 | is_loopback = (0 == | 346 | is_loopback = |
347 | memcmp (&req->peer, &GSC_my_identity, | 347 | (0 == |
348 | sizeof (struct GNUNET_PeerIdentity))); | 348 | memcmp (&req->peer, &GSC_my_identity, |
349 | if ( (! is_loopback) && | 349 | sizeof (struct GNUNET_PeerIdentity))); |
350 | (GNUNET_YES != | 350 | if ((!is_loopback) && |
351 | GNUNET_CONTAINER_multihashmap_contains (c->connectmap, | 351 | (GNUNET_YES != |
352 | &req->peer.hashPubKey)) ) | 352 | GNUNET_CONTAINER_multihashmap_contains (c->connectmap, |
353 | &req->peer.hashPubKey))) | ||
353 | { | 354 | { |
354 | /* neighbour must have disconnected since request was issued, | 355 | /* neighbour must have disconnected since request was issued, |
355 | * ignore (client will realize it once it processes the | 356 | * ignore (client will realize it once it processes the |
@@ -390,8 +391,8 @@ handle_client_send_request (void *cls, struct GNUNET_SERVER_Client *client, | |||
390 | GSC_CLIENTS_solicit_request (car); | 391 | GSC_CLIENTS_solicit_request (car); |
391 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 392 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
392 | return; | 393 | return; |
393 | } | 394 | } |
394 | GSC_SESSIONS_queue_request (car); | 395 | GSC_SESSIONS_queue_request (car); |
395 | GNUNET_SERVER_receive_done (client, GNUNET_OK); | 396 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
396 | } | 397 | } |
397 | 398 | ||
@@ -610,13 +611,12 @@ GSC_CLIENTS_solicit_request (struct GSC_ClientActiveRequest *car) | |||
610 | c = car->client_handle; | 611 | c = car->client_handle; |
611 | if (GNUNET_YES != | 612 | if (GNUNET_YES != |
612 | GNUNET_CONTAINER_multihashmap_contains (c->connectmap, | 613 | GNUNET_CONTAINER_multihashmap_contains (c->connectmap, |
613 | &car-> | 614 | &car->target.hashPubKey)) |
614 | target.hashPubKey)) | ||
615 | { | 615 | { |
616 | /* connection has gone down since, drop request */ | 616 | /* connection has gone down since, drop request */ |
617 | GNUNET_assert (0 != | 617 | GNUNET_assert (0 != |
618 | memcmp (&car->target, &GSC_my_identity, | 618 | memcmp (&car->target, &GSC_my_identity, |
619 | sizeof (struct GNUNET_PeerIdentity))); | 619 | sizeof (struct GNUNET_PeerIdentity))); |
620 | GSC_SESSIONS_dequeue_request (car); | 620 | GSC_SESSIONS_dequeue_request (car); |
621 | GSC_CLIENTS_reject_request (car); | 621 | GSC_CLIENTS_reject_request (car); |
622 | return; | 622 | return; |
diff --git a/src/core/gnunet-service-core_neighbours.c b/src/core/gnunet-service-core_neighbours.c index 0e292fbd1..6c696ce84 100644 --- a/src/core/gnunet-service-core_neighbours.c +++ b/src/core/gnunet-service-core_neighbours.c | |||
@@ -427,10 +427,10 @@ handle_transport_receive (void *cls, const struct GNUNET_PeerIdentity *peer, | |||
427 | break; | 427 | break; |
428 | default: | 428 | default: |
429 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 429 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
430 | _("Unsupported message of type %u (%u bytes) received from peer `%s'\n"), | 430 | _ |
431 | (unsigned int) type, | 431 | ("Unsupported message of type %u (%u bytes) received from peer `%s'\n"), |
432 | (unsigned int) ntohs (message->size), | 432 | (unsigned int) type, (unsigned int) ntohs (message->size), |
433 | GNUNET_i2s (peer)); | 433 | GNUNET_i2s (peer)); |
434 | return; | 434 | return; |
435 | } | 435 | } |
436 | } | 436 | } |
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index 219272809..1f697cf16 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -172,7 +172,7 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
172 | struct Session *session; | 172 | struct Session *session; |
173 | struct GSC_ClientActiveRequest *car; | 173 | struct GSC_ClientActiveRequest *car; |
174 | struct SessionMessageEntry *sme; | 174 | struct SessionMessageEntry *sme; |
175 | 175 | ||
176 | session = find_session (pid); | 176 | session = find_session (pid); |
177 | if (NULL == session) | 177 | if (NULL == session) |
178 | return; | 178 | return; |
@@ -193,9 +193,7 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
193 | } | 193 | } |
194 | while (NULL != (sme = session->sme_head)) | 194 | while (NULL != (sme = session->sme_head)) |
195 | { | 195 | { |
196 | GNUNET_CONTAINER_DLL_remove (session->sme_head, | 196 | GNUNET_CONTAINER_DLL_remove (session->sme_head, session->sme_tail, sme); |
197 | session->sme_tail, | ||
198 | sme); | ||
199 | GNUNET_free (sme); | 197 | GNUNET_free (sme); |
200 | } | 198 | } |
201 | GNUNET_SCHEDULER_cancel (session->typemap_task); | 199 | GNUNET_SCHEDULER_cancel (session->typemap_task); |
@@ -347,7 +345,7 @@ GSC_SESSIONS_queue_request (struct GSC_ClientActiveRequest *car) | |||
347 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 345 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
348 | "Dropped client request for transmission (am disconnected)\n"); | 346 | "Dropped client request for transmission (am disconnected)\n"); |
349 | #endif | 347 | #endif |
350 | GNUNET_break (0); /* should have been rejected earlier */ | 348 | GNUNET_break (0); /* should have been rejected earlier */ |
351 | GSC_CLIENTS_reject_request (car); | 349 | GSC_CLIENTS_reject_request (car); |
352 | return; | 350 | return; |
353 | } | 351 | } |
@@ -438,7 +436,7 @@ solicit_messages (struct Session *session) | |||
438 | discard_expired_requests (session); | 436 | discard_expired_requests (session); |
439 | so_size = 0; | 437 | so_size = 0; |
440 | nxt = session->active_client_request_head; | 438 | nxt = session->active_client_request_head; |
441 | while (NULL != (car = nxt) ) | 439 | while (NULL != (car = nxt)) |
442 | { | 440 | { |
443 | nxt = car->next; | 441 | nxt = car->next; |
444 | if (so_size + car->msize > GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE) | 442 | if (so_size + car->msize > GNUNET_CONSTANTS_MAX_ENCRYPTED_MESSAGE_SIZE) |
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c index 59305725a..adfa93f1f 100644 --- a/src/core/test_core_quota_compliance.c +++ b/src/core/test_core_quota_compliance.c | |||
@@ -630,20 +630,20 @@ run (void *cls, char *const *args, const char *cfgfile, | |||
630 | GNUNET_assert (test != -1); | 630 | GNUNET_assert (test != -1); |
631 | GNUNET_assert (GNUNET_SYSERR != | 631 | GNUNET_assert (GNUNET_SYSERR != |
632 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", | 632 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", |
633 | "WAN_QUOTA_IN", | 633 | "WAN_QUOTA_IN", |
634 | ¤t_quota_p1_in)); | 634 | ¤t_quota_p1_in)); |
635 | GNUNET_assert (GNUNET_SYSERR != | 635 | GNUNET_assert (GNUNET_SYSERR != |
636 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", | 636 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", |
637 | "WAN_QUOTA_IN", | 637 | "WAN_QUOTA_IN", |
638 | ¤t_quota_p2_in)); | 638 | ¤t_quota_p2_in)); |
639 | GNUNET_assert (GNUNET_SYSERR != | 639 | GNUNET_assert (GNUNET_SYSERR != |
640 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", | 640 | GNUNET_CONFIGURATION_get_value_size (p1.cfg, "ATS", |
641 | "WAN_QUOTA_OUT", | 641 | "WAN_QUOTA_OUT", |
642 | ¤t_quota_p1_out)); | 642 | ¤t_quota_p1_out)); |
643 | GNUNET_assert (GNUNET_SYSERR != | 643 | GNUNET_assert (GNUNET_SYSERR != |
644 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", | 644 | GNUNET_CONFIGURATION_get_value_size (p2.cfg, "ATS", |
645 | "WAN_QUOTA_OUT", | 645 | "WAN_QUOTA_OUT", |
646 | ¤t_quota_p2_out)); | 646 | ¤t_quota_p2_out)); |
647 | 647 | ||
648 | p1.ch = | 648 | p1.ch = |
649 | GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify, | 649 | GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify, |