diff options
author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-02-03 21:51:57 +0100 |
---|---|---|
committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2020-02-09 20:38:10 +0100 |
commit | 5b6bb2ce4d60635b2af950d72b45f12686fd5218 (patch) | |
tree | ef3b5786591f6a8473a4a2174dd95a439f22af68 /src/reclaim/gnunet-service-reclaim.c | |
parent | 99d70615e37294d4f964992c6be0495e95777a27 (diff) | |
download | gnunet-5b6bb2ce4d60635b2af950d72b45f12686fd5218.tar.gz gnunet-5b6bb2ce4d60635b2af950d72b45f12686fd5218.zip |
move to 256-bit identifier; some cleanups
Diffstat (limited to 'src/reclaim/gnunet-service-reclaim.c')
-rw-r--r-- | src/reclaim/gnunet-service-reclaim.c | 91 |
1 files changed, 57 insertions, 34 deletions
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c index 556006af0..a00bc5730 100644 --- a/src/reclaim/gnunet-service-reclaim.c +++ b/src/reclaim/gnunet-service-reclaim.c | |||
@@ -968,12 +968,12 @@ attr_store_task (void *cls) | |||
968 | buf_size = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (ash->claim); | 968 | buf_size = GNUNET_RECLAIM_ATTRIBUTE_serialize_get_size (ash->claim); |
969 | buf = GNUNET_malloc (buf_size); | 969 | buf = GNUNET_malloc (buf_size); |
970 | // Give the ash a new id if unset | 970 | // Give the ash a new id if unset |
971 | if (0 == ash->claim->id) | 971 | if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->claim->id)) |
972 | ash->claim->id | 972 | GNUNET_RECLAIM_id_generate (&ash->claim->id); |
973 | = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX); | ||
974 | GNUNET_RECLAIM_ATTRIBUTE_serialize (ash->claim, buf); | 973 | GNUNET_RECLAIM_ATTRIBUTE_serialize (ash->claim, buf); |
975 | label | 974 | label |
976 | = GNUNET_STRINGS_data_to_string_alloc (&ash->claim->id, sizeof(uint64_t)); | 975 | = GNUNET_STRINGS_data_to_string_alloc (&ash->claim->id, |
976 | sizeof (ash->reference->id)); | ||
977 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypting with label %s\n", label); | 977 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Encrypting with label %s\n", label); |
978 | 978 | ||
979 | rd[0].data_size = buf_size; | 979 | rd[0].data_size = buf_size; |
@@ -1086,6 +1086,7 @@ attest_store_cont (void *cls, int32_t success, const char *emsg) | |||
1086 | cleanup_as_handle (ash); | 1086 | cleanup_as_handle (ash); |
1087 | } | 1087 | } |
1088 | 1088 | ||
1089 | |||
1089 | /** | 1090 | /** |
1090 | * Send a reference error response | 1091 | * Send a reference error response |
1091 | * | 1092 | * |
@@ -1111,6 +1112,7 @@ send_ref_error (struct AttributeStoreHandle *ash) | |||
1111 | cleanup_as_handle (ash); | 1112 | cleanup_as_handle (ash); |
1112 | } | 1113 | } |
1113 | 1114 | ||
1115 | |||
1114 | /** | 1116 | /** |
1115 | * Error looking up potential attestation. Abort. | 1117 | * Error looking up potential attestation. Abort. |
1116 | * | 1118 | * |
@@ -1127,6 +1129,7 @@ attest_error (void *cls) | |||
1127 | return; | 1129 | return; |
1128 | } | 1130 | } |
1129 | 1131 | ||
1132 | |||
1130 | /** | 1133 | /** |
1131 | * Check for existing record before storing reference | 1134 | * Check for existing record before storing reference |
1132 | * | 1135 | * |
@@ -1149,7 +1152,7 @@ attest_add_cb (void *cls, | |||
1149 | buf_size = GNUNET_RECLAIM_ATTESTATION_serialize_get_size (ash->attest); | 1152 | buf_size = GNUNET_RECLAIM_ATTESTATION_serialize_get_size (ash->attest); |
1150 | buf = GNUNET_malloc (buf_size); | 1153 | buf = GNUNET_malloc (buf_size); |
1151 | GNUNET_RECLAIM_ATTESTATION_serialize (ash->attest, buf); | 1154 | GNUNET_RECLAIM_ATTESTATION_serialize (ash->attest, buf); |
1152 | if (0 == rd_count ) | 1155 | if (0 == rd_count) |
1153 | { | 1156 | { |
1154 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1157 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1155 | "Storing new Attestation\n"); | 1158 | "Storing new Attestation\n"); |
@@ -1198,6 +1201,7 @@ attest_add_cb (void *cls, | |||
1198 | GNUNET_free (buf); | 1201 | GNUNET_free (buf); |
1199 | } | 1202 | } |
1200 | 1203 | ||
1204 | |||
1201 | /** | 1205 | /** |
1202 | * Add a new attestation | 1206 | * Add a new attestation |
1203 | * | 1207 | * |
@@ -1210,11 +1214,10 @@ attest_store_task (void *cls) | |||
1210 | char *label; | 1214 | char *label; |
1211 | 1215 | ||
1212 | // Give the ash a new id if unset | 1216 | // Give the ash a new id if unset |
1213 | if (0 == ash->attest->id) | 1217 | if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->attest->id)) |
1214 | ash->attest->id | 1218 | GNUNET_RECLAIM_id_generate (&ash->attest->id); |
1215 | = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_STRONG, UINT64_MAX); | ||
1216 | label = GNUNET_STRINGS_data_to_string_alloc (&ash->attest->id, | 1219 | label = GNUNET_STRINGS_data_to_string_alloc (&ash->attest->id, |
1217 | sizeof(uint64_t)); | 1220 | sizeof (ash->attest->id)); |
1218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1221 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1219 | "Looking up existing data under label %s\n", label); | 1222 | "Looking up existing data under label %s\n", label); |
1220 | // Test for the content of the existing ID | 1223 | // Test for the content of the existing ID |
@@ -1228,6 +1231,7 @@ attest_store_task (void *cls) | |||
1228 | GNUNET_free (label); | 1231 | GNUNET_free (label); |
1229 | } | 1232 | } |
1230 | 1233 | ||
1234 | |||
1231 | /** | 1235 | /** |
1232 | * Check an attestation store message | 1236 | * Check an attestation store message |
1233 | * | 1237 | * |
@@ -1249,6 +1253,7 @@ check_attestation_store_message (void *cls, | |||
1249 | return GNUNET_OK; | 1253 | return GNUNET_OK; |
1250 | } | 1254 | } |
1251 | 1255 | ||
1256 | |||
1252 | /** | 1257 | /** |
1253 | * Handle an attestation store message | 1258 | * Handle an attestation store message |
1254 | * | 1259 | * |
@@ -1282,6 +1287,7 @@ handle_attestation_store_message (void *cls, | |||
1282 | GNUNET_SCHEDULER_add_now (&attest_store_task, ash); | 1287 | GNUNET_SCHEDULER_add_now (&attest_store_task, ash); |
1283 | } | 1288 | } |
1284 | 1289 | ||
1290 | |||
1285 | /** | 1291 | /** |
1286 | * Error looking up potential reference value. Abort. | 1292 | * Error looking up potential reference value. Abort. |
1287 | * | 1293 | * |
@@ -1298,6 +1304,7 @@ ref_error (void *cls) | |||
1298 | return; | 1304 | return; |
1299 | } | 1305 | } |
1300 | 1306 | ||
1307 | |||
1301 | /** | 1308 | /** |
1302 | * Error looking up potential reference value. Abort. | 1309 | * Error looking up potential reference value. Abort. |
1303 | * | 1310 | * |
@@ -1313,6 +1320,8 @@ ref_del_error (void *cls) | |||
1313 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); | 1320 | GNUNET_SCHEDULER_add_now (&do_shutdown, NULL); |
1314 | return; | 1321 | return; |
1315 | } | 1322 | } |
1323 | |||
1324 | |||
1316 | /** | 1325 | /** |
1317 | * Reference store result handler | 1326 | * Reference store result handler |
1318 | * | 1327 | * |
@@ -1375,7 +1384,7 @@ ref_add_cb (void *cls, | |||
1375 | GNUNET_RECLAIM_ATTESTATION_REF_serialize (ash->reference, buf); | 1384 | GNUNET_RECLAIM_ATTESTATION_REF_serialize (ash->reference, buf); |
1376 | struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *ref; | 1385 | struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *ref; |
1377 | char *data_tmp; | 1386 | char *data_tmp; |
1378 | if (0 == rd_count ) | 1387 | if (0 == rd_count) |
1379 | { | 1388 | { |
1380 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1389 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1381 | "Failed to find Attestation entry for Attestation reference\n"); | 1390 | "Failed to find Attestation entry for Attestation reference\n"); |
@@ -1398,7 +1407,7 @@ ref_add_cb (void *cls, | |||
1398 | ref = GNUNET_RECLAIM_ATTESTATION_REF_deserialize (data_tmp, htons ( | 1407 | ref = GNUNET_RECLAIM_ATTESTATION_REF_deserialize (data_tmp, htons ( |
1399 | rd[i].data_size)); | 1408 | rd[i].data_size)); |
1400 | rd_new[i] = rd[i]; | 1409 | rd_new[i] = rd[i]; |
1401 | if ((strcmp (ash->reference->name,ref->name) == 0)&& | 1410 | if ((strcmp (ash->reference->name,ref->name) == 0) && |
1402 | (strcmp (ash->reference->reference_value,ref->reference_value)==0) ) | 1411 | (strcmp (ash->reference->reference_value,ref->reference_value)==0) ) |
1403 | { | 1412 | { |
1404 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1413 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -1423,6 +1432,7 @@ ref_add_cb (void *cls, | |||
1423 | GNUNET_free (buf); | 1432 | GNUNET_free (buf); |
1424 | } | 1433 | } |
1425 | 1434 | ||
1435 | |||
1426 | /** | 1436 | /** |
1427 | * Add a new reference | 1437 | * Add a new reference |
1428 | * | 1438 | * |
@@ -1437,13 +1447,11 @@ reference_store_task (void *cls) | |||
1437 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Storing reference\n"); | 1447 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Storing reference\n"); |
1438 | 1448 | ||
1439 | // Give the ash a new id if unset | 1449 | // Give the ash a new id if unset |
1440 | if (0 == ash->reference->id) | 1450 | if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->reference->id)) |
1441 | { | 1451 | { |
1442 | if (0 == ash->reference->id_attest) | 1452 | if (GNUNET_YES == GNUNET_RECLAIM_id_is_zero (&ash->reference->id_attest)) |
1443 | { | 1453 | { |
1444 | ash->reference->id = GNUNET_CRYPTO_random_u64 ( | 1454 | GNUNET_RECLAIM_id_generate (&ash->reference->id); |
1445 | GNUNET_CRYPTO_QUALITY_STRONG, | ||
1446 | UINT64_MAX); | ||
1447 | } | 1455 | } |
1448 | else | 1456 | else |
1449 | { | 1457 | { |
@@ -1452,7 +1460,7 @@ reference_store_task (void *cls) | |||
1452 | } | 1460 | } |
1453 | 1461 | ||
1454 | label = GNUNET_STRINGS_data_to_string_alloc (&ash->reference->id, | 1462 | label = GNUNET_STRINGS_data_to_string_alloc (&ash->reference->id, |
1455 | sizeof(uint64_t)); | 1463 | sizeof (ash->reference->id)); |
1456 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1464 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1457 | "Looking up existing data under label %s\n", label); | 1465 | "Looking up existing data under label %s\n", label); |
1458 | // Test for the content of the existing ID | 1466 | // Test for the content of the existing ID |
@@ -1467,6 +1475,7 @@ reference_store_task (void *cls) | |||
1467 | GNUNET_free (label); | 1475 | GNUNET_free (label); |
1468 | } | 1476 | } |
1469 | 1477 | ||
1478 | |||
1470 | /** | 1479 | /** |
1471 | * Check an attestation reference store message | 1480 | * Check an attestation reference store message |
1472 | * | 1481 | * |
@@ -1521,6 +1530,8 @@ handle_reference_store_message (void *cls, | |||
1521 | GNUNET_CONTAINER_DLL_insert (idp->store_op_head, idp->store_op_tail, ash); | 1530 | GNUNET_CONTAINER_DLL_insert (idp->store_op_head, idp->store_op_tail, ash); |
1522 | GNUNET_SCHEDULER_add_now (&reference_store_task, ash); | 1531 | GNUNET_SCHEDULER_add_now (&reference_store_task, ash); |
1523 | } | 1532 | } |
1533 | |||
1534 | |||
1524 | /** | 1535 | /** |
1525 | * Send a deletion success response | 1536 | * Send a deletion success response |
1526 | * | 1537 | * |
@@ -1570,13 +1581,16 @@ ticket_iter (void *cls, | |||
1570 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) | 1581 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF != rd[i].record_type) |
1571 | continue; | 1582 | continue; |
1572 | if (adh->claim != NULL) | 1583 | if (adh->claim != NULL) |
1573 | if (0 != memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t))) | 1584 | if (GNUNET_YES != GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1585 | &adh->claim->id)) | ||
1574 | continue; | 1586 | continue; |
1575 | if (adh->attest != NULL) | 1587 | if (adh->attest != NULL) |
1576 | if (0 != memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t))) | 1588 | if (GNUNET_YES != GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1589 | &adh->attest->id)) | ||
1577 | continue; | 1590 | continue; |
1578 | if (adh->reference != NULL) | 1591 | if (adh->reference != NULL) |
1579 | if (0 != memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t))) | 1592 | if (GNUNET_YES != GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1593 | &adh->reference->id)) | ||
1580 | continue; | 1594 | continue; |
1581 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 1595 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1582 | "Attribute or Attestation/Reference to delete found (%s)\n", | 1596 | "Attribute or Attestation/Reference to delete found (%s)\n", |
@@ -1671,15 +1685,18 @@ update_tickets (void *cls) | |||
1671 | { | 1685 | { |
1672 | if (adh->claim != NULL) | 1686 | if (adh->claim != NULL) |
1673 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1687 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) |
1674 | && (0 == memcmp (rd[i].data, &adh->claim->id, sizeof(uint64_t)))) | 1688 | && (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1689 | &adh->claim->id))) | ||
1675 | continue; | 1690 | continue; |
1676 | if (adh->attest != NULL) | 1691 | if (adh->attest != NULL) |
1677 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1692 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) |
1678 | && (0 == memcmp (rd[i].data, &adh->attest->id, sizeof(uint64_t)))) | 1693 | && (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1694 | &adh->attest->id))) | ||
1679 | continue; | 1695 | continue; |
1680 | if (adh->reference != NULL) | 1696 | if (adh->reference != NULL) |
1681 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) | 1697 | if ((GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF == rd[i].record_type) |
1682 | && (0 == memcmp (rd[i].data, &adh->reference->id, sizeof(uint64_t)))) | 1698 | && (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (rd[i].data, |
1699 | &adh->reference->id))) | ||
1683 | continue; | 1700 | continue; |
1684 | rd_new[j] = rd[i]; | 1701 | rd_new[j] = rd[i]; |
1685 | j++; | 1702 | j++; |
@@ -1828,7 +1845,8 @@ handle_attribute_delete_message (void *cls, | |||
1828 | adh->r_id = ntohl (dam->id); | 1845 | adh->r_id = ntohl (dam->id); |
1829 | adh->identity = dam->identity; | 1846 | adh->identity = dam->identity; |
1830 | adh->label | 1847 | adh->label |
1831 | = GNUNET_STRINGS_data_to_string_alloc (&adh->claim->id, sizeof(uint64_t)); | 1848 | = GNUNET_STRINGS_data_to_string_alloc (&adh->claim->id, |
1849 | sizeof(adh->claim->id)); | ||
1832 | GNUNET_SERVICE_client_continue (idp->client); | 1850 | GNUNET_SERVICE_client_continue (idp->client); |
1833 | adh->client = idp; | 1851 | adh->client = idp; |
1834 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); | 1852 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); |
@@ -1841,6 +1859,7 @@ handle_attribute_delete_message (void *cls, | |||
1841 | adh); | 1859 | adh); |
1842 | } | 1860 | } |
1843 | 1861 | ||
1862 | |||
1844 | /** | 1863 | /** |
1845 | * Attestation deleted callback | 1864 | * Attestation deleted callback |
1846 | * | 1865 | * |
@@ -1867,6 +1886,7 @@ attest_delete_cont (void *cls, int32_t success, const char *emsg) | |||
1867 | GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); | 1886 | GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); |
1868 | } | 1887 | } |
1869 | 1888 | ||
1889 | |||
1870 | /** | 1890 | /** |
1871 | * Check attestation delete message format | 1891 | * Check attestation delete message format |
1872 | * | 1892 | * |
@@ -1916,7 +1936,8 @@ handle_attestation_delete_message (void *cls, | |||
1916 | adh->r_id = ntohl (dam->id); | 1936 | adh->r_id = ntohl (dam->id); |
1917 | adh->identity = dam->identity; | 1937 | adh->identity = dam->identity; |
1918 | adh->label | 1938 | adh->label |
1919 | = GNUNET_STRINGS_data_to_string_alloc (&adh->attest->id, sizeof(uint64_t)); | 1939 | = GNUNET_STRINGS_data_to_string_alloc (&adh->attest->id, |
1940 | sizeof(adh->attest->id)); | ||
1920 | GNUNET_SERVICE_client_continue (idp->client); | 1941 | GNUNET_SERVICE_client_continue (idp->client); |
1921 | adh->client = idp; | 1942 | adh->client = idp; |
1922 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); | 1943 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); |
@@ -1930,7 +1951,6 @@ handle_attestation_delete_message (void *cls, | |||
1930 | } | 1951 | } |
1931 | 1952 | ||
1932 | 1953 | ||
1933 | |||
1934 | /** | 1954 | /** |
1935 | * Reference deleted callback | 1955 | * Reference deleted callback |
1936 | * | 1956 | * |
@@ -1954,12 +1974,13 @@ reference_delete_cont (void *cls, int32_t success, const char *emsg) | |||
1954 | return; | 1974 | return; |
1955 | } | 1975 | } |
1956 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n"); | 1976 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Updating tickets...\n"); |
1957 | //GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); | 1977 | // GNUNET_SCHEDULER_add_now (&start_ticket_update, adh); |
1958 | send_delete_response (adh, GNUNET_OK); | 1978 | send_delete_response (adh, GNUNET_OK); |
1959 | cleanup_adh (adh); | 1979 | cleanup_adh (adh); |
1960 | return; | 1980 | return; |
1961 | } | 1981 | } |
1962 | 1982 | ||
1983 | |||
1963 | static void | 1984 | static void |
1964 | ref_del_cb (void *cls, | 1985 | ref_del_cb (void *cls, |
1965 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 1986 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
@@ -1974,7 +1995,7 @@ ref_del_cb (void *cls, | |||
1974 | struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *ref; | 1995 | struct GNUNET_RECLAIM_ATTESTATION_REFERENCE *ref; |
1975 | size_t attr_len; | 1996 | size_t attr_len; |
1976 | 1997 | ||
1977 | if (0 == rd_count ) | 1998 | if (0 == rd_count) |
1978 | { | 1999 | { |
1979 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2000 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
1980 | "Failed to find Attestation entry for Attestation reference\n"); | 2001 | "Failed to find Attestation entry for Attestation reference\n"); |
@@ -1999,7 +2020,7 @@ ref_del_cb (void *cls, | |||
1999 | GNUNET_memcpy (data_tmp, rd[i].data, rd[i].data_size); | 2020 | GNUNET_memcpy (data_tmp, rd[i].data, rd[i].data_size); |
2000 | attr_len = htons (rd[i].data_size); | 2021 | attr_len = htons (rd[i].data_size); |
2001 | ref = GNUNET_RECLAIM_ATTESTATION_REF_deserialize (data_tmp, attr_len); | 2022 | ref = GNUNET_RECLAIM_ATTESTATION_REF_deserialize (data_tmp, attr_len); |
2002 | if (NULL == ref ) | 2023 | if (NULL == ref) |
2003 | { | 2024 | { |
2004 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2025 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
2005 | "Unable to parse attestation reference from %s\n", | 2026 | "Unable to parse attestation reference from %s\n", |
@@ -2008,7 +2029,7 @@ ref_del_cb (void *cls, | |||
2008 | j += 1; | 2029 | j += 1; |
2009 | continue; | 2030 | continue; |
2010 | } | 2031 | } |
2011 | if ((strcmp (adh->reference->name,ref->name) == 0)&& | 2032 | if ((strcmp (adh->reference->name,ref->name) == 0) && |
2012 | (strcmp (adh->reference->reference_value,ref->reference_value)==0) ) | 2033 | (strcmp (adh->reference->reference_value,ref->reference_value)==0) ) |
2013 | { | 2034 | { |
2014 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 2035 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
@@ -2030,6 +2051,7 @@ ref_del_cb (void *cls, | |||
2030 | adh); | 2051 | adh); |
2031 | } | 2052 | } |
2032 | 2053 | ||
2054 | |||
2033 | /** | 2055 | /** |
2034 | * Check an attestation reference delete message | 2056 | * Check an attestation reference delete message |
2035 | * | 2057 | * |
@@ -2051,6 +2073,7 @@ check_reference_delete_message (void *cls, | |||
2051 | return GNUNET_OK; | 2073 | return GNUNET_OK; |
2052 | } | 2074 | } |
2053 | 2075 | ||
2076 | |||
2054 | /** | 2077 | /** |
2055 | * Handle reference deletion | 2078 | * Handle reference deletion |
2056 | * | 2079 | * |
@@ -2077,7 +2100,7 @@ handle_reference_delete_message (void *cls, | |||
2077 | adh->identity = dam->identity; | 2100 | adh->identity = dam->identity; |
2078 | adh->label | 2101 | adh->label |
2079 | = GNUNET_STRINGS_data_to_string_alloc (&adh->reference->id, | 2102 | = GNUNET_STRINGS_data_to_string_alloc (&adh->reference->id, |
2080 | sizeof(uint64_t)); | 2103 | sizeof(adh->reference->id)); |
2081 | GNUNET_SERVICE_client_continue (idp->client); | 2104 | GNUNET_SERVICE_client_continue (idp->client); |
2082 | adh->client = idp; | 2105 | adh->client = idp; |
2083 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); | 2106 | GNUNET_CONTAINER_DLL_insert (idp->delete_op_head, idp->delete_op_tail, adh); |
@@ -2091,7 +2114,6 @@ handle_reference_delete_message (void *cls, | |||
2091 | } | 2114 | } |
2092 | 2115 | ||
2093 | 2116 | ||
2094 | |||
2095 | /************************************************* | 2117 | /************************************************* |
2096 | * Attrubute iteration | 2118 | * Attrubute iteration |
2097 | *************************************************/ | 2119 | *************************************************/ |
@@ -2190,7 +2212,7 @@ attr_iter_cb (void *cls, | |||
2190 | return; | 2212 | return; |
2191 | } | 2213 | } |
2192 | 2214 | ||
2193 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR == rd[i].record_type ) | 2215 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR == rd[i].record_type) |
2194 | { | 2216 | { |
2195 | struct AttributeResultMessage *arm; | 2217 | struct AttributeResultMessage *arm; |
2196 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n", | 2218 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attribute under: %s\n", |
@@ -2209,7 +2231,7 @@ attr_iter_cb (void *cls, | |||
2209 | } | 2231 | } |
2210 | else | 2232 | else |
2211 | { | 2233 | { |
2212 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTEST_ATTR == rd[i].record_type ) | 2234 | if (GNUNET_GNSRECORD_TYPE_RECLAIM_ATTEST_ATTR == rd[i].record_type) |
2213 | { | 2235 | { |
2214 | struct AttributeResultMessage *arm; | 2236 | struct AttributeResultMessage *arm; |
2215 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attestation under: %s\n", | 2237 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Found attestation under: %s\n", |
@@ -2250,6 +2272,7 @@ attr_iter_cb (void *cls, | |||
2250 | } | 2272 | } |
2251 | } | 2273 | } |
2252 | 2274 | ||
2275 | |||
2253 | /** | 2276 | /** |
2254 | * Iterate over zone to get attributes | 2277 | * Iterate over zone to get attributes |
2255 | * | 2278 | * |