diff options
author | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-02-16 05:41:13 +0000 |
---|---|---|
committer | Carlo von lynX <lynX@time.to.get.psyced.org> | 2016-02-16 05:41:13 +0000 |
commit | 4ada8e1740bd025c629e11437adb179f327f857e (patch) | |
tree | 9f9c605c01ee65ac1a70583636d3a58a71258f16 /src/include/gnunet_social_service.h | |
parent | bdcdd10e4779ca4e49555e710a6da2423d91629f (diff) | |
download | gnunet-4ada8e1740bd025c629e11437adb179f327f857e.tar.gz gnunet-4ada8e1740bd025c629e11437adb179f327f857e.zip |
slowly aligning gnunet_social_service.h with PSYC spec
Diffstat (limited to 'src/include/gnunet_social_service.h')
-rw-r--r-- | src/include/gnunet_social_service.h | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/src/include/gnunet_social_service.h b/src/include/gnunet_social_service.h index 01f874c7f..7ecdf1d53 100644 --- a/src/include/gnunet_social_service.h +++ b/src/include/gnunet_social_service.h | |||
@@ -86,7 +86,7 @@ or process it using a message handler function. | |||
86 | 86 | ||
87 | A client first establishes an _application connection_ to the service using | 87 | A client first establishes an _application connection_ to the service using |
88 | GNUNET_SOCIAL_app_connect() providing its _application ID_, then receives the | 88 | GNUNET_SOCIAL_app_connect() providing its _application ID_, then receives the |
89 | public keys of subscribed places and available egos and in response. | 89 | public keys of subscribed places and available egos in response. |
90 | 90 | ||
91 | ## Reconnecting to places | 91 | ## Reconnecting to places |
92 | 92 | ||
@@ -112,13 +112,13 @@ When leaving a place its network connections are closed and all applications are | |||
112 | 112 | ||
113 | # Message methods | 113 | # Message methods |
114 | 114 | ||
115 | ## _message | 115 | ## _converse |
116 | 116 | ||
117 | A message sent to the place. | 117 | Human conversation in a private or public place. |
118 | 118 | ||
119 | ### Environment | 119 | ### Environment |
120 | 120 | ||
121 | #### _id_reply_to | 121 | #### _id_reply |
122 | Message ID this message is in reply to. | 122 | Message ID this message is in reply to. |
123 | 123 | ||
124 | #### _id_thread | 124 | #### _id_thread |
@@ -127,10 +127,14 @@ Thread ID, the first message ID in the thread. | |||
127 | #### _nym_author | 127 | #### _nym_author |
128 | Nym of the author. | 128 | Nym of the author. |
129 | 129 | ||
130 | FIXME: Are nyms a different data type from egos and person entities? | ||
131 | Do they have a different format than any other entity address? | ||
132 | Questions and thoughts on how to fix this in "questions.org" | ||
133 | |||
130 | #### _sig_author | 134 | #### _sig_author |
131 | Signature of the message body and its variables by the author. | 135 | Signature of the message body and its variables by the author. |
132 | 136 | ||
133 | ## Data | 137 | ### Data |
134 | 138 | ||
135 | Message body. | 139 | Message body. |
136 | 140 | ||
@@ -148,11 +152,18 @@ e.g. files under a given size. | |||
148 | ##### _gns_place | 152 | ##### _gns_place |
149 | GNS name of the place in a globally unique .zkey zone | 153 | GNS name of the place in a globally unique .zkey zone |
150 | 154 | ||
155 | FIXME: A custom _gns PSYC data type should be avoidable by parsing | ||
156 | and interpreting PSYC uniforms appropriately. | ||
157 | Thoughts on this in "questions.org" | ||
158 | |||
151 | #### Without GNS | 159 | #### Without GNS |
152 | 160 | ||
153 | ##### _key_pub_place | 161 | ##### _key_pub_place |
154 | Public key of place | 162 | Public key of place |
155 | 163 | ||
164 | FIXME: _key_pub can't be the data type for GNUnet-specific cryptographic | ||
165 | addressing. Questions and thoughts on how to fix this in "questions.org" | ||
166 | |||
156 | ##### _peer_origin | 167 | ##### _peer_origin |
157 | Peer ID of origin | 168 | Peer ID of origin |
158 | 169 | ||
@@ -170,7 +181,7 @@ The environment of _notice_place above, plus the following: | |||
170 | #### _size_file | 181 | #### _size_file |
171 | Size of file | 182 | Size of file |
172 | 183 | ||
173 | #### _mime_file | 184 | #### _type_file |
174 | MIME type of file | 185 | MIME type of file |
175 | 186 | ||
176 | #### _name_file | 187 | #### _name_file |
@@ -182,7 +193,7 @@ Description of file | |||
182 | ## _file | 193 | ## _file |
183 | 194 | ||
184 | Messages with a _file method contain a file, | 195 | Messages with a _file method contain a file, |
185 | which is saved to disk upon receipt at the following location: | 196 | which is saved to disk upon reception at the following location: |
186 | $GNUNET_DATA_HOME/social/files/<H(place_pub)>/<message_id> | 197 | $GNUNET_DATA_HOME/social/files/<H(place_pub)>/<message_id> |
187 | 198 | ||
188 | ### Environment | 199 | ### Environment |
@@ -190,7 +201,7 @@ $GNUNET_DATA_HOME/social/files/<H(place_pub)>/<message_id> | |||
190 | #### _size_file | 201 | #### _size_file |
191 | Size of file | 202 | Size of file |
192 | 203 | ||
193 | #### _mime_file | 204 | #### _type_file |
194 | MIME type of file | 205 | MIME type of file |
195 | 206 | ||
196 | #### _name_file | 207 | #### _name_file |
@@ -297,6 +308,10 @@ typedef void | |||
297 | 308 | ||
298 | /** | 309 | /** |
299 | * Entry status of a place. | 310 | * Entry status of a place. |
311 | * | ||
312 | * Note: The intermediate status of having entered a place without | ||
313 | * being subscribed to it may be obsoleted in future unless we find a | ||
314 | * compelling reason for it to exist. FIXME: See questions.org. | ||
300 | */ | 315 | */ |
301 | enum GNUNET_SOCIAL_PlaceState | 316 | enum GNUNET_SOCIAL_PlaceState |
302 | { | 317 | { |