diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-10-31 13:03:48 +0100 |
commit | 7e3cf5f461eb4fbb7581672bf0835da07c378136 (patch) | |
tree | bdc3874b7894242b095b892f1ed3e81a4d4f06c0 /src/reclaim | |
parent | 01b480d6d026e0c537dc284a7e7df2c0320a3528 (diff) | |
download | gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.tar.gz gnunet-7e3cf5f461eb4fbb7581672bf0835da07c378136.zip |
tighten formatting rules
Diffstat (limited to 'src/reclaim')
-rw-r--r-- | src/reclaim/gnunet-reclaim.c | 12 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 4 | ||||
-rw-r--r-- | src/reclaim/gnunet-service-reclaim_tickets.c | 4 | ||||
-rw-r--r-- | src/reclaim/json_reclaim.c | 6 | ||||
-rw-r--r-- | src/reclaim/oidc_helper.c | 11 | ||||
-rw-r--r-- | src/reclaim/oidc_helper.h | 1 | ||||
-rw-r--r-- | src/reclaim/plugin_gnsrecord_reclaim.c | 1 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_openid_connect.c | 20 | ||||
-rw-r--r-- | src/reclaim/plugin_rest_reclaim.c | 10 | ||||
-rw-r--r-- | src/reclaim/reclaim_api.c | 2 |
10 files changed, 67 insertions, 4 deletions
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c index c5f0ed4fa..58f8cd6e2 100644 --- a/src/reclaim/gnunet-reclaim.c +++ b/src/reclaim/gnunet-reclaim.c | |||
@@ -191,6 +191,7 @@ do_cleanup (void *cls) | |||
191 | GNUNET_free (attr_to_delete); | 191 | GNUNET_free (attr_to_delete); |
192 | } | 192 | } |
193 | 193 | ||
194 | |||
194 | static void | 195 | static void |
195 | ticket_issue_cb (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | 196 | ticket_issue_cb (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) |
196 | { | 197 | { |
@@ -209,6 +210,7 @@ ticket_issue_cb (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | |||
209 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 210 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
210 | } | 211 | } |
211 | 212 | ||
213 | |||
212 | static void | 214 | static void |
213 | store_attr_cont (void *cls, int32_t success, const char *emsg) | 215 | store_attr_cont (void *cls, int32_t success, const char *emsg) |
214 | { | 216 | { |
@@ -220,6 +222,7 @@ store_attr_cont (void *cls, int32_t success, const char *emsg) | |||
220 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 222 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
221 | } | 223 | } |
222 | 224 | ||
225 | |||
223 | static void | 226 | static void |
224 | process_attrs (void *cls, | 227 | process_attrs (void *cls, |
225 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 228 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
@@ -255,6 +258,7 @@ process_attrs (void *cls, | |||
255 | GNUNET_free (id); | 258 | GNUNET_free (id); |
256 | } | 259 | } |
257 | 260 | ||
261 | |||
258 | static void | 262 | static void |
259 | ticket_iter_err (void *cls) | 263 | ticket_iter_err (void *cls) |
260 | { | 264 | { |
@@ -263,6 +267,7 @@ ticket_iter_err (void *cls) | |||
263 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 267 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
264 | } | 268 | } |
265 | 269 | ||
270 | |||
266 | static void | 271 | static void |
267 | ticket_iter_fin (void *cls) | 272 | ticket_iter_fin (void *cls) |
268 | { | 273 | { |
@@ -270,6 +275,7 @@ ticket_iter_fin (void *cls) | |||
270 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 275 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
271 | } | 276 | } |
272 | 277 | ||
278 | |||
273 | static void | 279 | static void |
274 | ticket_iter (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | 280 | ticket_iter (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) |
275 | { | 281 | { |
@@ -292,6 +298,7 @@ ticket_iter (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | |||
292 | GNUNET_RECLAIM_ticket_iteration_next (ticket_iterator); | 298 | GNUNET_RECLAIM_ticket_iteration_next (ticket_iterator); |
293 | } | 299 | } |
294 | 300 | ||
301 | |||
295 | static void | 302 | static void |
296 | iter_error (void *cls) | 303 | iter_error (void *cls) |
297 | { | 304 | { |
@@ -300,6 +307,7 @@ iter_error (void *cls) | |||
300 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 307 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
301 | } | 308 | } |
302 | 309 | ||
310 | |||
303 | static void | 311 | static void |
304 | timeout_task (void *cls) | 312 | timeout_task (void *cls) |
305 | { | 313 | { |
@@ -310,6 +318,7 @@ timeout_task (void *cls) | |||
310 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 318 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
311 | } | 319 | } |
312 | 320 | ||
321 | |||
313 | static void | 322 | static void |
314 | process_rvk (void *cls, int success, const char *msg) | 323 | process_rvk (void *cls, int success, const char *msg) |
315 | { | 324 | { |
@@ -432,6 +441,7 @@ iter_finished (void *cls) | |||
432 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); | 441 | cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup, NULL); |
433 | } | 442 | } |
434 | 443 | ||
444 | |||
435 | static void | 445 | static void |
436 | iter_cb (void *cls, | 446 | iter_cb (void *cls, |
437 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 447 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
@@ -511,6 +521,7 @@ iter_cb (void *cls, | |||
511 | GNUNET_RECLAIM_get_attributes_next (attr_iterator); | 521 | GNUNET_RECLAIM_get_attributes_next (attr_iterator); |
512 | } | 522 | } |
513 | 523 | ||
524 | |||
514 | static void | 525 | static void |
515 | start_process () | 526 | start_process () |
516 | { | 527 | { |
@@ -565,6 +576,7 @@ start_process () | |||
565 | NULL); | 576 | NULL); |
566 | } | 577 | } |
567 | 578 | ||
579 | |||
568 | static int init = GNUNET_YES; | 580 | static int init = GNUNET_YES; |
569 | 581 | ||
570 | static void | 582 | static void |
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c index 440656343..a83ea05a6 100644 --- a/src/reclaim/gnunet-service-reclaim.c +++ b/src/reclaim/gnunet-service-reclaim.c | |||
@@ -712,7 +712,6 @@ handle_issue_ticket_message (void *cls, const struct IssueTicketMessage *im) | |||
712 | } | 712 | } |
713 | 713 | ||
714 | 714 | ||
715 | |||
716 | /********************************************************** | 715 | /********************************************************** |
717 | * Revocation | 716 | * Revocation |
718 | **********************************************************/ | 717 | **********************************************************/ |
@@ -880,6 +879,7 @@ handle_consume_ticket_message (void *cls, const struct ConsumeTicketMessage *cm) | |||
880 | GNUNET_SERVICE_client_continue (idp->client); | 879 | GNUNET_SERVICE_client_continue (idp->client); |
881 | } | 880 | } |
882 | 881 | ||
882 | |||
883 | /***************************************** | 883 | /***************************************** |
884 | * Attribute store | 884 | * Attribute store |
885 | *****************************************/ | 885 | *****************************************/ |
@@ -1355,6 +1355,7 @@ attr_iter_finished (void *cls) | |||
1355 | GNUNET_free (ai); | 1355 | GNUNET_free (ai); |
1356 | } | 1356 | } |
1357 | 1357 | ||
1358 | |||
1358 | /** | 1359 | /** |
1359 | * Error iterating over attributes. Abort. | 1360 | * Error iterating over attributes. Abort. |
1360 | * | 1361 | * |
@@ -1512,6 +1513,7 @@ handle_iteration_next (void *cls, | |||
1512 | GNUNET_SERVICE_client_continue (idp->client); | 1513 | GNUNET_SERVICE_client_continue (idp->client); |
1513 | } | 1514 | } |
1514 | 1515 | ||
1516 | |||
1515 | /****************************************************** | 1517 | /****************************************************** |
1516 | * Ticket iteration | 1518 | * Ticket iteration |
1517 | ******************************************************/ | 1519 | ******************************************************/ |
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c index 57c9e2167..4d1a26333 100644 --- a/src/reclaim/gnunet-service-reclaim_tickets.c +++ b/src/reclaim/gnunet-service-reclaim_tickets.c | |||
@@ -330,7 +330,6 @@ static struct GNUNET_GNS_Handle *gns; | |||
330 | static struct GNUNET_STATISTICS_Handle *stats; | 330 | static struct GNUNET_STATISTICS_Handle *stats; |
331 | 331 | ||
332 | 332 | ||
333 | |||
334 | /** | 333 | /** |
335 | * Cleanup revoke handle | 334 | * Cleanup revoke handle |
336 | * | 335 | * |
@@ -1265,6 +1264,7 @@ issue_ticket (struct TicketIssueHandle *ih) | |||
1265 | GNUNET_free (label); | 1264 | GNUNET_free (label); |
1266 | } | 1265 | } |
1267 | 1266 | ||
1267 | |||
1268 | /************************************************* | 1268 | /************************************************* |
1269 | * Ticket iteration (finding a specific ticket) | 1269 | * Ticket iteration (finding a specific ticket) |
1270 | *************************************************/ | 1270 | *************************************************/ |
@@ -1359,7 +1359,7 @@ filter_tickets_cb (void *cls, | |||
1359 | * If we found a matching ticket, return that to the caller and | 1359 | * If we found a matching ticket, return that to the caller and |
1360 | * we are done. | 1360 | * we are done. |
1361 | */ | 1361 | */ |
1362 | if ((attr_cnt == found_attrs_cnt)&&(NULL != ticket)) | 1362 | if ((attr_cnt == found_attrs_cnt) && (NULL != ticket)) |
1363 | { | 1363 | { |
1364 | GNUNET_NAMESTORE_zone_iteration_stop (tih->ns_it); | 1364 | GNUNET_NAMESTORE_zone_iteration_stop (tih->ns_it); |
1365 | tih->cb (tih->cb_cls, &tih->ticket, GNUNET_OK, NULL); | 1365 | tih->cb (tih->cb_cls, &tih->ticket, GNUNET_OK, NULL); |
diff --git a/src/reclaim/json_reclaim.c b/src/reclaim/json_reclaim.c index fa3901e43..e029fdfb6 100644 --- a/src/reclaim/json_reclaim.c +++ b/src/reclaim/json_reclaim.c | |||
@@ -102,6 +102,7 @@ parse_attr (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec) | |||
102 | return GNUNET_OK; | 102 | return GNUNET_OK; |
103 | } | 103 | } |
104 | 104 | ||
105 | |||
105 | /** | 106 | /** |
106 | * Cleanup data left from parsing RSA public key. | 107 | * Cleanup data left from parsing RSA public key. |
107 | * | 108 | * |
@@ -121,6 +122,7 @@ clean_attr (void *cls, struct GNUNET_JSON_Specification *spec) | |||
121 | } | 122 | } |
122 | } | 123 | } |
123 | 124 | ||
125 | |||
124 | /** | 126 | /** |
125 | * JSON Specification for Reclaim claims. | 127 | * JSON Specification for Reclaim claims. |
126 | * | 128 | * |
@@ -141,6 +143,8 @@ GNUNET_RECLAIM_JSON_spec_claim (struct GNUNET_RECLAIM_ATTRIBUTE_Claim **attr) | |||
141 | *attr = NULL; | 143 | *attr = NULL; |
142 | return ret; | 144 | return ret; |
143 | } | 145 | } |
146 | |||
147 | |||
144 | /** | 148 | /** |
145 | * Parse given JSON object to a ticket | 149 | * Parse given JSON object to a ticket |
146 | * | 150 | * |
@@ -219,6 +223,7 @@ parse_ticket (void *cls, json_t *root, struct GNUNET_JSON_Specification *spec) | |||
219 | return GNUNET_OK; | 223 | return GNUNET_OK; |
220 | } | 224 | } |
221 | 225 | ||
226 | |||
222 | /** | 227 | /** |
223 | * Cleanup data left from parsing RSA public key. | 228 | * Cleanup data left from parsing RSA public key. |
224 | * | 229 | * |
@@ -238,6 +243,7 @@ clean_ticket (void *cls, struct GNUNET_JSON_Specification *spec) | |||
238 | } | 243 | } |
239 | } | 244 | } |
240 | 245 | ||
246 | |||
241 | /** | 247 | /** |
242 | * JSON Specification for Reclaim tickets. | 248 | * JSON Specification for Reclaim tickets. |
243 | * | 249 | * |
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c index 6bcae21d4..1c3d65f35 100644 --- a/src/reclaim/oidc_helper.c +++ b/src/reclaim/oidc_helper.c | |||
@@ -79,6 +79,7 @@ create_jwt_header (void) | |||
79 | return json_str; | 79 | return json_str; |
80 | } | 80 | } |
81 | 81 | ||
82 | |||
82 | static void | 83 | static void |
83 | replace_char (char *str, char find, char replace) | 84 | replace_char (char *str, char find, char replace) |
84 | { | 85 | { |
@@ -91,6 +92,7 @@ replace_char (char *str, char find, char replace) | |||
91 | } | 92 | } |
92 | } | 93 | } |
93 | 94 | ||
95 | |||
94 | // RFC4648 | 96 | // RFC4648 |
95 | static void | 97 | static void |
96 | fix_base64 (char *str) | 98 | fix_base64 (char *str) |
@@ -102,6 +104,7 @@ fix_base64 (char *str) | |||
102 | replace_char (str, '/', '_'); | 104 | replace_char (str, '/', '_'); |
103 | } | 105 | } |
104 | 106 | ||
107 | |||
105 | /** | 108 | /** |
106 | * Create a JWT from attributes | 109 | * Create a JWT from attributes |
107 | * | 110 | * |
@@ -229,6 +232,7 @@ OIDC_id_token_new (const struct GNUNET_CRYPTO_EcdsaPublicKey *aud_key, | |||
229 | return result; | 232 | return result; |
230 | } | 233 | } |
231 | 234 | ||
235 | |||
232 | /* Converts a hex character to its integer value */ | 236 | /* Converts a hex character to its integer value */ |
233 | static char | 237 | static char |
234 | from_hex (char ch) | 238 | from_hex (char ch) |
@@ -236,6 +240,7 @@ from_hex (char ch) | |||
236 | return isdigit (ch) ? ch - '0' : tolower (ch) - 'a' + 10; | 240 | return isdigit (ch) ? ch - '0' : tolower (ch) - 'a' + 10; |
237 | } | 241 | } |
238 | 242 | ||
243 | |||
239 | /* Converts an integer value to its hex character*/ | 244 | /* Converts an integer value to its hex character*/ |
240 | static char | 245 | static char |
241 | to_hex (char code) | 246 | to_hex (char code) |
@@ -245,6 +250,7 @@ to_hex (char code) | |||
245 | return hex[code & 15]; | 250 | return hex[code & 15]; |
246 | } | 251 | } |
247 | 252 | ||
253 | |||
248 | /* Returns a url-encoded version of str */ | 254 | /* Returns a url-encoded version of str */ |
249 | /* IMPORTANT: be sure to free() the returned string after use */ | 255 | /* IMPORTANT: be sure to free() the returned string after use */ |
250 | static char * | 256 | static char * |
@@ -307,6 +313,7 @@ url_decode (const char *str) | |||
307 | return buf; | 313 | return buf; |
308 | } | 314 | } |
309 | 315 | ||
316 | |||
310 | /** | 317 | /** |
311 | * Returns base64 encoded string urlencoded | 318 | * Returns base64 encoded string urlencoded |
312 | * | 319 | * |
@@ -440,6 +447,7 @@ encrypt_payload (const struct GNUNET_CRYPTO_EcdsaPublicKey *ecdsa_pub, | |||
440 | GNUNET_CRYPTO_symmetric_encrypt (payload, payload_len, &key, &iv, buf)); | 447 | GNUNET_CRYPTO_symmetric_encrypt (payload, payload_len, &key, &iv, buf)); |
441 | } | 448 | } |
442 | 449 | ||
450 | |||
443 | /** | 451 | /** |
444 | * Builds an OIDC authorization code including | 452 | * Builds an OIDC authorization code including |
445 | * a reclaim ticket and nonce | 453 | * a reclaim ticket and nonce |
@@ -481,7 +489,7 @@ OIDC_build_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *issuer, | |||
481 | // Assign nonce | 489 | // Assign nonce |
482 | nonce = 0; | 490 | nonce = 0; |
483 | payload_len = sizeof(struct OIDC_Parameters); | 491 | payload_len = sizeof(struct OIDC_Parameters); |
484 | if ((NULL != nonce_str)&& (strcmp ("", nonce_str) != 0)) | 492 | if ((NULL != nonce_str) && (strcmp ("", nonce_str) != 0)) |
485 | { | 493 | { |
486 | if ((1 != sscanf (nonce_str, "%u", &nonce)) || (nonce > UINT32_MAX)) | 494 | if ((1 != sscanf (nonce_str, "%u", &nonce)) || (nonce > UINT32_MAX)) |
487 | { | 495 | { |
@@ -753,6 +761,7 @@ OIDC_build_token_response (const char *access_token, | |||
753 | json_decref (root_json); | 761 | json_decref (root_json); |
754 | } | 762 | } |
755 | 763 | ||
764 | |||
756 | /** | 765 | /** |
757 | * Generate a new access token | 766 | * Generate a new access token |
758 | */ | 767 | */ |
diff --git a/src/reclaim/oidc_helper.h b/src/reclaim/oidc_helper.h index fa3d7f2d9..1774618e8 100644 --- a/src/reclaim/oidc_helper.h +++ b/src/reclaim/oidc_helper.h | |||
@@ -109,6 +109,7 @@ OIDC_build_token_response (const char *access_token, | |||
109 | const char *id_token, | 109 | const char *id_token, |
110 | const struct GNUNET_TIME_Relative *expiration_time, | 110 | const struct GNUNET_TIME_Relative *expiration_time, |
111 | char **token_response); | 111 | char **token_response); |
112 | |||
112 | /** | 113 | /** |
113 | * Generate a new access token | 114 | * Generate a new access token |
114 | */ | 115 | */ |
diff --git a/src/reclaim/plugin_gnsrecord_reclaim.c b/src/reclaim/plugin_gnsrecord_reclaim.c index e4d1adfde..d530ef01d 100644 --- a/src/reclaim/plugin_gnsrecord_reclaim.c +++ b/src/reclaim/plugin_gnsrecord_reclaim.c | |||
@@ -194,4 +194,5 @@ libgnunet_plugin_gnsrecord_reclaim_done (void *cls) | |||
194 | return NULL; | 194 | return NULL; |
195 | } | 195 | } |
196 | 196 | ||
197 | |||
197 | /* end of plugin_gnsrecord_dns.c */ | 198 | /* end of plugin_gnsrecord_dns.c */ |
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c index a4a368ab5..92a1de621 100644 --- a/src/reclaim/plugin_rest_openid_connect.c +++ b/src/reclaim/plugin_rest_openid_connect.c | |||
@@ -576,6 +576,7 @@ cleanup_handle (struct RequestHandle *handle) | |||
576 | GNUNET_free (handle); | 576 | GNUNET_free (handle); |
577 | } | 577 | } |
578 | 578 | ||
579 | |||
579 | static void | 580 | static void |
580 | cleanup_handle_delayed (void *cls) | 581 | cleanup_handle_delayed (void *cls) |
581 | { | 582 | { |
@@ -667,6 +668,7 @@ do_redirect_error (void *cls) | |||
667 | GNUNET_free (redirect); | 668 | GNUNET_free (redirect); |
668 | } | 669 | } |
669 | 670 | ||
671 | |||
670 | /** | 672 | /** |
671 | * Task run on timeout, sends error message. Cleans up everything. | 673 | * Task run on timeout, sends error message. Cleans up everything. |
672 | * | 674 | * |
@@ -681,6 +683,7 @@ do_timeout (void *cls) | |||
681 | do_error (handle); | 683 | do_error (handle); |
682 | } | 684 | } |
683 | 685 | ||
686 | |||
684 | /** | 687 | /** |
685 | * Return attributes for claim | 688 | * Return attributes for claim |
686 | * | 689 | * |
@@ -817,6 +820,7 @@ cookie_identity_interpretation (struct RequestHandle *handle) | |||
817 | GNUNET_free (cookies); | 820 | GNUNET_free (cookies); |
818 | } | 821 | } |
819 | 822 | ||
823 | |||
820 | /** | 824 | /** |
821 | * Redirects to login page stored in configuration file | 825 | * Redirects to login page stored in configuration file |
822 | */ | 826 | */ |
@@ -868,6 +872,7 @@ login_redirect (void *cls) | |||
868 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); | 872 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); |
869 | } | 873 | } |
870 | 874 | ||
875 | |||
871 | /** | 876 | /** |
872 | * Does internal server error when iteration failed. | 877 | * Does internal server error when iteration failed. |
873 | */ | 878 | */ |
@@ -943,6 +948,7 @@ oidc_ticket_issue_cb (void *cls, const struct GNUNET_RECLAIM_Ticket *ticket) | |||
943 | GNUNET_free (code_string); | 948 | GNUNET_free (code_string); |
944 | } | 949 | } |
945 | 950 | ||
951 | |||
946 | static void | 952 | static void |
947 | oidc_collect_finished_cb (void *cls) | 953 | oidc_collect_finished_cb (void *cls) |
948 | { | 954 | { |
@@ -1226,6 +1232,7 @@ client_redirect (void *cls) | |||
1226 | handle); | 1232 | handle); |
1227 | } | 1233 | } |
1228 | 1234 | ||
1235 | |||
1229 | static char * | 1236 | static char * |
1230 | get_url_parameter_copy (const struct RequestHandle *handle, const char *key) | 1237 | get_url_parameter_copy (const struct RequestHandle *handle, const char *key) |
1231 | { | 1238 | { |
@@ -1358,6 +1365,7 @@ build_authz_response (void *cls) | |||
1358 | GNUNET_SCHEDULER_add_now (&client_redirect, handle); | 1365 | GNUNET_SCHEDULER_add_now (&client_redirect, handle); |
1359 | } | 1366 | } |
1360 | 1367 | ||
1368 | |||
1361 | /** | 1369 | /** |
1362 | * Iterate over tlds in config | 1370 | * Iterate over tlds in config |
1363 | */ | 1371 | */ |
@@ -1377,6 +1385,7 @@ tld_iter (void *cls, const char *section, const char *option, const char *value) | |||
1377 | handle->tld = GNUNET_strdup (option + 1); | 1385 | handle->tld = GNUNET_strdup (option + 1); |
1378 | } | 1386 | } |
1379 | 1387 | ||
1388 | |||
1380 | /** | 1389 | /** |
1381 | * Responds to authorization GET and url-encoded POST request | 1390 | * Responds to authorization GET and url-encoded POST request |
1382 | * | 1391 | * |
@@ -1452,6 +1461,7 @@ authorize_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1452 | GNUNET_SCHEDULER_add_now (&build_authz_response, handle); | 1461 | GNUNET_SCHEDULER_add_now (&build_authz_response, handle); |
1453 | } | 1462 | } |
1454 | 1463 | ||
1464 | |||
1455 | /** | 1465 | /** |
1456 | * Combines an identity with a login time and responds OK to login request | 1466 | * Combines an identity with a login time and responds OK to login request |
1457 | * | 1467 | * |
@@ -1522,6 +1532,7 @@ login_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
1522 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); | 1532 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); |
1523 | } | 1533 | } |
1524 | 1534 | ||
1535 | |||
1525 | static int | 1536 | static int |
1526 | check_authorization (struct RequestHandle *handle, | 1537 | check_authorization (struct RequestHandle *handle, |
1527 | struct GNUNET_CRYPTO_EcdsaPublicKey *cid) | 1538 | struct GNUNET_CRYPTO_EcdsaPublicKey *cid) |
@@ -1640,6 +1651,7 @@ check_authorization (struct RequestHandle *handle, | |||
1640 | return GNUNET_OK; | 1651 | return GNUNET_OK; |
1641 | } | 1652 | } |
1642 | 1653 | ||
1654 | |||
1643 | const struct EgoEntry * | 1655 | const struct EgoEntry * |
1644 | find_ego (struct RequestHandle *handle, | 1656 | find_ego (struct RequestHandle *handle, |
1645 | struct GNUNET_CRYPTO_EcdsaPublicKey *test_key) | 1657 | struct GNUNET_CRYPTO_EcdsaPublicKey *test_key) |
@@ -1657,6 +1669,7 @@ find_ego (struct RequestHandle *handle, | |||
1657 | return NULL; | 1669 | return NULL; |
1658 | } | 1670 | } |
1659 | 1671 | ||
1672 | |||
1660 | static void | 1673 | static void |
1661 | persist_access_token (const struct RequestHandle *handle, | 1674 | persist_access_token (const struct RequestHandle *handle, |
1662 | const char *access_token, | 1675 | const char *access_token, |
@@ -1676,6 +1689,7 @@ persist_access_token (const struct RequestHandle *handle, | |||
1676 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 1689 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
1677 | } | 1690 | } |
1678 | 1691 | ||
1692 | |||
1679 | /** | 1693 | /** |
1680 | * Responds to token url-encoded POST request | 1694 | * Responds to token url-encoded POST request |
1681 | * | 1695 | * |
@@ -1841,6 +1855,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle, | |||
1841 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); | 1855 | GNUNET_SCHEDULER_add_now (&cleanup_handle_delayed, handle); |
1842 | } | 1856 | } |
1843 | 1857 | ||
1858 | |||
1844 | /** | 1859 | /** |
1845 | * Collects claims and stores them in handle | 1860 | * Collects claims and stores them in handle |
1846 | */ | 1861 | */ |
@@ -1866,6 +1881,7 @@ consume_ticket (void *cls, | |||
1866 | GNUNET_free (tmp_value); | 1881 | GNUNET_free (tmp_value); |
1867 | } | 1882 | } |
1868 | 1883 | ||
1884 | |||
1869 | /** | 1885 | /** |
1870 | * Responds to userinfo GET and url-encoded POST request | 1886 | * Responds to userinfo GET and url-encoded POST request |
1871 | * | 1887 | * |
@@ -2002,6 +2018,7 @@ init_cont (struct RequestHandle *handle) | |||
2002 | } | 2018 | } |
2003 | } | 2019 | } |
2004 | 2020 | ||
2021 | |||
2005 | /** | 2022 | /** |
2006 | * If listing is enabled, prints information about the egos. | 2023 | * If listing is enabled, prints information about the egos. |
2007 | * | 2024 | * |
@@ -2108,6 +2125,7 @@ list_ego (void *cls, | |||
2108 | } | 2125 | } |
2109 | } | 2126 | } |
2110 | 2127 | ||
2128 | |||
2111 | static void | 2129 | static void |
2112 | rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, | 2130 | rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, |
2113 | GNUNET_REST_ResultProcessor proc, | 2131 | GNUNET_REST_ResultProcessor proc, |
@@ -2140,6 +2158,7 @@ rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, | |||
2140 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected\n"); | 2158 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected\n"); |
2141 | } | 2159 | } |
2142 | 2160 | ||
2161 | |||
2143 | /** | 2162 | /** |
2144 | * Entry point for the plugin. | 2163 | * Entry point for the plugin. |
2145 | * | 2164 | * |
@@ -2213,4 +2232,5 @@ libgnunet_plugin_rest_openid_connect_done (void *cls) | |||
2213 | return NULL; | 2232 | return NULL; |
2214 | } | 2233 | } |
2215 | 2234 | ||
2235 | |||
2216 | /* end of plugin_rest_openid_connect.c */ | 2236 | /* end of plugin_rest_openid_connect.c */ |
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c index fd35059d7..9a75b2d16 100644 --- a/src/reclaim/plugin_rest_reclaim.c +++ b/src/reclaim/plugin_rest_reclaim.c | |||
@@ -287,6 +287,7 @@ cleanup_handle (struct RequestHandle *handle) | |||
287 | GNUNET_free (handle); | 287 | GNUNET_free (handle); |
288 | } | 288 | } |
289 | 289 | ||
290 | |||
290 | static void | 291 | static void |
291 | cleanup_handle_delayed (void *cls) | 292 | cleanup_handle_delayed (void *cls) |
292 | { | 293 | { |
@@ -342,6 +343,7 @@ collect_error_cb (void *cls) | |||
342 | do_error (handle); | 343 | do_error (handle); |
343 | } | 344 | } |
344 | 345 | ||
346 | |||
345 | static void | 347 | static void |
346 | finished_cont (void *cls, int32_t success, const char *emsg) | 348 | finished_cont (void *cls, int32_t success, const char *emsg) |
347 | { | 349 | { |
@@ -379,6 +381,7 @@ return_response (void *cls) | |||
379 | cleanup_handle (handle); | 381 | cleanup_handle (handle); |
380 | } | 382 | } |
381 | 383 | ||
384 | |||
382 | static void | 385 | static void |
383 | collect_finished_cb (void *cls) | 386 | collect_finished_cb (void *cls) |
384 | { | 387 | { |
@@ -818,6 +821,7 @@ revoke_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
818 | GNUNET_JSON_parse_free (tktspec); | 821 | GNUNET_JSON_parse_free (tktspec); |
819 | } | 822 | } |
820 | 823 | ||
824 | |||
821 | static void | 825 | static void |
822 | consume_cont (void *cls, | 826 | consume_cont (void *cls, |
823 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, | 827 | const struct GNUNET_CRYPTO_EcdsaPublicKey *identity, |
@@ -850,6 +854,7 @@ consume_cont (void *cls, | |||
850 | GNUNET_free (val_str); | 854 | GNUNET_free (val_str); |
851 | } | 855 | } |
852 | 856 | ||
857 | |||
853 | static void | 858 | static void |
854 | consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, | 859 | consume_ticket_cont (struct GNUNET_REST_RequestHandle *con_handle, |
855 | const char *url, | 860 | const char *url, |
@@ -943,6 +948,7 @@ options_cont (struct GNUNET_REST_RequestHandle *con_handle, | |||
943 | return; | 948 | return; |
944 | } | 949 | } |
945 | 950 | ||
951 | |||
946 | /** | 952 | /** |
947 | * Handle rest request | 953 | * Handle rest request |
948 | * | 954 | * |
@@ -982,6 +988,7 @@ init_cont (struct RequestHandle *handle) | |||
982 | } | 988 | } |
983 | } | 989 | } |
984 | 990 | ||
991 | |||
985 | /** | 992 | /** |
986 | * If listing is enabled, prints information about the egos. | 993 | * If listing is enabled, prints information about the egos. |
987 | * | 994 | * |
@@ -1044,6 +1051,7 @@ list_ego (void *cls, | |||
1044 | } | 1051 | } |
1045 | } | 1052 | } |
1046 | 1053 | ||
1054 | |||
1047 | static void | 1055 | static void |
1048 | rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, | 1056 | rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, |
1049 | GNUNET_REST_ResultProcessor proc, | 1057 | GNUNET_REST_ResultProcessor proc, |
@@ -1068,6 +1076,7 @@ rest_identity_process_request (struct GNUNET_REST_RequestHandle *rest_handle, | |||
1068 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected\n"); | 1076 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected\n"); |
1069 | } | 1077 | } |
1070 | 1078 | ||
1079 | |||
1071 | /** | 1080 | /** |
1072 | * Entry point for the plugin. | 1081 | * Entry point for the plugin. |
1073 | * | 1082 | * |
@@ -1124,4 +1133,5 @@ libgnunet_plugin_rest_reclaim_done (void *cls) | |||
1124 | return NULL; | 1133 | return NULL; |
1125 | } | 1134 | } |
1126 | 1135 | ||
1136 | |||
1127 | /* end of plugin_rest_reclaim.c */ | 1137 | /* end of plugin_rest_reclaim.c */ |
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c index 3e03d973b..7d4d7588a 100644 --- a/src/reclaim/reclaim_api.c +++ b/src/reclaim/reclaim_api.c | |||
@@ -370,6 +370,7 @@ free_it (struct GNUNET_RECLAIM_AttributeIterator *it) | |||
370 | GNUNET_free (it); | 370 | GNUNET_free (it); |
371 | } | 371 | } |
372 | 372 | ||
373 | |||
373 | /** | 374 | /** |
374 | * Free @a op | 375 | * Free @a op |
375 | * | 376 | * |
@@ -832,6 +833,7 @@ GNUNET_RECLAIM_disconnect (struct GNUNET_RECLAIM_Handle *h) | |||
832 | GNUNET_free (h); | 833 | GNUNET_free (h); |
833 | } | 834 | } |
834 | 835 | ||
836 | |||
835 | /** | 837 | /** |
836 | * Store an attribute. If the attribute is already present, | 838 | * Store an attribute. If the attribute is already present, |
837 | * it is replaced with the new attribute. | 839 | * it is replaced with the new attribute. |