[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29792 - in gnunet/src: conversation include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29792 - in gnunet/src: conversation include |
Date: |
Wed, 2 Oct 2013 18:55:10 +0200 |
Author: grothoff
Date: 2013-10-02 18:55:10 +0200 (Wed, 02 Oct 2013)
New Revision: 29792
Modified:
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/gnunet-conversation.c
gnunet/src/conversation/gnunet-service-conversation.c
gnunet/src/include/gnunet_conversation_service.h
Log:
-ensure external symbols have proper prefix for conversation service
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2013-10-02 16:51:00 UTC (rev
29791)
+++ gnunet/src/conversation/conversation_api.c 2013-10-02 16:55:10 UTC (rev
29792)
@@ -257,7 +257,7 @@
_("%s has accepted your call.\n"),
GNUNET_i2s_full (&(h->call->peer)));
- h->notification_handler (NULL, h, NotificationType_CALL_ACCEPTED,
+ h->notification_handler (NULL, h,
GNUNET_CONVERSATION_NT_CALL_ACCEPTED,
&(h->call->peer));
h->call->type = CALLEE;
@@ -280,7 +280,7 @@
_("%s has terminated the call.\n"),
GNUNET_i2s_full (&(h->call->peer)));
- h->notification_handler (NULL, h, NotificationType_CALL_TERMINATED,
+ h->notification_handler (NULL, h,
GNUNET_CONVERSATION_NT_CALL_TERMINATED,
&(h->call->peer));
GNUNET_free (h->call);
h->call = NULL;
@@ -317,20 +317,20 @@
case GNUNET_MESSAGE_TYPE_CONVERSATION_SC_SERVICE_BLOCKED:
GNUNET_log (GNUNET_ERROR_TYPE_INFO, _("The service is blocked.\n"));
- h->notification_handler (NULL, h, NotificationType_SERVICE_BLOCKED,
+ h->notification_handler (NULL, h,
GNUNET_CONVERSATION_NT_SERVICE_BLOCKED,
NULL);
break;
case GNUNET_MESSAGE_TYPE_CONVERSATION_SC_PEER_NOT_CONNECTED:
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("The peer you are calling is not connected.\n"));
- h->notification_handler (NULL, h, NotificationType_NO_PEER, NULL);
+ h->notification_handler (NULL, h, GNUNET_CONVERSATION_NT_NO_PEER,
NULL);
break;
case GNUNET_MESSAGE_TYPE_CONVERSATION_SC_NO_ANSWER:
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("The peer you are calling does not answer.\n"));
- h->notification_handler (NULL, h, NotificationType_NO_ANSWER,
+ h->notification_handler (NULL, h, GNUNET_CONVERSATION_NT_NO_ANSWER,
&(h->call->peer));
break;
@@ -446,7 +446,7 @@
msg = buf;
msg->header.size = htons (msg_size);
msg->header.type = htons
(GNUNET_MESSAGE_TYPE_CONVERSATION_CS_SESSION_REJECT);
- msg->reason = htons (REJECT_REASON_NOT_WANTED);
+ msg->reason = htons (GNUNET_CONVERSATION_REJECT_REASON_NOT_WANTED);
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_
@@ -596,7 +596,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Lookup failed\n");
handle->notification_handler (NULL, handle,
- NotificationType_NO_PEER,
+ GNUNET_CONVERSATION_NT_NO_PEER,
NULL);
}
@@ -726,7 +726,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
_("`%s' is not a valid public key\n"),
callee);
- h->notification_handler (NULL, h, NotificationType_NO_PEER, NULL);
+ h->notification_handler (NULL, h, GNUNET_CONVERSATION_NT_NO_PEER, NULL);
return;
}
initiate_call (h, peer);
Modified: gnunet/src/conversation/gnunet-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation.c 2013-10-02 16:51:00 UTC
(rev 29791)
+++ gnunet/src/conversation/gnunet-conversation.c 2013-10-02 16:55:10 UTC
(rev 29792)
@@ -112,35 +112,35 @@
{
switch (type)
{
- case NotificationType_SERVICE_BLOCKED:
+ case GNUNET_CONVERSATION_NT_SERVICE_BLOCKED:
FPRINTF (stdout, _("The service is already in use. Try again later."));
break;
- case NotificationType_NO_PEER:
+ case GNUNET_CONVERSATION_NT_NO_PEER:
FPRINTF (stdout, _("The Peer you were calling is no correct peer.\n"));
break;
- case NotificationType_NO_ANSWER:
+ case GNUNET_CONVERSATION_NT_NO_ANSWER:
FPRINTF (stdout, _("Peer %s did not answer your call.\n"),
GNUNET_i2s_full (peer));
break;
- case NotificationType_AVAILABLE_AGAIN:
+ case GNUNET_CONVERSATION_NT_AVAILABLE_AGAIN:
FPRINTF (stdout, _("Peer %s is now available.\n"),
GNUNET_i2s_full (peer));
break;
- case NotificationType_CALL_ACCEPTED:
+ case GNUNET_CONVERSATION_NT_CALL_ACCEPTED:
FPRINTF (stdout, _("Peer %s has accepted your call.\n"),
GNUNET_i2s_full (peer));
break;
- case NotificationType_CALL_TERMINATED:
+ case GNUNET_CONVERSATION_NT_CALL_TERMINATED:
FPRINTF (stdout, _("Peer %s has terminated the call.\n"),
GNUNET_i2s_full (peer));
break;
Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c 2013-10-02
16:51:00 UTC (rev 29791)
+++ gnunet/src/conversation/gnunet-service-conversation.c 2013-10-02
16:55:10 UTC (rev 29792)
@@ -477,7 +477,7 @@
if (NULL == cls)
{
- msg->reason = htons (REJECT_REASON_NOT_AVAILABLE);
+ msg->reason = htons (GNUNET_CONVERSATION_REJECT_REASON_NOT_AVAILABLE);
}
else
{
@@ -1056,7 +1056,7 @@
_
("Rejected call from %s because there is an active call"),
GNUNET_i2s_full (peer));
- reject_reason = htons (REJECT_REASON_ACTIVE_CALL);
+ reject_reason = htons (GNUNET_CONVERSATION_REJECT_REASON_ACTIVE_CALL);
// Notifying client about missed call
size_t msg_size =
@@ -1094,7 +1094,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
_("Got a call from %s while no client connected.\n"),
GNUNET_i2s_full (peer));
- reject_reason = htons (REJECT_REASON_NO_CLIENT);
+ reject_reason = htons (GNUNET_CONVERSATION_REJECT_REASON_NO_CLIENT);
// Store missed calls
struct MissedCall call;
memcpy (&(call.peer), peer, sizeof (struct GNUNET_PeerIdentity));
Modified: gnunet/src/include/gnunet_conversation_service.h
===================================================================
--- gnunet/src/include/gnunet_conversation_service.h 2013-10-02 16:51:00 UTC
(rev 29791)
+++ gnunet/src/include/gnunet_conversation_service.h 2013-10-02 16:55:10 UTC
(rev 29792)
@@ -38,27 +38,27 @@
/**
* Version of the conversation API.
*/
-#define GNUNET_conversation_VERSION 0x00000001
+#define GNUNET_CONVERSATION_VERSION 0x00000001
enum GNUNET_CONVERSATION_RejectReason
{
- REJECT_REASON_GENERIC = 0,
- REJECT_REASON_NOT_AVAILABLE,
- REJECT_REASON_NO_CLIENT,
- REJECT_REASON_ACTIVE_CALL,
- REJECT_REASON_NOT_WANTED,
- REJECT_REASON_NO_ANSWER
+ GNUNET_CONVERSATION_REJECT_REASON_GENERIC = 0,
+ GNUNET_CONVERSATION_REJECT_REASON_NOT_AVAILABLE,
+ GNUNET_CONVERSATION_REJECT_REASON_NO_CLIENT,
+ GNUNET_CONVERSATION_REJECT_REASON_ACTIVE_CALL,
+ GNUNET_CONVERSATION_REJECT_REASON_NOT_WANTED,
+ GNUNET_CONVERSATION_REJECT_REASON_NO_ANSWER
};
enum GNUNET_CONVERSATION_NotificationType
{
- NotificationType_SERVICE_BLOCKED = 0,
- NotificationType_NO_PEER,
- NotificationType_NO_ANSWER,
- NotificationType_AVAILABLE_AGAIN,
- NotificationType_CALL_ACCEPTED,
- NotificationType_CALL_TERMINATED
+ GNUNET_CONVERSATION_NT_SERVICE_BLOCKED = 0,
+ GNUNET_CONVERSATION_NT_NO_PEER,
+ GNUNET_CONVERSATION_NT_NO_ANSWER,
+ GNUNET_CONVERSATION_NT_AVAILABLE_AGAIN,
+ GNUNET_CONVERSATION_NT_CALL_ACCEPTED,
+ GNUNET_CONVERSATION_NT_CALL_TERMINATED
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29792 - in gnunet/src: conversation include,
gnunet <=