diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-13 20:37:51 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-13 20:37:51 +0000 |
commit | d48352bb16b9cdf8b397d4b0a2154271f034edfe (patch) | |
tree | de7843ffd23cabb4b3f18a4a4898999011fdb5cc /src/core/gnunet-service-core_kx.c | |
parent | 8723949c5796c40fe262b4843b4838dc0e67ae5c (diff) | |
download | gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.tar.gz gnunet-d48352bb16b9cdf8b397d4b0a2154271f034edfe.zip |
-style fixes
Diffstat (limited to 'src/core/gnunet-service-core_kx.c')
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 31cd14f85..a4e964312 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -773,7 +773,8 @@ GSC_KX_stop (struct GSC_KeyExchangeInfo *kx) | |||
773 | static void | 773 | static void |
774 | send_ping (struct GSC_KeyExchangeInfo *kx) | 774 | send_ping (struct GSC_KeyExchangeInfo *kx) |
775 | { | 775 | { |
776 | GSC_NEIGHBOURS_transmit (&kx->peer, &kx->ping.header, | 776 | GSC_NEIGHBOURS_transmit (&kx->peer, |
777 | &kx->ping.header, | ||
777 | MIN_PING_FREQUENCY); | 778 | MIN_PING_FREQUENCY); |
778 | } | 779 | } |
779 | 780 | ||
@@ -1048,7 +1049,8 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx, | |||
1048 | (void *) &tp)); | 1049 | (void *) &tp)); |
1049 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), | 1050 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), |
1050 | 1, GNUNET_NO); | 1051 | 1, GNUNET_NO); |
1051 | GSC_NEIGHBOURS_transmit (&kx->peer, &tp.header, | 1052 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1053 | &tp.header, | ||
1052 | GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ ); | 1054 | GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ ); |
1053 | } | 1055 | } |
1054 | 1056 | ||
@@ -1086,7 +1088,8 @@ send_keep_alive (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1086 | gettext_noop ("# keepalive messages sent"), 1, | 1088 | gettext_noop ("# keepalive messages sent"), 1, |
1087 | GNUNET_NO); | 1089 | GNUNET_NO); |
1088 | setup_fresh_ping (kx); | 1090 | setup_fresh_ping (kx); |
1089 | GSC_NEIGHBOURS_transmit (&kx->peer, &kx->ping.header, | 1091 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1092 | &kx->ping.header, | ||
1090 | kx->set_key_retry_frequency); | 1093 | kx->set_key_retry_frequency); |
1091 | retry = | 1094 | retry = |
1092 | GNUNET_TIME_relative_max (GNUNET_TIME_relative_divide (left, 2), | 1095 | GNUNET_TIME_relative_max (GNUNET_TIME_relative_divide (left, 2), |
@@ -1277,7 +1280,8 @@ send_key (struct GSC_KeyExchangeInfo *kx) | |||
1277 | GNUNET_i2s (&kx->peer), | 1280 | GNUNET_i2s (&kx->peer), |
1278 | kx->status); | 1281 | kx->status); |
1279 | current_ekm.sender_status = htonl ((int32_t) (kx->status)); | 1282 | current_ekm.sender_status = htonl ((int32_t) (kx->status)); |
1280 | GSC_NEIGHBOURS_transmit (&kx->peer, ¤t_ekm.header, | 1283 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1284 | ¤t_ekm.header, | ||
1281 | kx->set_key_retry_frequency); | 1285 | kx->set_key_retry_frequency); |
1282 | kx->retry_set_key_task = | 1286 | kx->retry_set_key_task = |
1283 | GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency, | 1287 | GNUNET_SCHEDULER_add_delayed (kx->set_key_retry_frequency, |
@@ -1294,7 +1298,8 @@ send_key (struct GSC_KeyExchangeInfo *kx) | |||
1294 | */ | 1298 | */ |
1295 | void | 1299 | void |
1296 | GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | 1300 | GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, |
1297 | const void *payload, size_t payload_size) | 1301 | const void *payload, |
1302 | size_t payload_size) | ||
1298 | { | 1303 | { |
1299 | size_t used = payload_size + sizeof (struct EncryptedMessage); | 1304 | size_t used = payload_size + sizeof (struct EncryptedMessage); |
1300 | char pbuf[used]; /* plaintext */ | 1305 | char pbuf[used]; /* plaintext */ |
@@ -1327,7 +1332,8 @@ GSC_KX_encrypt_and_transmit (struct GSC_KeyExchangeInfo *kx, | |||
1327 | ph->iv_seed); | 1332 | ph->iv_seed); |
1328 | GNUNET_CRYPTO_hmac (&auth_key, &em->sequence_number, | 1333 | GNUNET_CRYPTO_hmac (&auth_key, &em->sequence_number, |
1329 | used - ENCRYPTED_HEADER_SIZE, &em->hmac); | 1334 | used - ENCRYPTED_HEADER_SIZE, &em->hmac); |
1330 | GSC_NEIGHBOURS_transmit (&kx->peer, &em->header, | 1335 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1336 | &em->header, | ||
1331 | GNUNET_TIME_UNIT_FOREVER_REL); | 1337 | GNUNET_TIME_UNIT_FOREVER_REL); |
1332 | } | 1338 | } |
1333 | 1339 | ||