aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabor X Toth <*@tg-x.net>2013-07-15 09:13:19 +0000
committerGabor X Toth <*@tg-x.net>2013-07-15 09:13:19 +0000
commit3b1199eb8f4a3319a13d34878a956f16c66a5b19 (patch)
tree8beb020ee1b9434cffd35b1957eb894576183a5d
parent28f55772ae328ee41265bd12da898bd04da2374b (diff)
downloadgnunet-3b1199eb8f4a3319a13d34878a956f16c66a5b19.tar.gz
gnunet-3b1199eb8f4a3319a13d34878a956f16c66a5b19.zip
PSYC: historic message flag
-rw-r--r--src/include/gnunet_psyc_service.h13
-rw-r--r--src/include/gnunet_social_service.h6
2 files changed, 14 insertions, 5 deletions
diff --git a/src/include/gnunet_psyc_service.h b/src/include/gnunet_psyc_service.h
index 8016ea498..d35c68f7e 100644
--- a/src/include/gnunet_psyc_service.h
+++ b/src/include/gnunet_psyc_service.h
@@ -101,17 +101,24 @@ enum GNUNET_PSYC_MessageFlags
101 /** 101 /**
102 * First fragment of a message. 102 * First fragment of a message.
103 */ 103 */
104 GNUNET_PSYC_MESSAGE_FIRST_FRAGMENT = GNUNET_MULTICAST_MESSAGE_FIRST_FRAGMENT, 104 GNUNET_PSYC_MESSAGE_FIRST_FRAGMENT = 1 << 0,
105 105
106 /** 106 /**
107 * Last fragment of a message. 107 * Last fragment of a message.
108 */ 108 */
109 GNUNET_PSYC_MESSAGE_LAST_FRAGMENT = GNUNET_MULTICAST_MESSAGE_LAST_FRAGMENT, 109 GNUNET_PSYC_MESSAGE_LAST_FRAGMENT = 1 << 1,
110 110
111 /** 111 /**
112 * OR'ed flags if message is not fragmented. 112 * OR'ed flags if message is not fragmented.
113 */ 113 */
114 GNUNET_PSYC_MESSAGE_NOT_FRAGMENTED = GNUNET_MULTICAST_MESSAGE_NOT_FRAGMENTED 114 GNUNET_PSYC_MESSAGE_NOT_FRAGMENTED
115 = GNUNET_PSYC_MESSAGE_FIRST_FRAGMENT
116 | GNUNET_PSYC_MESSAGE_LAST_FRAGMENT,
117
118 /**
119 * Historic message, retrieved from PSYCstore.
120 */
121 GNUNET_PSYC_MESSAGE_HISTORIC = 1 << 2
115}; 122};
116 123
117 124
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h
index 1e9dfc459..b0409d4b2 100644
--- a/src/include/gnunet_social_service.h
+++ b/src/include/gnunet_social_service.h
@@ -534,7 +534,7 @@ struct GNUNET_SOCIAL_TalkRequest;
534 * @param place Place where we want to talk to the host. 534 * @param place Place where we want to talk to the host.
535 * @param method_name Method to invoke on the host. 535 * @param method_name Method to invoke on the host.
536 * @param notify Function to use to get the payload for the method. 536 * @param notify Function to use to get the payload for the method.
537 * @param notifyv_cls Closure for @a notify. 537 * @param notify_cls Closure for @a notify.
538 * @return NULL if we are already trying to talk to the host, 538 * @return NULL if we are already trying to talk to the host,
539 * otherwise handle to cancel the request. 539 * otherwise handle to cancel the request.
540 */ 540 */
@@ -572,8 +572,10 @@ struct GNUNET_SOCIAL_HistoryLesson;
572 * @param start_message_id First historic message we are interested in. 572 * @param start_message_id First historic message we are interested in.
573 * @param end_message_id Last historic message we are interested in (inclusive). 573 * @param end_message_id Last historic message we are interested in (inclusive).
574 * @param slicer Slicer to use to process history. 574 * @param slicer Slicer to use to process history.
575 * FIXME: Needed? Could use the slicer of the place instead,
576 * receiving messages with the HISTORIC flag set.
575 * @return Handle to abort history lesson, never NULL (multiple lessons 577 * @return Handle to abort history lesson, never NULL (multiple lessons
576 * at the same time are allowed). 578 * at the same time are allowed).
577 */ 579 */
578struct GNUNET_SOCIAL_HistoryLesson * 580struct GNUNET_SOCIAL_HistoryLesson *
579GNUNET_SOCIAL_place_get_history (struct GNUNET_SOCIAL_Place *place, 581GNUNET_SOCIAL_place_get_history (struct GNUNET_SOCIAL_Place *place,