diff options
Diffstat (limited to 'src/psycstore/plugin_psycstore_sqlite.c')
-rw-r--r-- | src/psycstore/plugin_psycstore_sqlite.c | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c index adc52c254..356216998 100644 --- a/src/psycstore/plugin_psycstore_sqlite.c +++ b/src/psycstore/plugin_psycstore_sqlite.c | |||
@@ -621,7 +621,7 @@ database_shutdown (struct Plugin *plugin) | |||
621 | */ | 621 | */ |
622 | static int | 622 | static int |
623 | exec_channel (struct Plugin *plugin, sqlite3_stmt *stmt, | 623 | exec_channel (struct Plugin *plugin, sqlite3_stmt *stmt, |
624 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key) | 624 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
625 | { | 625 | { |
626 | if (SQLITE_OK != sqlite3_bind_blob (stmt, 1, channel_key, | 626 | if (SQLITE_OK != sqlite3_bind_blob (stmt, 1, channel_key, |
627 | sizeof (*channel_key), SQLITE_STATIC)) | 627 | sizeof (*channel_key), SQLITE_STATIC)) |
@@ -721,7 +721,7 @@ transaction_rollback (struct Plugin *plugin) | |||
721 | 721 | ||
722 | static int | 722 | static int |
723 | channel_key_store (struct Plugin *plugin, | 723 | channel_key_store (struct Plugin *plugin, |
724 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key) | 724 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
725 | { | 725 | { |
726 | sqlite3_stmt *stmt = plugin->insert_channel_key; | 726 | sqlite3_stmt *stmt = plugin->insert_channel_key; |
727 | 727 | ||
@@ -750,7 +750,7 @@ channel_key_store (struct Plugin *plugin, | |||
750 | 750 | ||
751 | static int | 751 | static int |
752 | slave_key_store (struct Plugin *plugin, | 752 | slave_key_store (struct Plugin *plugin, |
753 | const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key) | 753 | const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key) |
754 | { | 754 | { |
755 | sqlite3_stmt *stmt = plugin->insert_slave_key; | 755 | sqlite3_stmt *stmt = plugin->insert_slave_key; |
756 | 756 | ||
@@ -788,8 +788,8 @@ slave_key_store (struct Plugin *plugin, | |||
788 | */ | 788 | */ |
789 | static int | 789 | static int |
790 | membership_store (void *cls, | 790 | membership_store (void *cls, |
791 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 791 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
792 | const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | 792 | const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, |
793 | int did_join, | 793 | int did_join, |
794 | uint64_t announced_at, | 794 | uint64_t announced_at, |
795 | uint64_t effective_since, | 795 | uint64_t effective_since, |
@@ -850,8 +850,8 @@ membership_store (void *cls, | |||
850 | */ | 850 | */ |
851 | static int | 851 | static int |
852 | membership_test (void *cls, | 852 | membership_test (void *cls, |
853 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 853 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
854 | const struct GNUNET_CRYPTO_EccPublicSignKey *slave_key, | 854 | const struct GNUNET_CRYPTO_EddsaPublicKey *slave_key, |
855 | uint64_t message_id) | 855 | uint64_t message_id) |
856 | { | 856 | { |
857 | struct Plugin *plugin = cls; | 857 | struct Plugin *plugin = cls; |
@@ -897,7 +897,7 @@ membership_test (void *cls, | |||
897 | */ | 897 | */ |
898 | static int | 898 | static int |
899 | fragment_store (void *cls, | 899 | fragment_store (void *cls, |
900 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 900 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
901 | const struct GNUNET_MULTICAST_MessageHeader *msg, | 901 | const struct GNUNET_MULTICAST_MessageHeader *msg, |
902 | uint32_t psycstore_flags) | 902 | uint32_t psycstore_flags) |
903 | { | 903 | { |
@@ -970,7 +970,7 @@ fragment_store (void *cls, | |||
970 | */ | 970 | */ |
971 | static int | 971 | static int |
972 | message_add_flags (void *cls, | 972 | message_add_flags (void *cls, |
973 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 973 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
974 | uint64_t message_id, | 974 | uint64_t message_id, |
975 | uint64_t psycstore_flags) | 975 | uint64_t psycstore_flags) |
976 | { | 976 | { |
@@ -1045,7 +1045,7 @@ fragment_row (sqlite3_stmt *stmt, GNUNET_PSYCSTORE_FragmentCallback cb, | |||
1045 | */ | 1045 | */ |
1046 | static int | 1046 | static int |
1047 | fragment_get (void *cls, | 1047 | fragment_get (void *cls, |
1048 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1048 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1049 | uint64_t fragment_id, | 1049 | uint64_t fragment_id, |
1050 | GNUNET_PSYCSTORE_FragmentCallback cb, | 1050 | GNUNET_PSYCSTORE_FragmentCallback cb, |
1051 | void *cb_cls) | 1051 | void *cb_cls) |
@@ -1096,7 +1096,7 @@ fragment_get (void *cls, | |||
1096 | */ | 1096 | */ |
1097 | static int | 1097 | static int |
1098 | message_get (void *cls, | 1098 | message_get (void *cls, |
1099 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1099 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1100 | uint64_t message_id, | 1100 | uint64_t message_id, |
1101 | uint64_t *returned_fragments, | 1101 | uint64_t *returned_fragments, |
1102 | GNUNET_PSYCSTORE_FragmentCallback cb, | 1102 | GNUNET_PSYCSTORE_FragmentCallback cb, |
@@ -1160,7 +1160,7 @@ message_get (void *cls, | |||
1160 | */ | 1160 | */ |
1161 | static int | 1161 | static int |
1162 | message_get_fragment (void *cls, | 1162 | message_get_fragment (void *cls, |
1163 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1163 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1164 | uint64_t message_id, | 1164 | uint64_t message_id, |
1165 | uint64_t fragment_offset, | 1165 | uint64_t fragment_offset, |
1166 | GNUNET_PSYCSTORE_FragmentCallback cb, | 1166 | GNUNET_PSYCSTORE_FragmentCallback cb, |
@@ -1213,7 +1213,7 @@ message_get_fragment (void *cls, | |||
1213 | */ | 1213 | */ |
1214 | static int | 1214 | static int |
1215 | counters_message_get (void *cls, | 1215 | counters_message_get (void *cls, |
1216 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1216 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1217 | uint64_t *max_fragment_id, | 1217 | uint64_t *max_fragment_id, |
1218 | uint64_t *max_message_id, | 1218 | uint64_t *max_message_id, |
1219 | uint64_t *max_group_generation) | 1219 | uint64_t *max_group_generation) |
@@ -1266,7 +1266,7 @@ counters_message_get (void *cls, | |||
1266 | */ | 1266 | */ |
1267 | static int | 1267 | static int |
1268 | counters_state_get (void *cls, | 1268 | counters_state_get (void *cls, |
1269 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1269 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1270 | uint64_t *max_state_message_id) | 1270 | uint64_t *max_state_message_id) |
1271 | { | 1271 | { |
1272 | struct Plugin *plugin = cls; | 1272 | struct Plugin *plugin = cls; |
@@ -1314,7 +1314,7 @@ counters_state_get (void *cls, | |||
1314 | */ | 1314 | */ |
1315 | static int | 1315 | static int |
1316 | state_set (struct Plugin *plugin, sqlite3_stmt *stmt, | 1316 | state_set (struct Plugin *plugin, sqlite3_stmt *stmt, |
1317 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1317 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1318 | const char *name, const void *value, size_t value_size) | 1318 | const char *name, const void *value, size_t value_size) |
1319 | { | 1319 | { |
1320 | int ret = GNUNET_SYSERR; | 1320 | int ret = GNUNET_SYSERR; |
@@ -1354,7 +1354,7 @@ state_set (struct Plugin *plugin, sqlite3_stmt *stmt, | |||
1354 | 1354 | ||
1355 | static int | 1355 | static int |
1356 | update_message_id (struct Plugin *plugin, sqlite3_stmt *stmt, | 1356 | update_message_id (struct Plugin *plugin, sqlite3_stmt *stmt, |
1357 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1357 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1358 | uint64_t message_id) | 1358 | uint64_t message_id) |
1359 | { | 1359 | { |
1360 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, message_id) | 1360 | if (SQLITE_OK != sqlite3_bind_int64 (stmt, 1, message_id) |
@@ -1384,7 +1384,7 @@ update_message_id (struct Plugin *plugin, sqlite3_stmt *stmt, | |||
1384 | */ | 1384 | */ |
1385 | static int | 1385 | static int |
1386 | state_modify_begin (void *cls, | 1386 | state_modify_begin (void *cls, |
1387 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1387 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1388 | uint64_t message_id, uint64_t state_delta) | 1388 | uint64_t message_id, uint64_t state_delta) |
1389 | { | 1389 | { |
1390 | struct Plugin *plugin = cls; | 1390 | struct Plugin *plugin = cls; |
@@ -1449,7 +1449,7 @@ state_modify_begin (void *cls, | |||
1449 | */ | 1449 | */ |
1450 | static int | 1450 | static int |
1451 | state_modify_set (void *cls, | 1451 | state_modify_set (void *cls, |
1452 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1452 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1453 | const char *name, const void *value, size_t value_size) | 1453 | const char *name, const void *value, size_t value_size) |
1454 | { | 1454 | { |
1455 | struct Plugin *plugin = cls; | 1455 | struct Plugin *plugin = cls; |
@@ -1466,7 +1466,7 @@ state_modify_set (void *cls, | |||
1466 | */ | 1466 | */ |
1467 | static int | 1467 | static int |
1468 | state_modify_end (void *cls, | 1468 | state_modify_end (void *cls, |
1469 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1469 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1470 | uint64_t message_id) | 1470 | uint64_t message_id) |
1471 | { | 1471 | { |
1472 | struct Plugin *plugin = cls; | 1472 | struct Plugin *plugin = cls; |
@@ -1487,7 +1487,7 @@ state_modify_end (void *cls, | |||
1487 | */ | 1487 | */ |
1488 | static int | 1488 | static int |
1489 | state_sync_begin (void *cls, | 1489 | state_sync_begin (void *cls, |
1490 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key) | 1490 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
1491 | { | 1491 | { |
1492 | struct Plugin *plugin = cls; | 1492 | struct Plugin *plugin = cls; |
1493 | return exec_channel (plugin, plugin->delete_state_sync, channel_key); | 1493 | return exec_channel (plugin, plugin->delete_state_sync, channel_key); |
@@ -1503,7 +1503,7 @@ state_sync_begin (void *cls, | |||
1503 | */ | 1503 | */ |
1504 | static int | 1504 | static int |
1505 | state_sync_set (void *cls, | 1505 | state_sync_set (void *cls, |
1506 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1506 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1507 | const char *name, const void *value, size_t value_size) | 1507 | const char *name, const void *value, size_t value_size) |
1508 | { | 1508 | { |
1509 | struct Plugin *plugin = cls; | 1509 | struct Plugin *plugin = cls; |
@@ -1517,7 +1517,7 @@ state_sync_set (void *cls, | |||
1517 | */ | 1517 | */ |
1518 | static int | 1518 | static int |
1519 | state_sync_end (void *cls, | 1519 | state_sync_end (void *cls, |
1520 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1520 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1521 | uint64_t message_id) | 1521 | uint64_t message_id) |
1522 | { | 1522 | { |
1523 | struct Plugin *plugin = cls; | 1523 | struct Plugin *plugin = cls; |
@@ -1547,7 +1547,7 @@ state_sync_end (void *cls, | |||
1547 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 1547 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
1548 | */ | 1548 | */ |
1549 | static int | 1549 | static int |
1550 | state_reset (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key) | 1550 | state_reset (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
1551 | { | 1551 | { |
1552 | struct Plugin *plugin = cls; | 1552 | struct Plugin *plugin = cls; |
1553 | return exec_channel (plugin, plugin->delete_state, channel_key); | 1553 | return exec_channel (plugin, plugin->delete_state, channel_key); |
@@ -1563,7 +1563,7 @@ state_reset (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key | |||
1563 | */ | 1563 | */ |
1564 | static int | 1564 | static int |
1565 | state_update_signed (void *cls, | 1565 | state_update_signed (void *cls, |
1566 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key) | 1566 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
1567 | { | 1567 | { |
1568 | struct Plugin *plugin = cls; | 1568 | struct Plugin *plugin = cls; |
1569 | return exec_channel (plugin, plugin->update_state_signed, channel_key); | 1569 | return exec_channel (plugin, plugin->update_state_signed, channel_key); |
@@ -1578,7 +1578,7 @@ state_update_signed (void *cls, | |||
1578 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 1578 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
1579 | */ | 1579 | */ |
1580 | static int | 1580 | static int |
1581 | state_get (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1581 | state_get (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1582 | const char *name, GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls) | 1582 | const char *name, GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls) |
1583 | { | 1583 | { |
1584 | struct Plugin *plugin = cls; | 1584 | struct Plugin *plugin = cls; |
@@ -1629,7 +1629,7 @@ state_get (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | |||
1629 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR | 1629 | * @return #GNUNET_OK on success, else #GNUNET_SYSERR |
1630 | */ | 1630 | */ |
1631 | static int | 1631 | static int |
1632 | state_get_prefix (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1632 | state_get_prefix (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1633 | const char *name, GNUNET_PSYCSTORE_StateCallback cb, | 1633 | const char *name, GNUNET_PSYCSTORE_StateCallback cb, |
1634 | void *cb_cls) | 1634 | void *cb_cls) |
1635 | { | 1635 | { |
@@ -1697,7 +1697,7 @@ state_get_prefix (void *cls, const struct GNUNET_CRYPTO_EccPublicSignKey *channe | |||
1697 | */ | 1697 | */ |
1698 | static int | 1698 | static int |
1699 | state_get_signed (void *cls, | 1699 | state_get_signed (void *cls, |
1700 | const struct GNUNET_CRYPTO_EccPublicSignKey *channel_key, | 1700 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1701 | GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls) | 1701 | GNUNET_PSYCSTORE_StateCallback cb, void *cb_cls) |
1702 | { | 1702 | { |
1703 | struct Plugin *plugin = cls; | 1703 | struct Plugin *plugin = cls; |