diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-07-15 09:28:14 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-07-15 09:28:14 +0000 |
commit | 01fb59c86f5c7e039c58b45ce3271c96029e9058 (patch) | |
tree | 6f2306d633b4b3ac32a95e03ab90e423bb34e8dc /src/identity-provider/gnunet-service-identity-provider.c | |
parent | d921631157c5bfbabee1eb4ee2884c6ad45ac805 (diff) | |
download | gnunet-01fb59c86f5c7e039c58b45ce3271c96029e9058.tar.gz gnunet-01fb59c86f5c7e039c58b45ce3271c96029e9058.zip |
move to MQ api
Diffstat (limited to 'src/identity-provider/gnunet-service-identity-provider.c')
-rw-r--r-- | src/identity-provider/gnunet-service-identity-provider.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 80c15f85f..358017d5b 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c | |||
@@ -191,6 +191,11 @@ struct ExchangeHandle | |||
191 | * Label to return | 191 | * Label to return |
192 | */ | 192 | */ |
193 | char *label; | 193 | char *label; |
194 | |||
195 | /** | ||
196 | * request id | ||
197 | */ | ||
198 | uint32_t r_id; | ||
194 | }; | 199 | }; |
195 | 200 | ||
196 | struct IssueHandle | 201 | struct IssueHandle |
@@ -260,6 +265,11 @@ struct IssueHandle | |||
260 | * The label the token is stored under | 265 | * The label the token is stored under |
261 | */ | 266 | */ |
262 | char *label; | 267 | char *label; |
268 | |||
269 | /** | ||
270 | * request id | ||
271 | */ | ||
272 | uint32_t r_id; | ||
263 | }; | 273 | }; |
264 | 274 | ||
265 | /** | 275 | /** |
@@ -1016,6 +1026,7 @@ store_token_issue_cont (void *cls, | |||
1016 | irm = create_issue_result_message (handle->label, | 1026 | irm = create_issue_result_message (handle->label, |
1017 | ticket_str, | 1027 | ticket_str, |
1018 | token_str); | 1028 | token_str); |
1029 | irm->id = handle->r_id; | ||
1019 | GNUNET_SERVER_notification_context_unicast (nc, | 1030 | GNUNET_SERVER_notification_context_unicast (nc, |
1020 | handle->client, | 1031 | handle->client, |
1021 | &irm->header, | 1032 | &irm->header, |
@@ -1250,6 +1261,7 @@ process_lookup_result (void *cls, uint32_t rd_count, | |||
1250 | erm = create_exchange_result_message (token_str, | 1261 | erm = create_exchange_result_message (token_str, |
1251 | handle->label, | 1262 | handle->label, |
1252 | handle->ticket->payload->nonce); | 1263 | handle->ticket->payload->nonce); |
1264 | erm->id = handle->r_id; | ||
1253 | GNUNET_SERVER_notification_context_unicast (nc, | 1265 | GNUNET_SERVER_notification_context_unicast (nc, |
1254 | handle->client, | 1266 | handle->client, |
1255 | &erm->header, | 1267 | &erm->header, |
@@ -1298,7 +1310,7 @@ handle_exchange_message (void *cls, | |||
1298 | ticket); | 1310 | ticket); |
1299 | xchange_handle = GNUNET_malloc (sizeof (struct ExchangeHandle)); | 1311 | xchange_handle = GNUNET_malloc (sizeof (struct ExchangeHandle)); |
1300 | xchange_handle->aud_privkey = em->aud_privkey; | 1312 | xchange_handle->aud_privkey = em->aud_privkey; |
1301 | 1313 | xchange_handle->r_id = em->id; | |
1302 | if (GNUNET_SYSERR == ticket_parse (ticket, | 1314 | if (GNUNET_SYSERR == ticket_parse (ticket, |
1303 | &xchange_handle->aud_privkey, | 1315 | &xchange_handle->aud_privkey, |
1304 | &xchange_handle->ticket)) | 1316 | &xchange_handle->ticket)) |
@@ -1537,7 +1549,7 @@ handle_issue_message (void *cls, | |||
1537 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); | 1549 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE); |
1538 | } | 1550 | } |
1539 | GNUNET_free (scopes_tmp); | 1551 | GNUNET_free (scopes_tmp); |
1540 | 1552 | issue_handle->r_id = im->id; | |
1541 | issue_handle->aud_key = im->aud_key; | 1553 | issue_handle->aud_key = im->aud_key; |
1542 | issue_handle->iss_key = im->iss_key; | 1554 | issue_handle->iss_key = im->iss_key; |
1543 | GNUNET_CRYPTO_ecdsa_key_get_public (&im->iss_key, | 1555 | GNUNET_CRYPTO_ecdsa_key_get_public (&im->iss_key, |