diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2014-01-31 11:58:13 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2014-01-31 11:58:13 +0000 |
commit | 7a2cc6b993a9d12ef2876e2fd7eb48a4fa50a525 (patch) | |
tree | 3d5284d5450adc8f7463a89be11f5327000adcce /src | |
parent | 69edde0c2a0258ce3e543b974537f20850d74530 (diff) | |
download | gnunet-7a2cc6b993a9d12ef2876e2fd7eb48a4fa50a525.tar.gz gnunet-7a2cc6b993a9d12ef2876e2fd7eb48a4fa50a525.zip |
Revert #32132.
Diffstat (limited to 'src')
-rw-r--r-- | src/conversation/gnunet-conversation.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c index 67eccbf8a..532107aca 100644 --- a/src/conversation/gnunet-conversation.c +++ b/src/conversation/gnunet-conversation.c | |||
@@ -288,8 +288,6 @@ phone_event_handler (void *cls, | |||
288 | GNUNET_CONTAINER_DLL_remove (cl_head, | 288 | GNUNET_CONTAINER_DLL_remove (cl_head, |
289 | cl_tail, | 289 | cl_tail, |
290 | cl); | 290 | cl); |
291 | GNUNET_assert (caller_num_gen > 0); | ||
292 | caller_num_gen--; | ||
293 | GNUNET_free (cl->caller_id); | 291 | GNUNET_free (cl->caller_id); |
294 | if (cl == cl_active) | 292 | if (cl == cl_active) |
295 | { | 293 | { |
@@ -919,17 +917,11 @@ do_reject (const char *args) | |||
919 | cl); | 917 | cl); |
920 | GNUNET_free (cl->caller_id); | 918 | GNUNET_free (cl->caller_id); |
921 | GNUNET_free (cl); | 919 | GNUNET_free (cl); |
922 | GNUNET_assert (caller_num_gen > 0); | ||
923 | caller_num_gen--; | ||
924 | break; | 920 | break; |
925 | case PS_ACCEPTED: | 921 | case PS_ACCEPTED: |
926 | /* expected state, do rejection logic */ | 922 | /* expected state, do rejection logic */ |
927 | GNUNET_assert (NULL != cl_active); | 923 | GNUNET_assert (NULL != cl_active); |
928 | GNUNET_CONVERSATION_caller_hang_up (cl_active->caller); | 924 | GNUNET_CONVERSATION_caller_hang_up (cl_active->caller); |
929 | GNUNET_free (cl_active->caller_id); | ||
930 | GNUNET_free (cl_active); | ||
931 | GNUNET_assert (caller_num_gen > 0); | ||
932 | caller_num_gen--; | ||
933 | cl_active = NULL; | 925 | cl_active = NULL; |
934 | phone_state = PS_LISTEN; | 926 | phone_state = PS_LISTEN; |
935 | break; | 927 | break; |