diff options
Diffstat (limited to 'src/service')
-rw-r--r-- | src/service/messenger/messenger_api.c | 24 | ||||
-rw-r--r-- | src/service/messenger/messenger_api_message.c | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/src/service/messenger/messenger_api.c b/src/service/messenger/messenger_api.c index 2981b1a71..1756ac91b 100644 --- a/src/service/messenger/messenger_api.c +++ b/src/service/messenger/messenger_api.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "gnunet-service-messenger.h" | 30 | #include "gnunet-service-messenger.h" |
31 | 31 | ||
32 | #include "gnunet_reclaim_service.h" | 32 | #include "gnunet_reclaim_service.h" |
33 | #include "gnunet_time_lib.h" | ||
33 | #include "messenger_api_contact.h" | 34 | #include "messenger_api_contact.h" |
34 | #include "messenger_api_contact_store.h" | 35 | #include "messenger_api_contact_store.h" |
35 | #include "messenger_api_handle.h" | 36 | #include "messenger_api_handle.h" |
@@ -1209,7 +1210,28 @@ GNUNET_MESSENGER_send_message (struct GNUNET_MESSENGER_Room *room, | |||
1209 | else | 1210 | else |
1210 | public_key = NULL; | 1211 | public_key = NULL; |
1211 | 1212 | ||
1212 | send_message_to_room_with_key (room, copy_message(message), public_key); | 1213 | send_message_to_room_with_key (room, copy_message(message), NULL); |
1214 | } | ||
1215 | |||
1216 | |||
1217 | void | ||
1218 | GNUNET_MESSENGER_delete_message (struct GNUNET_MESSENGER_Room *room, | ||
1219 | const struct GNUNET_HashCode *hash, | ||
1220 | const struct GNUNET_TIME_Relative delay) | ||
1221 | { | ||
1222 | if ((! room) || (! hash)) | ||
1223 | return; | ||
1224 | |||
1225 | struct GNUNET_MESSENGER_Message *message = create_message_delete(hash, delay); | ||
1226 | |||
1227 | if (! message) | ||
1228 | { | ||
1229 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | ||
1230 | "Sending deletion aborted: Message creation failed!\n"); | ||
1231 | return; | ||
1232 | } | ||
1233 | |||
1234 | send_message_to_room_with_key (room, message, NULL); | ||
1213 | } | 1235 | } |
1214 | 1236 | ||
1215 | 1237 | ||
diff --git a/src/service/messenger/messenger_api_message.c b/src/service/messenger/messenger_api_message.c index 884adabed..f6d8c31f7 100644 --- a/src/service/messenger/messenger_api_message.c +++ b/src/service/messenger/messenger_api_message.c | |||
@@ -1312,7 +1312,7 @@ filter_message_sending (const struct GNUNET_MESSENGER_Message *message) | |||
1312 | case GNUNET_MESSENGER_KIND_PRIVATE: | 1312 | case GNUNET_MESSENGER_KIND_PRIVATE: |
1313 | return GNUNET_NO; // Use #GNUNET_MESSENGER_send_message(...) with a contact instead! | 1313 | return GNUNET_NO; // Use #GNUNET_MESSENGER_send_message(...) with a contact instead! |
1314 | case GNUNET_MESSENGER_KIND_DELETE: | 1314 | case GNUNET_MESSENGER_KIND_DELETE: |
1315 | return GNUNET_YES; | 1315 | return GNUNET_NO; // Use #GNUNET_MESSENGER_delete_message(...) instead! |
1316 | case GNUNET_MESSENGER_KIND_CONNECTION: | 1316 | case GNUNET_MESSENGER_KIND_CONNECTION: |
1317 | return GNUNET_SYSERR; // Reserved for connection handling only! | 1317 | return GNUNET_SYSERR; // Reserved for connection handling only! |
1318 | case GNUNET_MESSENGER_KIND_TICKET: | 1318 | case GNUNET_MESSENGER_KIND_TICKET: |