diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-11-15 21:20:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-11-15 21:20:18 +0000 |
commit | e38fa2748c5f85427959bc61f112582d72d856de (patch) | |
tree | e1cd322c5bccc01c6460b959a186586312807d14 /src/conversation/conversation_api.c | |
parent | b3a34c936616c5c0339463449934fe045ff367e8 (diff) | |
download | gnunet-e38fa2748c5f85427959bc61f112582d72d856de.tar.gz gnunet-e38fa2748c5f85427959bc61f112582d72d856de.zip |
-reworking connection to allow multiple waiting/active connections per line
Diffstat (limited to 'src/conversation/conversation_api.c')
-rw-r--r-- | src/conversation/conversation_api.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/conversation/conversation_api.c b/src/conversation/conversation_api.c index 9dfc6e913..1c71217bd 100644 --- a/src/conversation/conversation_api.c +++ b/src/conversation/conversation_api.c | |||
@@ -624,6 +624,7 @@ reconnect_phone (struct GNUNET_CONVERSATION_Phone *phone) | |||
624 | * @param ego ego to use for name resolution (when determining caller ID) | 624 | * @param ego ego to use for name resolution (when determining caller ID) |
625 | * @param event_handler how to notify the owner of the phone about events | 625 | * @param event_handler how to notify the owner of the phone about events |
626 | * @param event_handler_cls closure for @a event_handler | 626 | * @param event_handler_cls closure for @a event_handler |
627 | * @return NULL on error (no valid line configured) | ||
627 | */ | 628 | */ |
628 | struct GNUNET_CONVERSATION_Phone * | 629 | struct GNUNET_CONVERSATION_Phone * |
629 | GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | 630 | GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg, |
@@ -640,6 +641,8 @@ GNUNET_CONVERSATION_phone_create (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
640 | "LINE", | 641 | "LINE", |
641 | &line)) | 642 | &line)) |
642 | return NULL; | 643 | return NULL; |
644 | if (line >= (1 << 31)) | ||
645 | return NULL; | ||
643 | phone = GNUNET_new (struct GNUNET_CONVERSATION_Phone); | 646 | phone = GNUNET_new (struct GNUNET_CONVERSATION_Phone); |
644 | if (GNUNET_OK != | 647 | if (GNUNET_OK != |
645 | GNUNET_CRYPTO_get_peer_identity (cfg, | 648 | GNUNET_CRYPTO_get_peer_identity (cfg, |