diff options
author | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-01-04 15:28:02 +0100 |
---|---|---|
committer | Schanzenbach, Martin <martin.schanzenbach@aisec.fraunhofer.de> | 2018-01-04 15:29:45 +0100 |
commit | 78705d5a49d7066a01b832546d2507456a3c5d2c (patch) | |
tree | b0e5f72bdde4574f20c0b89ee56295f83b954800 /src/identity-provider | |
parent | 272921672ec094644a1ddbbfacb96581e72ed443 (diff) | |
download | gnunet-78705d5a49d7066a01b832546d2507456a3c5d2c.tar.gz gnunet-78705d5a49d7066a01b832546d2507456a3c5d2c.zip |
-cleanup doc; fixes
Diffstat (limited to 'src/identity-provider')
6 files changed, 43 insertions, 151 deletions
diff --git a/src/identity-provider/gnunet-service-identity-provider.c b/src/identity-provider/gnunet-service-identity-provider.c index 351308c3a..4e1de36cd 100644 --- a/src/identity-provider/gnunet-service-identity-provider.c +++ b/src/identity-provider/gnunet-service-identity-provider.c | |||
@@ -637,10 +637,8 @@ cleanup() | |||
637 | GNUNET_NAMESTORE_disconnect (ns_handle); | 637 | GNUNET_NAMESTORE_disconnect (ns_handle); |
638 | if (NULL != stats_handle) | 638 | if (NULL != stats_handle) |
639 | GNUNET_STATISTICS_destroy (stats_handle, GNUNET_NO); | 639 | GNUNET_STATISTICS_destroy (stats_handle, GNUNET_NO); |
640 | if (NULL != token) | 640 | GNUNET_free_non_null (token); |
641 | GNUNET_free (token); | 641 | GNUNET_free_non_null (label); |
642 | if (NULL != label) | ||
643 | GNUNET_free (label); | ||
644 | 642 | ||
645 | } | 643 | } |
646 | 644 | ||
@@ -648,7 +646,6 @@ cleanup() | |||
648 | * Shutdown task | 646 | * Shutdown task |
649 | * | 647 | * |
650 | * @param cls NULL | 648 | * @param cls NULL |
651 | * @param tc task context | ||
652 | */ | 649 | */ |
653 | static void | 650 | static void |
654 | do_shutdown (void *cls) | 651 | do_shutdown (void *cls) |
@@ -732,9 +729,8 @@ bootstrap_abe_result (void *cls, | |||
732 | { | 729 | { |
733 | struct AbeBootstrapHandle *abh = cls; | 730 | struct AbeBootstrapHandle *abh = cls; |
734 | struct GNUNET_ABE_AbeMasterKey *abe_key; | 731 | struct GNUNET_ABE_AbeMasterKey *abe_key; |
735 | int i; | ||
736 | 732 | ||
737 | for (i=0;i<rd_count;i++) { | 733 | for (uint32_t i=0;i<rd_count;i++) { |
738 | if (GNUNET_GNSRECORD_TYPE_ABE_MASTER != rd[i].record_type) | 734 | if (GNUNET_GNSRECORD_TYPE_ABE_MASTER != rd[i].record_type) |
739 | continue; | 735 | continue; |
740 | abe_key = GNUNET_ABE_cpabe_deserialize_master_key (rd[i].data, | 736 | abe_key = GNUNET_ABE_cpabe_deserialize_master_key (rd[i].data, |
@@ -964,7 +960,7 @@ issue_ticket_after_abe_bootstrap (void *cls, | |||
964 | char *label; | 960 | char *label; |
965 | char *policy; | 961 | char *policy; |
966 | int attrs_len; | 962 | int attrs_len; |
967 | int i; | 963 | uint32_t i; |
968 | size_t code_record_len; | 964 | size_t code_record_len; |
969 | 965 | ||
970 | //Create new ABE key for RP | 966 | //Create new ABE key for RP |
@@ -1021,13 +1017,6 @@ issue_ticket_after_abe_bootstrap (void *cls, | |||
1021 | } | 1017 | } |
1022 | 1018 | ||
1023 | 1019 | ||
1024 | /** | ||
1025 | * Checks a ticket issue message | ||
1026 | * | ||
1027 | * @param cls client sending the message | ||
1028 | * @param im message of type `struct TicketIssueMessage` | ||
1029 | * @return #GNUNET_OK if @a im is well-formed | ||
1030 | */ | ||
1031 | static int | 1020 | static int |
1032 | check_issue_ticket_message(void *cls, | 1021 | check_issue_ticket_message(void *cls, |
1033 | const struct IssueTicketMessage *im) | 1022 | const struct IssueTicketMessage *im) |
@@ -1044,14 +1033,6 @@ check_issue_ticket_message(void *cls, | |||
1044 | } | 1033 | } |
1045 | 1034 | ||
1046 | 1035 | ||
1047 | /** | ||
1048 | * | ||
1049 | * Handler for ticket issue message | ||
1050 | * | ||
1051 | * @param cls unused | ||
1052 | * @param client who sent the message | ||
1053 | * @param message the message | ||
1054 | */ | ||
1055 | static void | 1036 | static void |
1056 | handle_issue_ticket_message (void *cls, | 1037 | handle_issue_ticket_message (void *cls, |
1057 | const struct IssueTicketMessage *im) | 1038 | const struct IssueTicketMessage *im) |
@@ -1083,26 +1064,31 @@ handle_issue_ticket_message (void *cls, | |||
1083 | 1064 | ||
1084 | /** | 1065 | /** |
1085 | * Cleanup revoke handle | 1066 | * Cleanup revoke handle |
1067 | * | ||
1068 | * @param rh the ticket revocation handle | ||
1086 | */ | 1069 | */ |
1087 | static void | 1070 | static void |
1088 | cleanup_revoke_ticket_handle (struct TicketRevocationHandle *handle) | 1071 | cleanup_revoke_ticket_handle (struct TicketRevocationHandle *rh) |
1089 | { | 1072 | { |
1090 | if (NULL != handle->attrs) | 1073 | if (NULL != rh->attrs) |
1091 | GNUNET_IDENTITY_ATTRIBUTE_list_destroy (handle->attrs); | 1074 | GNUNET_IDENTITY_ATTRIBUTE_list_destroy (rh->attrs); |
1092 | if (NULL != handle->rvk_attrs) | 1075 | if (NULL != rh->rvk_attrs) |
1093 | GNUNET_IDENTITY_ATTRIBUTE_list_destroy (handle->rvk_attrs); | 1076 | GNUNET_IDENTITY_ATTRIBUTE_list_destroy (rh->rvk_attrs); |
1094 | if (NULL != handle->abe_key) | 1077 | if (NULL != rh->abe_key) |
1095 | GNUNET_ABE_cpabe_delete_master_key (handle->abe_key); | 1078 | GNUNET_ABE_cpabe_delete_master_key (rh->abe_key); |
1096 | if (NULL != handle->ns_qe) | 1079 | if (NULL != rh->ns_qe) |
1097 | GNUNET_NAMESTORE_cancel (handle->ns_qe); | 1080 | GNUNET_NAMESTORE_cancel (rh->ns_qe); |
1098 | if (NULL != handle->ns_it) | 1081 | if (NULL != rh->ns_it) |
1099 | GNUNET_NAMESTORE_zone_iteration_stop (handle->ns_it); | 1082 | GNUNET_NAMESTORE_zone_iteration_stop (rh->ns_it); |
1100 | GNUNET_free (handle); | 1083 | GNUNET_free (rh); |
1101 | } | 1084 | } |
1102 | 1085 | ||
1103 | 1086 | ||
1104 | /** | 1087 | /** |
1105 | * Send revocation result | 1088 | * Send revocation result |
1089 | * | ||
1090 | * @param rh ticket revocation handle | ||
1091 | * @param success GNUNET_OK if successful result | ||
1106 | */ | 1092 | */ |
1107 | static void | 1093 | static void |
1108 | send_revocation_finished (struct TicketRevocationHandle *rh, | 1094 | send_revocation_finished (struct TicketRevocationHandle *rh, |
@@ -1190,7 +1176,7 @@ ticket_reissue_proc (void *cls, | |||
1190 | char *label; | 1176 | char *label; |
1191 | char *policy; | 1177 | char *policy; |
1192 | int attrs_len; | 1178 | int attrs_len; |
1193 | int i; | 1179 | uint32_t i; |
1194 | int reissue_ticket; | 1180 | int reissue_ticket; |
1195 | size_t code_record_len; | 1181 | size_t code_record_len; |
1196 | 1182 | ||
@@ -1476,13 +1462,6 @@ get_ticket_after_abe_bootstrap (void *cls, | |||
1476 | rh); | 1462 | rh); |
1477 | } | 1463 | } |
1478 | 1464 | ||
1479 | /** | ||
1480 | * Checks a ticket revocation message | ||
1481 | * | ||
1482 | * @param cls client sending the message | ||
1483 | * @param im message of type `struct RevokeTicketMessage` | ||
1484 | * @return #GNUNET_OK if @a im is well-formed | ||
1485 | */ | ||
1486 | static int | 1465 | static int |
1487 | check_revoke_ticket_message(void *cls, | 1466 | check_revoke_ticket_message(void *cls, |
1488 | const struct RevokeTicketMessage *im) | 1467 | const struct RevokeTicketMessage *im) |
@@ -1497,14 +1476,7 @@ check_revoke_ticket_message(void *cls, | |||
1497 | } | 1476 | } |
1498 | return GNUNET_OK; | 1477 | return GNUNET_OK; |
1499 | } | 1478 | } |
1500 | /** | 1479 | |
1501 | * | ||
1502 | * Handler for ticket revocation message | ||
1503 | * | ||
1504 | * @param cls unused | ||
1505 | * @param client who sent the message | ||
1506 | * @param message the message | ||
1507 | */ | ||
1508 | static void | 1480 | static void |
1509 | handle_revoke_ticket_message (void *cls, | 1481 | handle_revoke_ticket_message (void *cls, |
1510 | const struct RevokeTicketMessage *rm) | 1482 | const struct RevokeTicketMessage *rm) |
@@ -1544,13 +1516,6 @@ cleanup_consume_ticket_handle (struct ConsumeTicketHandle *handle) | |||
1544 | 1516 | ||
1545 | 1517 | ||
1546 | 1518 | ||
1547 | /** | ||
1548 | * Checks a ticket consume message | ||
1549 | * | ||
1550 | * @param cls client sending the message | ||
1551 | * @param im message of type `struct ConsumeTicketMessage` | ||
1552 | * @return #GNUNET_OK if @a im is well-formed | ||
1553 | */ | ||
1554 | static int | 1519 | static int |
1555 | check_consume_ticket_message(void *cls, | 1520 | check_consume_ticket_message(void *cls, |
1556 | const struct ConsumeTicketMessage *cm) | 1521 | const struct ConsumeTicketMessage *cm) |
@@ -1782,14 +1747,6 @@ process_consume_abe_key (void *cls, uint32_t rd_count, | |||
1782 | } | 1747 | } |
1783 | 1748 | ||
1784 | 1749 | ||
1785 | /** | ||
1786 | * | ||
1787 | * Handler for ticket issue message | ||
1788 | * | ||
1789 | * @param cls unused | ||
1790 | * @param client who sent the message | ||
1791 | * @param message the message | ||
1792 | */ | ||
1793 | static void | 1750 | static void |
1794 | handle_consume_ticket_message (void *cls, | 1751 | handle_consume_ticket_message (void *cls, |
1795 | const struct ConsumeTicketMessage *cm) | 1752 | const struct ConsumeTicketMessage *cm) |
@@ -1941,13 +1898,6 @@ store_after_abe_bootstrap (void *cls, | |||
1941 | GNUNET_SCHEDULER_add_now (&attr_store_task, ash); | 1898 | GNUNET_SCHEDULER_add_now (&attr_store_task, ash); |
1942 | } | 1899 | } |
1943 | 1900 | ||
1944 | /** | ||
1945 | * Checks a store message | ||
1946 | * | ||
1947 | * @param cls client sending the message | ||
1948 | * @param sam message of type `struct AttributeStoreMessage` | ||
1949 | * @return #GNUNET_OK if @a im is well-formed | ||
1950 | */ | ||
1951 | static int | 1901 | static int |
1952 | check_attribute_store_message(void *cls, | 1902 | check_attribute_store_message(void *cls, |
1953 | const struct AttributeStoreMessage *sam) | 1903 | const struct AttributeStoreMessage *sam) |
@@ -1964,14 +1914,6 @@ check_attribute_store_message(void *cls, | |||
1964 | } | 1914 | } |
1965 | 1915 | ||
1966 | 1916 | ||
1967 | /** | ||
1968 | * | ||
1969 | * Handler for store message | ||
1970 | * | ||
1971 | * @param cls unused | ||
1972 | * @param client who sent the message | ||
1973 | * @param message the message | ||
1974 | */ | ||
1975 | static void | 1917 | static void |
1976 | handle_attribute_store_message (void *cls, | 1918 | handle_attribute_store_message (void *cls, |
1977 | const struct AttributeStoreMessage *sam) | 1919 | const struct AttributeStoreMessage *sam) |
@@ -2125,12 +2067,6 @@ iterate_next_after_abe_bootstrap (void *cls, | |||
2125 | 2067 | ||
2126 | 2068 | ||
2127 | 2069 | ||
2128 | /** | ||
2129 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ITERATION_START message | ||
2130 | * | ||
2131 | * @param cls the client sending the message | ||
2132 | * @param zis_msg message from the client | ||
2133 | */ | ||
2134 | static void | 2070 | static void |
2135 | handle_iteration_start (void *cls, | 2071 | handle_iteration_start (void *cls, |
2136 | const struct AttributeIterationStartMessage *ais_msg) | 2072 | const struct AttributeIterationStartMessage *ais_msg) |
@@ -2153,12 +2089,6 @@ handle_iteration_start (void *cls, | |||
2153 | } | 2089 | } |
2154 | 2090 | ||
2155 | 2091 | ||
2156 | /** | ||
2157 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ITERATION_STOP message | ||
2158 | * | ||
2159 | * @param cls the client sending the message | ||
2160 | * @param ais_msg message from the client | ||
2161 | */ | ||
2162 | static void | 2092 | static void |
2163 | handle_iteration_stop (void *cls, | 2093 | handle_iteration_stop (void *cls, |
2164 | const struct AttributeIterationStopMessage *ais_msg) | 2094 | const struct AttributeIterationStopMessage *ais_msg) |
@@ -2188,12 +2118,6 @@ handle_iteration_stop (void *cls, | |||
2188 | } | 2118 | } |
2189 | 2119 | ||
2190 | 2120 | ||
2191 | /** | ||
2192 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ATTRIBUTE_ITERATION_NEXT message | ||
2193 | * | ||
2194 | * @param cls the client sending the message | ||
2195 | * @param message message from the client | ||
2196 | */ | ||
2197 | static void | 2121 | static void |
2198 | handle_iteration_next (void *cls, | 2122 | handle_iteration_next (void *cls, |
2199 | const struct AttributeIterationNextMessage *ais_msg) | 2123 | const struct AttributeIterationNextMessage *ais_msg) |
@@ -2351,12 +2275,6 @@ run_ticket_iteration_round (struct TicketIteration *ti) | |||
2351 | cleanup_ticket_iter_handle (ti); | 2275 | cleanup_ticket_iter_handle (ti); |
2352 | } | 2276 | } |
2353 | 2277 | ||
2354 | /** | ||
2355 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_START message | ||
2356 | * | ||
2357 | * @param cls the client sending the message | ||
2358 | * @param tis_msg message from the client | ||
2359 | */ | ||
2360 | static void | 2278 | static void |
2361 | handle_ticket_iteration_start (void *cls, | 2279 | handle_ticket_iteration_start (void *cls, |
2362 | const struct TicketIterationStartMessage *tis_msg) | 2280 | const struct TicketIterationStartMessage *tis_msg) |
@@ -2381,12 +2299,6 @@ handle_ticket_iteration_start (void *cls, | |||
2381 | } | 2299 | } |
2382 | 2300 | ||
2383 | 2301 | ||
2384 | /** | ||
2385 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_STOP message | ||
2386 | * | ||
2387 | * @param cls the client sending the message | ||
2388 | * @param tis_msg message from the client | ||
2389 | */ | ||
2390 | static void | 2302 | static void |
2391 | handle_ticket_iteration_stop (void *cls, | 2303 | handle_ticket_iteration_stop (void *cls, |
2392 | const struct TicketIterationStopMessage *tis_msg) | 2304 | const struct TicketIterationStopMessage *tis_msg) |
@@ -2416,12 +2328,6 @@ handle_ticket_iteration_stop (void *cls, | |||
2416 | } | 2328 | } |
2417 | 2329 | ||
2418 | 2330 | ||
2419 | /** | ||
2420 | * Handles a #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ITERATION_NEXT message | ||
2421 | * | ||
2422 | * @param cls the client sending the message | ||
2423 | * @param message message from the client | ||
2424 | */ | ||
2425 | static void | 2331 | static void |
2426 | handle_ticket_iteration_next (void *cls, | 2332 | handle_ticket_iteration_next (void *cls, |
2427 | const struct TicketIterationNextMessage *tis_msg) | 2333 | const struct TicketIterationNextMessage *tis_msg) |
@@ -2453,9 +2359,8 @@ handle_ticket_iteration_next (void *cls, | |||
2453 | * Main function that will be run | 2359 | * Main function that will be run |
2454 | * | 2360 | * |
2455 | * @param cls closure | 2361 | * @param cls closure |
2456 | * @param args remaining command-line arguments | 2362 | * @param c the configuration used |
2457 | * @param cfgfile name of the configuration file used (for saving, can be NULL) | 2363 | * @param server the service handle |
2458 | * @param c configuration | ||
2459 | */ | 2364 | */ |
2460 | static void | 2365 | static void |
2461 | run (void *cls, | 2366 | run (void *cls, |
diff --git a/src/identity-provider/identity_provider.h b/src/identity-provider/identity_provider.h index be9fdc6f5..b1fe6e1fd 100644 --- a/src/identity-provider/identity_provider.h +++ b/src/identity-provider/identity_provider.h | |||
@@ -248,7 +248,7 @@ struct TicketIterationStopMessage | |||
248 | struct IssueTicketMessage | 248 | struct IssueTicketMessage |
249 | { | 249 | { |
250 | /** | 250 | /** |
251 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE | 251 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_ISSUE_TICKET |
252 | */ | 252 | */ |
253 | struct GNUNET_MessageHeader header; | 253 | struct GNUNET_MessageHeader header; |
254 | 254 | ||
@@ -281,7 +281,7 @@ struct IssueTicketMessage | |||
281 | struct RevokeTicketMessage | 281 | struct RevokeTicketMessage |
282 | { | 282 | { |
283 | /** | 283 | /** |
284 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE | 284 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET |
285 | */ | 285 | */ |
286 | struct GNUNET_MessageHeader header; | 286 | struct GNUNET_MessageHeader header; |
287 | 287 | ||
@@ -309,7 +309,7 @@ struct RevokeTicketMessage | |||
309 | struct RevokeTicketResultMessage | 309 | struct RevokeTicketResultMessage |
310 | { | 310 | { |
311 | /** | 311 | /** |
312 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE | 312 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_REVOKE_TICKET_RESULT |
313 | */ | 313 | */ |
314 | struct GNUNET_MessageHeader header; | 314 | struct GNUNET_MessageHeader header; |
315 | 315 | ||
@@ -348,7 +348,7 @@ struct TicketResultMessage | |||
348 | struct ConsumeTicketMessage | 348 | struct ConsumeTicketMessage |
349 | { | 349 | { |
350 | /** | 350 | /** |
351 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_TICKET_ISSUE | 351 | * Type will be #GNUNET_MESSAGE_TYPE_IDENTITY_PROVIDER_CONSUME_TICKET |
352 | */ | 352 | */ |
353 | struct GNUNET_MessageHeader header; | 353 | struct GNUNET_MessageHeader header; |
354 | 354 | ||
diff --git a/src/identity-provider/identity_provider_api.c b/src/identity-provider/identity_provider_api.c index 6fc8d228a..d0ece80fe 100644 --- a/src/identity-provider/identity_provider_api.c +++ b/src/identity-provider/identity_provider_api.c | |||
@@ -317,14 +317,13 @@ struct GNUNET_IDENTITY_PROVIDER_Handle | |||
317 | 317 | ||
318 | }; | 318 | }; |
319 | 319 | ||
320 | |||
321 | /** | 320 | /** |
322 | * Try again to connect to the service. | 321 | * Try again to connect to the service. |
323 | * | 322 | * |
324 | * @param cls handle to the service. | 323 | * @param h handle to the identity provider service. |
325 | */ | 324 | */ |
326 | static void | 325 | static void |
327 | reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *handle); | 326 | reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h); |
328 | 327 | ||
329 | /** | 328 | /** |
330 | * Reconnect | 329 | * Reconnect |
@@ -344,7 +343,7 @@ reconnect_task (void *cls) | |||
344 | /** | 343 | /** |
345 | * Disconnect from service and then reconnect. | 344 | * Disconnect from service and then reconnect. |
346 | * | 345 | * |
347 | * @param handle our handle | 346 | * @param handle our service |
348 | */ | 347 | */ |
349 | static void | 348 | static void |
350 | force_reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *handle) | 349 | force_reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *handle) |
@@ -775,7 +774,7 @@ handle_revoke_ticket_result (void *cls, | |||
775 | /** | 774 | /** |
776 | * Try again to connect to the service. | 775 | * Try again to connect to the service. |
777 | * | 776 | * |
778 | * @param cls handle to the identity provider service. | 777 | * @param h handle to the identity provider service. |
779 | */ | 778 | */ |
780 | static void | 779 | static void |
781 | reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) | 780 | reconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) |
@@ -895,8 +894,7 @@ GNUNET_IDENTITY_PROVIDER_disconnect (struct GNUNET_IDENTITY_PROVIDER_Handle *h) | |||
895 | * | 894 | * |
896 | * @param h handle to the identity provider | 895 | * @param h handle to the identity provider |
897 | * @param pkey private key of the identity | 896 | * @param pkey private key of the identity |
898 | * @param name the attribute name | 897 | * @param attr the attribute value |
899 | * @param value the attribute value | ||
900 | * @param cont continuation to call when done | 898 | * @param cont continuation to call when done |
901 | * @param cont_cls closure for @a cont | 899 | * @param cont_cls closure for @a cont |
902 | * @return handle to abort the request | 900 | * @return handle to abort the request |
@@ -1061,7 +1059,7 @@ GNUNET_IDENTITY_PROVIDER_get_attributes_stop (struct GNUNET_IDENTITY_PROVIDER_At | |||
1061 | * @param h the identity provider to use | 1059 | * @param h the identity provider to use |
1062 | * @param iss the issuing identity | 1060 | * @param iss the issuing identity |
1063 | * @param rp the subject of the ticket (the relying party) | 1061 | * @param rp the subject of the ticket (the relying party) |
1064 | * @param attr the attributes that the relying party is given access to | 1062 | * @param attrs the attributes that the relying party is given access to |
1065 | * @param cb the callback | 1063 | * @param cb the callback |
1066 | * @param cb_cls the callback closure | 1064 | * @param cb_cls the callback closure |
1067 | * @return handle to abort the operation | 1065 | * @return handle to abort the operation |
@@ -1108,7 +1106,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_issue (struct GNUNET_IDENTITY_PROVIDER_Handle *h | |||
1108 | * Consumes an issued ticket. The ticket is persisted | 1106 | * Consumes an issued ticket. The ticket is persisted |
1109 | * and used to retrieve identity information from the issuer | 1107 | * and used to retrieve identity information from the issuer |
1110 | * | 1108 | * |
1111 | * @param id the identity provider to use | 1109 | * @param h the identity provider to use |
1112 | * @param identity the identity that is the subject of the issued ticket (the relying party) | 1110 | * @param identity the identity that is the subject of the issued ticket (the relying party) |
1113 | * @param ticket the issued ticket to consume | 1111 | * @param ticket the issued ticket to consume |
1114 | * @param cb the callback to call | 1112 | * @param cb the callback to call |
@@ -1218,7 +1216,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_start (struct GNUNET_IDENTITY_PROVIDER | |||
1218 | * Lists all tickets that have been issued to remote | 1216 | * Lists all tickets that have been issued to remote |
1219 | * identites (relying parties) | 1217 | * identites (relying parties) |
1220 | * | 1218 | * |
1221 | * @param id the identity provider to use | 1219 | * @param h the identity provider to use |
1222 | * @param identity the issuing identity | 1220 | * @param identity the issuing identity |
1223 | * @param error_cb function to call on error (i.e. disconnect), | 1221 | * @param error_cb function to call on error (i.e. disconnect), |
1224 | * the handle is afterwards invalid | 1222 | * the handle is afterwards invalid |
@@ -1324,7 +1322,7 @@ GNUNET_IDENTITY_PROVIDER_ticket_iteration_stop (struct GNUNET_IDENTITY_PROVIDER_ | |||
1324 | * Revoked an issued ticket. The relying party will be unable to retrieve | 1322 | * Revoked an issued ticket. The relying party will be unable to retrieve |
1325 | * updated attributes. | 1323 | * updated attributes. |
1326 | * | 1324 | * |
1327 | * @param id the identity provider to use | 1325 | * @param h the identity provider to use |
1328 | * @param identity the issuing identity | 1326 | * @param identity the issuing identity |
1329 | * @param ticket the ticket to revoke | 1327 | * @param ticket the ticket to revoke |
1330 | * @param cb the callback | 1328 | * @param cb the callback |
diff --git a/src/identity-provider/plugin_gnsrecord_identity_provider.c b/src/identity-provider/plugin_gnsrecord_identity_provider.c index ad5a95dc7..6ed0b0852 100644 --- a/src/identity-provider/plugin_gnsrecord_identity_provider.c +++ b/src/identity-provider/plugin_gnsrecord_identity_provider.c | |||
@@ -19,9 +19,9 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * @file identity/plugin_gnsrecord_identity.c | 22 | * @file identity-provider/plugin_gnsrecord_identity_provider.c |
23 | * @brief gnsrecord plugin to provide the API for identity records | 23 | * @brief gnsrecord plugin to provide the API for identity records |
24 | * @author Christian Grothoff | 24 | * @author Martin Schanzenbach |
25 | */ | 25 | */ |
26 | #include "platform.h" | 26 | #include "platform.h" |
27 | #include "gnunet_util_lib.h" | 27 | #include "gnunet_util_lib.h" |
diff --git a/src/identity-provider/plugin_identity_provider_sqlite.c b/src/identity-provider/plugin_identity_provider_sqlite.c index 594e4788d..0071528b9 100644 --- a/src/identity-provider/plugin_identity_provider_sqlite.c +++ b/src/identity-provider/plugin_identity_provider_sqlite.c | |||
@@ -368,6 +368,7 @@ database_shutdown (struct Plugin *plugin) | |||
368 | * | 368 | * |
369 | * @param cls closure (internal context for the plugin) | 369 | * @param cls closure (internal context for the plugin) |
370 | * @param ticket the ticket to persist | 370 | * @param ticket the ticket to persist |
371 | * @param attrs the attributes associated with the ticket | ||
371 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 372 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
372 | */ | 373 | */ |
373 | static int | 374 | static int |
@@ -581,8 +582,7 @@ get_ticket_and_call_iterator (struct Plugin *plugin, | |||
581 | * Lookup tickets in the datastore. | 582 | * Lookup tickets in the datastore. |
582 | * | 583 | * |
583 | * @param cls closure (internal context for the plugin) | 584 | * @param cls closure (internal context for the plugin) |
584 | * @param zone private key of the zone | 585 | * @param ticket the ticket to retrieve attributes for |
585 | * @param label name of the record in the zone | ||
586 | * @param iter function to call with the result | 586 | * @param iter function to call with the result |
587 | * @param iter_cls closure for @a iter | 587 | * @param iter_cls closure for @a iter |
588 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 588 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
diff --git a/src/identity-provider/plugin_rest_identity_provider.c b/src/identity-provider/plugin_rest_identity_provider.c index c27662a0d..6eb856435 100644 --- a/src/identity-provider/plugin_rest_identity_provider.c +++ b/src/identity-provider/plugin_rest_identity_provider.c | |||
@@ -1103,17 +1103,6 @@ list_ego (void *cls, | |||
1103 | 1103 | ||
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | /** | ||
1107 | * Function processing the REST call | ||
1108 | * | ||
1109 | * @param method HTTP method | ||
1110 | * @param url URL of the HTTP request | ||
1111 | * @param data body of the HTTP request (optional) | ||
1112 | * @param data_size length of the body | ||
1113 | * @param proc callback function for the result | ||
1114 | * @param proc_cls closure for callback function | ||
1115 | * @return GNUNET_OK if request accepted | ||
1116 | */ | ||
1117 | static void | 1106 | static void |
1118 | rest_identity_process_request(struct GNUNET_REST_RequestHandle *rest_handle, | 1107 | rest_identity_process_request(struct GNUNET_REST_RequestHandle *rest_handle, |
1119 | GNUNET_REST_ResultProcessor proc, | 1108 | GNUNET_REST_ResultProcessor proc, |