diff options
author | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-09-29 13:27:13 +0000 |
---|---|---|
committer | Martin Schanzenbach <mschanzenbach@posteo.de> | 2016-09-29 13:27:13 +0000 |
commit | de1969aa7d4214c5218d3a1bf932b95ed95efe0d (patch) | |
tree | 2b1ed9a6c0d562c0163d3055b93a453502ce4460 /src/identity-provider/identity_provider_api.c | |
parent | 22af28fc22725c597831367fa3742070dfa449a8 (diff) | |
download | gnunet-de1969aa7d4214c5218d3a1bf932b95ed95efe0d.tar.gz gnunet-de1969aa7d4214c5218d3a1bf932b95ed95efe0d.zip |
-new service API
Diffstat (limited to 'src/identity-provider/identity_provider_api.c')
-rw-r--r-- | src/identity-provider/identity_provider_api.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index 8317d18ad..28ff90fc4 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c | |||
@@ -220,15 +220,15 @@ mq_error_handler (void *cls, | |||
220 | */ | 220 | */ |
221 | static int | 221 | static int |
222 | check_exchange_result (void *cls, | 222 | check_exchange_result (void *cls, |
223 | const struct GNUNET_IDENTITY_PROVIDER_ExchangeResultMessage *erm) | 223 | const struct ExchangeResultMessage *erm) |
224 | { | 224 | { |
225 | char *str; | 225 | char *str; |
226 | size_t size = ntohs (erm->header.size) - sizeof (*erm); | 226 | size_t size = ntohs (erm->header.size) - sizeof (*erm); |
227 | 227 | ||
228 | 228 | ||
229 | str = (char *) &erm[1]; | 229 | str = (char *) &erm[1]; |
230 | if ( (size > sizeof (struct GNUNET_IDENTITY_PROVIDER_ExchangeResultMessage)) && | 230 | if ( (size > sizeof (struct ExchangeResultMessage)) && |
231 | ('\0' != str[size - sizeof (struct GNUNET_IDENTITY_PROVIDER_ExchangeResultMessage) - 1]) ) | 231 | ('\0' != str[size - sizeof (struct ExchangeResultMessage) - 1]) ) |
232 | { | 232 | { |
233 | GNUNET_break (0); | 233 | GNUNET_break (0); |
234 | return GNUNET_SYSERR; | 234 | return GNUNET_SYSERR; |
@@ -245,13 +245,13 @@ check_exchange_result (void *cls, | |||
245 | */ | 245 | */ |
246 | static int | 246 | static int |
247 | check_result (void *cls, | 247 | check_result (void *cls, |
248 | const struct GNUNET_IDENTITY_PROVIDER_IssueResultMessage *irm) | 248 | const struct IssueResultMessage *irm) |
249 | { | 249 | { |
250 | char *str; | 250 | char *str; |
251 | size_t size = ntohs (irm->header.size) - sizeof (*irm); | 251 | size_t size = ntohs (irm->header.size) - sizeof (*irm); |
252 | str = (char*) &irm[1]; | 252 | str = (char*) &irm[1]; |
253 | if ( (size > sizeof (struct GNUNET_IDENTITY_PROVIDER_IssueResultMessage)) && | 253 | if ( (size > sizeof (struct IssueResultMessage)) && |
254 | ('\0' != str[size - sizeof (struct GNUNET_IDENTITY_PROVIDER_IssueResultMessage) - 1]) ) | 254 | ('\0' != str[size - sizeof (struct IssueResultMessage) - 1]) ) |
255 | { | 255 | { |
256 | GNUNET_break (0); | 256 | GNUNET_break (0); |
257 | return GNUNET_SYSERR; | 257 | return GNUNET_SYSERR; |
@@ -267,7 +267,7 @@ check_result (void *cls, | |||
267 | */ | 267 | */ |
268 | static void | 268 | static void |
269 | handle_exchange_result (void *cls, | 269 | handle_exchange_result (void *cls, |
270 | const struct GNUNET_IDENTITY_PROVIDER_ExchangeResultMessage *erm) | 270 | const struct ExchangeResultMessage *erm) |
271 | { | 271 | { |
272 | struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; | 272 | struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; |
273 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; | 273 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; |
@@ -303,7 +303,7 @@ handle_exchange_result (void *cls, | |||
303 | */ | 303 | */ |
304 | static void | 304 | static void |
305 | handle_result (void *cls, | 305 | handle_result (void *cls, |
306 | const struct GNUNET_IDENTITY_PROVIDER_IssueResultMessage *irm) | 306 | const struct IssueResultMessage *irm) |
307 | { | 307 | { |
308 | struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; | 308 | struct GNUNET_IDENTITY_PROVIDER_Handle *handle = cls; |
309 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; | 309 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; |
@@ -366,11 +366,11 @@ reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) | |||
366 | struct GNUNET_MQ_MessageHandler handlers[] = { | 366 | struct GNUNET_MQ_MessageHandler handlers[] = { |
367 | GNUNET_MQ_hd_var_size (result, | 367 | GNUNET_MQ_hd_var_size (result, |
368 | GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_RESULT, | 368 | GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_RESULT, |
369 | struct GNUNET_IDENTITY_PROVIDER_IssueResultMessage, | 369 | struct IssueResultMessage, |
370 | h), | 370 | h), |
371 | GNUNET_MQ_hd_var_size (exchange_result, | 371 | GNUNET_MQ_hd_var_size (exchange_result, |
372 | GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE_RESULT, | 372 | GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_EXCHANGE_RESULT, |
373 | struct GNUNET_IDENTITY_PROVIDER_ExchangeResultMessage, | 373 | struct ExchangeResultMessage, |
374 | h), | 374 | h), |
375 | GNUNET_MQ_handler_end () | 375 | GNUNET_MQ_handler_end () |
376 | }; | 376 | }; |
@@ -436,11 +436,11 @@ GNUNET_IDENTITY_PROVIDER_issue_token (struct GNUNET_IDENTITY_PROVIDER_Handle *id | |||
436 | void *cb_cls) | 436 | void *cb_cls) |
437 | { | 437 | { |
438 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; | 438 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; |
439 | struct GNUNET_IDENTITY_PROVIDER_IssueMessage *im; | 439 | struct IssueMessage *im; |
440 | size_t slen; | 440 | size_t slen; |
441 | 441 | ||
442 | slen = strlen (scopes) + 1; | 442 | slen = strlen (scopes) + 1; |
443 | if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct GNUNET_IDENTITY_PROVIDER_IssueMessage)) | 443 | if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct IssueMessage)) |
444 | { | 444 | { |
445 | GNUNET_break (0); | 445 | GNUNET_break (0); |
446 | return NULL; | 446 | return NULL; |
@@ -486,14 +486,14 @@ GNUNET_IDENTITY_PROVIDER_exchange_ticket (struct GNUNET_IDENTITY_PROVIDER_Handle | |||
486 | void *cont_cls) | 486 | void *cont_cls) |
487 | { | 487 | { |
488 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; | 488 | struct GNUNET_IDENTITY_PROVIDER_Operation *op; |
489 | struct GNUNET_IDENTITY_PROVIDER_ExchangeMessage *em; | 489 | struct ExchangeMessage *em; |
490 | size_t slen; | 490 | size_t slen; |
491 | char *ticket_str; | 491 | char *ticket_str; |
492 | 492 | ||
493 | ticket_str = GNUNET_IDENTITY_PROVIDER_ticket_to_string (ticket); | 493 | ticket_str = GNUNET_IDENTITY_PROVIDER_ticket_to_string (ticket); |
494 | 494 | ||
495 | slen = strlen (ticket_str) + 1; | 495 | slen = strlen (ticket_str) + 1; |
496 | if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct GNUNET_IDENTITY_PROVIDER_ExchangeMessage)) | 496 | if (slen >= GNUNET_SERVER_MAX_MESSAGE_SIZE - sizeof (struct ExchangeMessage)) |
497 | { | 497 | { |
498 | GNUNET_free (ticket_str); | 498 | GNUNET_free (ticket_str); |
499 | GNUNET_break (0); | 499 | GNUNET_break (0); |