[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33553 - in gnunet/src: conversation include
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33553 - in gnunet/src: conversation include |
|
Date: |
Fri, 6 Jun 2014 10:57:10 +0200 |
Author: grothoff
Date: 2014-06-06 10:57:09 +0200 (Fri, 06 Jun 2014)
New Revision: 33553
Modified:
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/conversation_api_call.c
gnunet/src/conversation/gnunet-conversation.c
gnunet/src/conversation/test_conversation_api.c
gnunet/src/conversation/test_conversation_api_reject.c
gnunet/src/conversation/test_conversation_api_twocalls.c
gnunet/src/include/gnunet_conversation_service.h
Log:
-allow caller ID to differ from zone used for resolution
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2014-06-06 08:43:31 UTC (rev
33552)
+++ gnunet/src/conversation/conversation_api.c 2014-06-06 08:57:09 UTC (rev
33553)
@@ -289,7 +289,7 @@
/**
* We received a `struct ClientPhoneHangupMessage`.
*
- * @param cls the `struct GNUNET_CONVERSATION_Phone`
+ * @param cls the `struct GNUNET_CONVERSATION_Phone *`
* @param msg the message
*/
static void
Modified: gnunet/src/conversation/conversation_api_call.c
===================================================================
--- gnunet/src/conversation/conversation_api_call.c 2014-06-06 08:43:31 UTC
(rev 33552)
+++ gnunet/src/conversation/conversation_api_call.c 2014-06-06 08:57:09 UTC
(rev 33553)
@@ -96,6 +96,11 @@
struct GNUNET_IDENTITY_Ego *caller_id;
/**
+ * GNS zone to use to resolve @e callee.
+ */
+ struct GNUNET_IDENTITY_Ego *zone_id;
+
+ /**
* Target callee as a GNS address/name.
*/
char *callee;
@@ -530,7 +535,7 @@
&call_error_handler,
call);
call->state = CS_LOOKUP;
- GNUNET_IDENTITY_ego_get_public_key (call->caller_id,
+ GNUNET_IDENTITY_ego_get_public_key (call->zone_id,
&my_zone);
call->gns_lookup = GNUNET_GNS_lookup (call->gns,
call->callee,
@@ -548,6 +553,7 @@
*
* @param cfg configuration to use, specifies our phone service
* @param caller_id identity of the caller
+ * @param zone_id GNS zone to use to resolve @a callee
* @param callee GNS name of the callee (used to locate the callee's record)
* @param speaker speaker to use (will be used automatically immediately once
the
* #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated); we will
NOT generate
@@ -560,6 +566,7 @@
struct GNUNET_CONVERSATION_Call *
GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_IDENTITY_Ego *caller_id,
+ struct GNUNET_IDENTITY_Ego *zone_id,
const char *callee,
struct GNUNET_SPEAKER_Handle *speaker,
struct GNUNET_MICROPHONE_Handle *mic,
@@ -571,6 +578,7 @@
call = GNUNET_new (struct GNUNET_CONVERSATION_Call);
call->cfg = cfg;
call->caller_id = caller_id;
+ call->zone_id = zone_id;
call->callee = GNUNET_strdup (callee);
call->speaker = speaker;
call->mic = mic;
Modified: gnunet/src/conversation/gnunet-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation.c 2014-06-06 08:43:31 UTC
(rev 33552)
+++ gnunet/src/conversation/gnunet-conversation.c 2014-06-06 08:57:09 UTC
(rev 33553)
@@ -558,6 +558,7 @@
GNUNET_assert (NULL == call);
call = GNUNET_CONVERSATION_call_start (cfg,
my_caller_id,
+ my_caller_id,
arg,
speaker,
mic,
Modified: gnunet/src/conversation/test_conversation_api.c
===================================================================
--- gnunet/src/conversation/test_conversation_api.c 2014-06-06 08:43:31 UTC
(rev 33552)
+++ gnunet/src/conversation/test_conversation_api.c 2014-06-06 08:57:09 UTC
(rev 33553)
@@ -458,6 +458,7 @@
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call = GNUNET_CONVERSATION_call_start (cfg,
ego,
+ ego,
gns_name,
&call_speaker,
&call_mic,
Modified: gnunet/src/conversation/test_conversation_api_reject.c
===================================================================
--- gnunet/src/conversation/test_conversation_api_reject.c 2014-06-06
08:43:31 UTC (rev 33552)
+++ gnunet/src/conversation/test_conversation_api_reject.c 2014-06-06
08:57:09 UTC (rev 33553)
@@ -291,6 +291,7 @@
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call = GNUNET_CONVERSATION_call_start (cfg,
ego,
+ ego,
gns_name,
&call_speaker,
&call_mic,
Modified: gnunet/src/conversation/test_conversation_api_twocalls.c
===================================================================
--- gnunet/src/conversation/test_conversation_api_twocalls.c 2014-06-06
08:43:31 UTC (rev 33552)
+++ gnunet/src/conversation/test_conversation_api_twocalls.c 2014-06-06
08:57:09 UTC (rev 33553)
@@ -560,6 +560,7 @@
GNUNET_GNSRECORD_pkey_to_zkey (&pub));
call1 = GNUNET_CONVERSATION_call_start (cfg,
ego,
+ ego,
gns_name,
&call1_speaker,
&call1_mic,
@@ -567,6 +568,7 @@
(void *) "call1");
call2 = GNUNET_CONVERSATION_call_start (cfg,
ego,
+ ego,
gns_name,
&call2_speaker,
&call2_mic,
Modified: gnunet/src/include/gnunet_conversation_service.h
===================================================================
--- gnunet/src/include/gnunet_conversation_service.h 2014-06-06 08:43:31 UTC
(rev 33552)
+++ gnunet/src/include/gnunet_conversation_service.h 2014-06-06 08:57:09 UTC
(rev 33553)
@@ -363,6 +363,7 @@
*
* @param cfg configuration to use, specifies our phone service
* @param caller_id identity of the caller
+ * @param zone_id GNS zone to use to resolve @a callee
* @param callee GNS name of the callee (used to locate the callee's record)
* @param speaker speaker to use (will be used automatically immediately once
the
* #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated); we will
NOT generate
@@ -376,6 +377,7 @@
struct GNUNET_CONVERSATION_Call *
GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
struct GNUNET_IDENTITY_Ego *caller_id,
+ struct GNUNET_IDENTITY_Ego *zone_id,
const char *callee,
struct GNUNET_SPEAKER_Handle *speaker,
struct GNUNET_MICROPHONE_Handle *mic,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33553 - in gnunet/src: conversation include,
gnunet <=