diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-16 18:48:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-16 18:48:40 +0000 |
commit | 942c00a499e9fd77a7573de622d169f362b08abd (patch) | |
tree | ad568654df2e9dda3c9427d834f6f573d9d883ce /src/conversation/gnunet-conversation.c | |
parent | 16d4890cc9745833cd1542d5ec4391b7e4f87c71 (diff) | |
download | gnunet-942c00a499e9fd77a7573de622d169f362b08abd.tar.gz gnunet-942c00a499e9fd77a7573de622d169f362b08abd.zip |
-fix missing endianess conversions
Diffstat (limited to 'src/conversation/gnunet-conversation.c')
-rw-r--r-- | src/conversation/gnunet-conversation.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 07cb8ac44..2ea3d77cb 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -332,6 +332,7 @@ start_phone () | |||
332 | phone_state = PS_LOOKUP_EGO; | 332 | phone_state = PS_LOOKUP_EGO; |
333 | return; | 333 | return; |
334 | } | 334 | } |
335 | GNUNET_assert (NULL == phone); | ||
335 | phone = GNUNET_CONVERSATION_phone_create (cfg, | 336 | phone = GNUNET_CONVERSATION_phone_create (cfg, |
336 | caller_id, | 337 | caller_id, |
337 | &phone_event_handler, NULL); | 338 | &phone_event_handler, NULL); |
@@ -374,10 +375,9 @@ call_event_handler (void *cls, | |||
374 | { | 375 | { |
375 | case GNUNET_CONVERSATION_EC_CALL_RINGING: | 376 | case GNUNET_CONVERSATION_EC_CALL_RINGING: |
376 | GNUNET_break (CS_RESOLVING == call_state); | 377 | GNUNET_break (CS_RESOLVING == call_state); |
377 | if (verbose) | 378 | FPRINTF (stdout, |
378 | FPRINTF (stdout, | 379 | _("Resolved address of `%s'. Now ringing other party.\n"), |
379 | "%s", | 380 | peer_name); |
380 | _("Resolved address. Now ringing other party.\n")); | ||
381 | call_state = CS_RINGING; | 381 | call_state = CS_RINGING; |
382 | break; | 382 | break; |
383 | case GNUNET_CONVERSATION_EC_CALL_PICKED_UP: | 383 | case GNUNET_CONVERSATION_EC_CALL_PICKED_UP: |
@@ -524,6 +524,7 @@ do_call (const char *arg) | |||
524 | GNUNET_free_non_null (peer_name); | 524 | GNUNET_free_non_null (peer_name); |
525 | peer_name = GNUNET_strdup (arg); | 525 | peer_name = GNUNET_strdup (arg); |
526 | call_state = CS_RESOLVING; | 526 | call_state = CS_RESOLVING; |
527 | GNUNET_assert (NULL == call); | ||
527 | call = GNUNET_CONVERSATION_call_start (cfg, | 528 | call = GNUNET_CONVERSATION_call_start (cfg, |
528 | caller_id, | 529 | caller_id, |
529 | arg, | 530 | arg, |
@@ -1011,8 +1012,6 @@ do_stop_task (void *cls, | |||
1011 | mic = NULL; | 1012 | mic = NULL; |
1012 | GNUNET_free (ego_name); | 1013 | GNUNET_free (ego_name); |
1013 | ego_name = NULL; | 1014 | ego_name = NULL; |
1014 | GNUNET_CONFIGURATION_destroy (cfg); | ||
1015 | cfg = NULL; | ||
1016 | GNUNET_free_non_null (peer_name); | 1015 | GNUNET_free_non_null (peer_name); |
1017 | phone_state = PS_ERROR; | 1016 | phone_state = PS_ERROR; |
1018 | } | 1017 | } |
@@ -1175,6 +1174,11 @@ main (int argc, char *const *argv) | |||
1175 | gettext_noop ("Enables having a conversation with other GNUnet users."), | 1174 | gettext_noop ("Enables having a conversation with other GNUnet users."), |
1176 | options, &run, NULL); | 1175 | options, &run, NULL); |
1177 | GNUNET_free ((void *) argv); | 1176 | GNUNET_free ((void *) argv); |
1177 | if (NULL != cfg) | ||
1178 | { | ||
1179 | GNUNET_CONFIGURATION_destroy (cfg); | ||
1180 | cfg = NULL; | ||
1181 | } | ||
1178 | return (GNUNET_OK == ret) ? 0 : 1; | 1182 | return (GNUNET_OK == ret) ? 0 : 1; |
1179 | } | 1183 | } |
1180 | 1184 | ||