diff options
author | Christophe Genevey Metat <genevey.christophe@gmail.com> | 2016-07-13 14:53:34 +0000 |
---|---|---|
committer | Christophe Genevey Metat <genevey.christophe@gmail.com> | 2016-07-13 14:53:34 +0000 |
commit | d921631157c5bfbabee1eb4ee2884c6ad45ac805 (patch) | |
tree | 33c1105615d8d902b31410a2d6f0e3376ec14a51 /src | |
parent | c99ee078ba2c713839aad1043d846e2a4a61d501 (diff) | |
download | gnunet-d921631157c5bfbabee1eb4ee2884c6ad45ac805.tar.gz gnunet-d921631157c5bfbabee1eb4ee2884c6ad45ac805.zip |
start to fix PSYCstore mysql
Diffstat (limited to 'src')
-rw-r--r-- | src/psycstore/plugin_psycstore_mysql.c | 301 |
1 files changed, 69 insertions, 232 deletions
diff --git a/src/psycstore/plugin_psycstore_mysql.c b/src/psycstore/plugin_psycstore_mysql.c index 80a560d0f..9357419f5 100644 --- a/src/psycstore/plugin_psycstore_mysql.c +++ b/src/psycstore/plugin_psycstore_mysql.c | |||
@@ -56,7 +56,7 @@ | |||
56 | * a failure of the command 'cmd' on file 'filename' | 56 | * a failure of the command 'cmd' on file 'filename' |
57 | * with the message given by strerror(errno). | 57 | * with the message given by strerror(errno). |
58 | */ | 58 | */ |
59 | #define LOG_MYSQL(db, level, cmd, stmt) do { GNUNET_log_from (level, "psycstore-mysql", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, mysql_stmt_error (stmt)); } while(0) | 59 | #define LOG_MYSQL(db, level, cmd, stmt) do { GNUNET_log_from (level, "psycstore-mysql", _("`%s' failed at %s:%d with error: %s\n"), cmd, __FILE__, __LINE__, mysql_stmt_error (GNUNET_MYSQL_statement_get_stmt(stmt))); } while(0) |
60 | 60 | ||
61 | #define LOG(kind,...) GNUNET_log_from (kind, "psycstore-mysql", __VA_ARGS__) | 61 | #define LOG(kind,...) GNUNET_log_from (kind, "psycstore-mysql", __VA_ARGS__) |
62 | 62 | ||
@@ -655,16 +655,6 @@ static int | |||
655 | exec_channel (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt, | 655 | exec_channel (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt, |
656 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) | 656 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key) |
657 | { | 657 | { |
658 | MYSQL_STMT * statement = NULL; | ||
659 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
660 | |||
661 | if (NULL == statement) | ||
662 | { | ||
663 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
664 | "mysql statement invalide", statement); | ||
665 | return GNUNET_SYSERR; | ||
666 | } | ||
667 | |||
668 | struct GNUNET_MY_QueryParam params[] = { | 658 | struct GNUNET_MY_QueryParam params[] = { |
669 | GNUNET_MY_query_param_auto_from_type (channel_key), | 659 | GNUNET_MY_query_param_auto_from_type (channel_key), |
670 | GNUNET_MY_query_param_end | 660 | GNUNET_MY_query_param_end |
@@ -675,13 +665,13 @@ exec_channel (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt, | |||
675 | params)) | 665 | params)) |
676 | { | 666 | { |
677 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 667 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
678 | "mysql exec_channel", statement); | 668 | "mysql exec_channel", stmt); |
679 | } | 669 | } |
680 | 670 | ||
681 | if (0 != mysql_stmt_reset (statement)) | 671 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
682 | { | 672 | { |
683 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 673 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
684 | "mysql_stmt_reset", statement); | 674 | "mysql_stmt_reset", stmt); |
685 | return GNUNET_SYSERR; | 675 | return GNUNET_SYSERR; |
686 | } | 676 | } |
687 | 677 | ||
@@ -696,17 +686,7 @@ static int | |||
696 | transaction_begin (struct Plugin *plugin, enum Transactions transaction) | 686 | transaction_begin (struct Plugin *plugin, enum Transactions transaction) |
697 | { | 687 | { |
698 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin; | 688 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_begin; |
699 | MYSQL_STMT * statement = NULL; | 689 | |
700 | |||
701 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
702 | |||
703 | if (NULL == statement) | ||
704 | { | ||
705 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
706 | "mysql statement invalide", statement); | ||
707 | return GNUNET_SYSERR; | ||
708 | } | ||
709 | |||
710 | struct GNUNET_MY_QueryParam params[] = { | 690 | struct GNUNET_MY_QueryParam params[] = { |
711 | GNUNET_MY_query_param_end | 691 | GNUNET_MY_query_param_end |
712 | }; | 692 | }; |
@@ -716,14 +696,14 @@ transaction_begin (struct Plugin *plugin, enum Transactions transaction) | |||
716 | params)) | 696 | params)) |
717 | { | 697 | { |
718 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 698 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
719 | "mysql extract_result", statement); | 699 | "mysql extract_result", stmt); |
720 | return GNUNET_SYSERR; | 700 | return GNUNET_SYSERR; |
721 | } | 701 | } |
722 | 702 | ||
723 | if (0 != mysql_stmt_reset (statement)) | 703 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt(stmt))) |
724 | { | 704 | { |
725 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 705 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
726 | "mysql_stmt_reset", statement); | 706 | "mysql_stmt_reset", stmt); |
727 | return GNUNET_SYSERR; | 707 | return GNUNET_SYSERR; |
728 | } | 708 | } |
729 | 709 | ||
@@ -739,16 +719,6 @@ static int | |||
739 | transaction_commit (struct Plugin *plugin) | 719 | transaction_commit (struct Plugin *plugin) |
740 | { | 720 | { |
741 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit; | 721 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_commit; |
742 | MYSQL_STMT *statement = NULL; | ||
743 | |||
744 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
745 | |||
746 | if (NULL == statement) | ||
747 | { | ||
748 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
749 | "mysql statement invalide", statement); | ||
750 | return GNUNET_SYSERR; | ||
751 | } | ||
752 | 722 | ||
753 | struct GNUNET_MY_QueryParam params[] = { | 723 | struct GNUNET_MY_QueryParam params[] = { |
754 | GNUNET_MY_query_param_end | 724 | GNUNET_MY_query_param_end |
@@ -759,14 +729,14 @@ transaction_commit (struct Plugin *plugin) | |||
759 | params)) | 729 | params)) |
760 | { | 730 | { |
761 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 731 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
762 | "mysql extract_result", statement); | 732 | "mysql extract_result", stmt); |
763 | return GNUNET_SYSERR; | 733 | return GNUNET_SYSERR; |
764 | } | 734 | } |
765 | 735 | ||
766 | if (0 != mysql_stmt_reset (statement)) | 736 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
767 | { | 737 | { |
768 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 738 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
769 | "mysql_stmt_reset", statement); | 739 | "mysql_stmt_reset", stmt); |
770 | return GNUNET_SYSERR; | 740 | return GNUNET_SYSERR; |
771 | } | 741 | } |
772 | 742 | ||
@@ -782,15 +752,6 @@ static int | |||
782 | transaction_rollback (struct Plugin *plugin) | 752 | transaction_rollback (struct Plugin *plugin) |
783 | { | 753 | { |
784 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback; | 754 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->transaction_rollback; |
785 | MYSQL_STMT* statement = NULL; | ||
786 | |||
787 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
788 | if (NULL == statement) | ||
789 | { | ||
790 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
791 | "mysql statement invalide", statement); | ||
792 | return GNUNET_SYSERR; | ||
793 | } | ||
794 | 755 | ||
795 | struct GNUNET_MY_QueryParam params[] = { | 756 | struct GNUNET_MY_QueryParam params[] = { |
796 | GNUNET_MY_query_param_end | 757 | GNUNET_MY_query_param_end |
@@ -801,14 +762,14 @@ transaction_rollback (struct Plugin *plugin) | |||
801 | params)) | 762 | params)) |
802 | { | 763 | { |
803 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 764 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
804 | "mysql extract_result", statement); | 765 | "mysql extract_result", stmt); |
805 | return GNUNET_SYSERR; | 766 | return GNUNET_SYSERR; |
806 | } | 767 | } |
807 | 768 | ||
808 | if (0 != mysql_stmt_reset (statement)) | 769 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
809 | { | 770 | { |
810 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 771 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
811 | "mysql_stmt_reset", statement); | 772 | "mysql_stmt_reset", stmt); |
812 | return GNUNET_SYSERR; | 773 | return GNUNET_SYSERR; |
813 | } | 774 | } |
814 | 775 | ||
@@ -823,16 +784,6 @@ channel_key_store (struct Plugin *plugin, | |||
823 | { | 784 | { |
824 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_channel_key; | 785 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_channel_key; |
825 | 786 | ||
826 | MYSQL_STMT *statement = NULL; | ||
827 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
828 | |||
829 | if(NULL == statement) | ||
830 | { | ||
831 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
832 | "mysql statement invalide", statement); | ||
833 | return GNUNET_SYSERR; | ||
834 | } | ||
835 | |||
836 | struct GNUNET_MY_QueryParam params[] = { | 787 | struct GNUNET_MY_QueryParam params[] = { |
837 | GNUNET_MY_query_param_auto_from_type (channel_key), | 788 | GNUNET_MY_query_param_auto_from_type (channel_key), |
838 | GNUNET_MY_query_param_end | 789 | GNUNET_MY_query_param_end |
@@ -843,14 +794,14 @@ channel_key_store (struct Plugin *plugin, | |||
843 | params)) | 794 | params)) |
844 | { | 795 | { |
845 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 796 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
846 | "mysql extract_result", statement); | 797 | "mysql extract_result", stmt); |
847 | return GNUNET_SYSERR; | 798 | return GNUNET_SYSERR; |
848 | } | 799 | } |
849 | 800 | ||
850 | if (0 != mysql_stmt_reset (statement)) | 801 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
851 | { | 802 | { |
852 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 803 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
853 | "mysql_stmt_reset", statement); | 804 | "mysql_stmt_reset", stmt); |
854 | return GNUNET_SYSERR; | 805 | return GNUNET_SYSERR; |
855 | } | 806 | } |
856 | 807 | ||
@@ -864,16 +815,6 @@ slave_key_store (struct Plugin *plugin, | |||
864 | { | 815 | { |
865 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_slave_key; | 816 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_slave_key; |
866 | 817 | ||
867 | MYSQL_STMT *statement = NULL; | ||
868 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
869 | |||
870 | if(NULL == statement) | ||
871 | { | ||
872 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
873 | "mysql statement invalide", statement); | ||
874 | return GNUNET_SYSERR; | ||
875 | } | ||
876 | |||
877 | struct GNUNET_MY_QueryParam params[] = { | 818 | struct GNUNET_MY_QueryParam params[] = { |
878 | GNUNET_MY_query_param_auto_from_type (slave_key), | 819 | GNUNET_MY_query_param_auto_from_type (slave_key), |
879 | GNUNET_MY_query_param_end | 820 | GNUNET_MY_query_param_end |
@@ -884,14 +825,14 @@ slave_key_store (struct Plugin *plugin, | |||
884 | params)) | 825 | params)) |
885 | { | 826 | { |
886 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 827 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
887 | "mysql extract_result", statement); | 828 | "mysql extract_result", stmt); |
888 | return GNUNET_SYSERR; | 829 | return GNUNET_SYSERR; |
889 | } | 830 | } |
890 | 831 | ||
891 | if (0 != mysql_stmt_reset (statement)) | 832 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
892 | { | 833 | { |
893 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 834 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
894 | "mysql_stmt_reset", statement); | 835 | "mysql_stmt_reset", stmt); |
895 | return GNUNET_SYSERR; | 836 | return GNUNET_SYSERR; |
896 | } | 837 | } |
897 | 838 | ||
@@ -924,10 +865,6 @@ mysql_membership_store (void *cls, | |||
924 | uint64_t igroup_generation = (uint64_t)group_generation; | 865 | uint64_t igroup_generation = (uint64_t)group_generation; |
925 | 866 | ||
926 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_membership; | 867 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_membership; |
927 | MYSQL_STMT *statement = NULL; | ||
928 | |||
929 | /**** FAIL HERE ****/ | ||
930 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
931 | 868 | ||
932 | GNUNET_assert (TRANSACTION_NONE == plugin->transaction); | 869 | GNUNET_assert (TRANSACTION_NONE == plugin->transaction); |
933 | 870 | ||
@@ -958,14 +895,14 @@ mysql_membership_store (void *cls, | |||
958 | params)) | 895 | params)) |
959 | { | 896 | { |
960 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 897 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
961 | "mysql extract_result", statement); | 898 | "mysql extract_result", stmt); |
962 | return GNUNET_SYSERR; | 899 | return GNUNET_SYSERR; |
963 | } | 900 | } |
964 | 901 | ||
965 | if (0 != mysql_stmt_reset (statement)) | 902 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
966 | { | 903 | { |
967 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 904 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
968 | "mysql_stmt_reset", statement); | 905 | "mysql_stmt_reset", stmt); |
969 | return GNUNET_SYSERR; | 906 | return GNUNET_SYSERR; |
970 | } | 907 | } |
971 | return GNUNET_OK; | 908 | return GNUNET_OK; |
@@ -988,19 +925,9 @@ membership_test (void *cls, | |||
988 | struct Plugin *plugin = cls; | 925 | struct Plugin *plugin = cls; |
989 | 926 | ||
990 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_membership; | 927 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_membership; |
991 | MYSQL_STMT *statement = NULL; | ||
992 | 928 | ||
993 | uint32_t did_join = 0; | 929 | uint32_t did_join = 0; |
994 | 930 | ||
995 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
996 | |||
997 | if(NULL == statement) | ||
998 | { | ||
999 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1000 | "mysql statement invalide", statement); | ||
1001 | return GNUNET_SYSERR; | ||
1002 | } | ||
1003 | |||
1004 | int ret = GNUNET_SYSERR; | 931 | int ret = GNUNET_SYSERR; |
1005 | 932 | ||
1006 | struct GNUNET_MY_QueryParam params_select[] = { | 933 | struct GNUNET_MY_QueryParam params_select[] = { |
@@ -1015,7 +942,7 @@ membership_test (void *cls, | |||
1015 | params_select)) | 942 | params_select)) |
1016 | { | 943 | { |
1017 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 944 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1018 | "mysql execute prepared", statement); | 945 | "mysql execute prepared", stmt); |
1019 | return GNUNET_SYSERR; | 946 | return GNUNET_SYSERR; |
1020 | } | 947 | } |
1021 | 948 | ||
@@ -1028,7 +955,7 @@ membership_test (void *cls, | |||
1028 | results_select)) | 955 | results_select)) |
1029 | { | 956 | { |
1030 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 957 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1031 | "mysql extract_result", statement); | 958 | "mysql extract_result", stmt); |
1032 | return GNUNET_SYSERR; | 959 | return GNUNET_SYSERR; |
1033 | } | 960 | } |
1034 | 961 | ||
@@ -1041,10 +968,10 @@ membership_test (void *cls, | |||
1041 | ret = GNUNET_NO; | 968 | ret = GNUNET_NO; |
1042 | } | 969 | } |
1043 | 970 | ||
1044 | if (0 != mysql_stmt_reset (statement)) | 971 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1045 | { | 972 | { |
1046 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 973 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1047 | "mysql_stmt_reset", statement); | 974 | "mysql_stmt_reset", stmt); |
1048 | return GNUNET_SYSERR; | 975 | return GNUNET_SYSERR; |
1049 | } | 976 | } |
1050 | 977 | ||
@@ -1067,9 +994,6 @@ fragment_store (void *cls, | |||
1067 | struct Plugin *plugin = cls; | 994 | struct Plugin *plugin = cls; |
1068 | 995 | ||
1069 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_fragment; | 996 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->insert_fragment; |
1070 | MYSQL_STMT *statement = NULL; | ||
1071 | |||
1072 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1073 | 997 | ||
1074 | GNUNET_assert (TRANSACTION_NONE == plugin->transaction); | 998 | GNUNET_assert (TRANSACTION_NONE == plugin->transaction); |
1075 | 999 | ||
@@ -1112,14 +1036,14 @@ fragment_store (void *cls, | |||
1112 | params_insert)) | 1036 | params_insert)) |
1113 | { | 1037 | { |
1114 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1038 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1115 | "mysql execute prepared", statement); | 1039 | "mysql execute prepared", stmt); |
1116 | return GNUNET_SYSERR; | 1040 | return GNUNET_SYSERR; |
1117 | } | 1041 | } |
1118 | 1042 | ||
1119 | if (0 != mysql_stmt_reset (statement)) | 1043 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1120 | { | 1044 | { |
1121 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1045 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1122 | "mysql_stmt_reset", statement); | 1046 | "mysql_stmt_reset", stmt); |
1123 | return GNUNET_SYSERR; | 1047 | return GNUNET_SYSERR; |
1124 | } | 1048 | } |
1125 | 1049 | ||
@@ -1142,9 +1066,6 @@ message_add_flags (void *cls, | |||
1142 | struct Plugin *plugin = cls; | 1066 | struct Plugin *plugin = cls; |
1143 | 1067 | ||
1144 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags; | 1068 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->update_message_flags; |
1145 | MYSQL_STMT *statement = NULL; | ||
1146 | |||
1147 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1148 | 1069 | ||
1149 | int ret = GNUNET_SYSERR; | 1070 | int ret = GNUNET_SYSERR; |
1150 | 1071 | ||
@@ -1160,14 +1081,14 @@ message_add_flags (void *cls, | |||
1160 | params_update)) | 1081 | params_update)) |
1161 | { | 1082 | { |
1162 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1083 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1163 | "mysql execute prepared", statement); | 1084 | "mysql execute prepared", stmt); |
1164 | return GNUNET_SYSERR; | 1085 | return GNUNET_SYSERR; |
1165 | } | 1086 | } |
1166 | 1087 | ||
1167 | if (0 != mysql_stmt_reset (statement)) | 1088 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1168 | { | 1089 | { |
1169 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1090 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1170 | "mysql_stmt_reset", statement); | 1091 | "mysql_stmt_reset", stmt); |
1171 | return GNUNET_SYSERR; | 1092 | return GNUNET_SYSERR; |
1172 | } | 1093 | } |
1173 | 1094 | ||
@@ -1244,10 +1165,6 @@ fragment_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stm | |||
1244 | int ret = GNUNET_SYSERR; | 1165 | int ret = GNUNET_SYSERR; |
1245 | int sql_ret; | 1166 | int sql_ret; |
1246 | 1167 | ||
1247 | MYSQL_STMT *statement = NULL; | ||
1248 | |||
1249 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1250 | |||
1251 | uint32_t hop_counter = 0; | 1168 | uint32_t hop_counter = 0; |
1252 | void *signature = NULL; | 1169 | void *signature = NULL; |
1253 | void *purpose = NULL; | 1170 | void *purpose = NULL; |
@@ -1297,7 +1214,7 @@ fragment_select (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stm | |||
1297 | break; | 1214 | break; |
1298 | default: | 1215 | default: |
1299 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1216 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1300 | "mysql extract_result", statement); | 1217 | "mysql extract_result", stmt); |
1301 | } | 1218 | } |
1302 | } | 1219 | } |
1303 | while (sql_ret == GNUNET_YES); | 1220 | while (sql_ret == GNUNET_YES); |
@@ -1324,15 +1241,6 @@ fragment_get (void *cls, | |||
1324 | struct Plugin *plugin = cls; | 1241 | struct Plugin *plugin = cls; |
1325 | 1242 | ||
1326 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments; | 1243 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_fragments; |
1327 | MYSQL_STMT *statement = NULL; | ||
1328 | |||
1329 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1330 | if (NULL == statement) | ||
1331 | { | ||
1332 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1333 | "mysql get_stmt", statement); | ||
1334 | return GNUNET_SYSERR; | ||
1335 | } | ||
1336 | 1244 | ||
1337 | int ret = GNUNET_SYSERR; | 1245 | int ret = GNUNET_SYSERR; |
1338 | *returned_fragments = 0; | 1246 | *returned_fragments = 0; |
@@ -1346,10 +1254,10 @@ fragment_get (void *cls, | |||
1346 | 1254 | ||
1347 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); | 1255 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); |
1348 | 1256 | ||
1349 | if (0 != mysql_stmt_reset (statement)) | 1257 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1350 | { | 1258 | { |
1351 | LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1259 | LOG_MYSQL (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1352 | "mysql_stmt_reset", statement); | 1260 | "mysql_stmt_reset", stmt); |
1353 | return GNUNET_SYSERR; | 1261 | return GNUNET_SYSERR; |
1354 | } | 1262 | } |
1355 | 1263 | ||
@@ -1375,9 +1283,6 @@ fragment_get_latest (void *cls, | |||
1375 | struct Plugin *plugin = cls; | 1283 | struct Plugin *plugin = cls; |
1376 | 1284 | ||
1377 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_fragments; | 1285 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_fragments; |
1378 | MYSQL_STMT * statement = NULL; | ||
1379 | |||
1380 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1381 | 1286 | ||
1382 | int ret = GNUNET_SYSERR; | 1287 | int ret = GNUNET_SYSERR; |
1383 | *returned_fragments = 0; | 1288 | *returned_fragments = 0; |
@@ -1390,10 +1295,10 @@ fragment_get_latest (void *cls, | |||
1390 | 1295 | ||
1391 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); | 1296 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); |
1392 | 1297 | ||
1393 | if (0 != mysql_stmt_reset (statement)) | 1298 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1394 | { | 1299 | { |
1395 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1300 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1396 | "mysql_stmt_reset", statement); | 1301 | "mysql_stmt_reset", stmt); |
1397 | return GNUNET_SYSERR; | 1302 | return GNUNET_SYSERR; |
1398 | } | 1303 | } |
1399 | 1304 | ||
@@ -1421,9 +1326,6 @@ message_get (void *cls, | |||
1421 | struct Plugin *plugin = cls; | 1326 | struct Plugin *plugin = cls; |
1422 | 1327 | ||
1423 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_messages; | 1328 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_messages; |
1424 | MYSQL_STMT *statement = NULL; | ||
1425 | |||
1426 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1427 | 1329 | ||
1428 | int ret = GNUNET_SYSERR; | 1330 | int ret = GNUNET_SYSERR; |
1429 | *returned_fragments = 0; | 1331 | *returned_fragments = 0; |
@@ -1438,10 +1340,10 @@ message_get (void *cls, | |||
1438 | 1340 | ||
1439 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); | 1341 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); |
1440 | 1342 | ||
1441 | if (0 != mysql_stmt_reset (statement)) | 1343 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1442 | { | 1344 | { |
1443 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1345 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1444 | "mysql_stmt_reset", statement); | 1346 | "mysql_stmt_reset", stmt); |
1445 | return GNUNET_SYSERR; | 1347 | return GNUNET_SYSERR; |
1446 | } | 1348 | } |
1447 | 1349 | ||
@@ -1467,9 +1369,6 @@ message_get_latest (void *cls, | |||
1467 | struct Plugin *plugin = cls; | 1369 | struct Plugin *plugin = cls; |
1468 | 1370 | ||
1469 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_messages; | 1371 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_latest_messages; |
1470 | MYSQL_STMT *statement; | ||
1471 | |||
1472 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1473 | 1372 | ||
1474 | int ret = GNUNET_SYSERR; | 1373 | int ret = GNUNET_SYSERR; |
1475 | *returned_fragments = 0; | 1374 | *returned_fragments = 0; |
@@ -1483,10 +1382,10 @@ message_get_latest (void *cls, | |||
1483 | 1382 | ||
1484 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); | 1383 | ret = fragment_select (plugin, stmt, params_select, returned_fragments, cb, cb_cls); |
1485 | 1384 | ||
1486 | if (0 != mysql_stmt_reset (statement)) | 1385 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1487 | { | 1386 | { |
1488 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1387 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1489 | "mysql_stmt_reset", statement); | 1388 | "mysql_stmt_reset", stmt); |
1490 | return GNUNET_SYSERR; | 1389 | return GNUNET_SYSERR; |
1491 | } | 1390 | } |
1492 | 1391 | ||
@@ -1513,9 +1412,6 @@ message_get_fragment (void *cls, | |||
1513 | struct Plugin *plugin = cls; | 1412 | struct Plugin *plugin = cls; |
1514 | 1413 | ||
1515 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment; | 1414 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_message_fragment; |
1516 | MYSQL_STMT *statement = NULL; | ||
1517 | |||
1518 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1519 | 1415 | ||
1520 | int ret = GNUNET_SYSERR; | 1416 | int ret = GNUNET_SYSERR; |
1521 | 1417 | ||
@@ -1531,16 +1427,16 @@ message_get_fragment (void *cls, | |||
1531 | params_select)) | 1427 | params_select)) |
1532 | { | 1428 | { |
1533 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1429 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1534 | "mysql execute prepared", statement); | 1430 | "mysql execute prepared", stmt); |
1535 | return GNUNET_SYSERR; | 1431 | return GNUNET_SYSERR; |
1536 | } | 1432 | } |
1537 | /****** CHANGER ICI ****/ | 1433 | |
1538 | ret = fragment_row (stmt, cb, cb_cls); | 1434 | ret = fragment_row (stmt, cb, cb_cls); |
1539 | 1435 | ||
1540 | if (0 != mysql_stmt_reset (statement)) | 1436 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1541 | { | 1437 | { |
1542 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1438 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1543 | "mysql_stmt_reset", statement); | 1439 | "mysql_stmt_reset", stmt); |
1544 | return GNUNET_SYSERR; | 1440 | return GNUNET_SYSERR; |
1545 | } | 1441 | } |
1546 | 1442 | ||
@@ -1564,15 +1460,6 @@ counters_message_get (void *cls, | |||
1564 | struct Plugin *plugin = cls; | 1460 | struct Plugin *plugin = cls; |
1565 | 1461 | ||
1566 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_message; | 1462 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_message; |
1567 | MYSQL_STMT *statement = NULL; | ||
1568 | |||
1569 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1570 | if (NULL == statement) | ||
1571 | { | ||
1572 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1573 | "mysql get statement", statement); | ||
1574 | return GNUNET_SYSERR; | ||
1575 | } | ||
1576 | 1463 | ||
1577 | int ret = GNUNET_SYSERR; | 1464 | int ret = GNUNET_SYSERR; |
1578 | 1465 | ||
@@ -1586,7 +1473,7 @@ counters_message_get (void *cls, | |||
1586 | params_select)) | 1473 | params_select)) |
1587 | { | 1474 | { |
1588 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1475 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1589 | "mysql execute prepared", statement); | 1476 | "mysql execute prepared", stmt); |
1590 | return GNUNET_SYSERR; | 1477 | return GNUNET_SYSERR; |
1591 | } | 1478 | } |
1592 | 1479 | ||
@@ -1603,14 +1490,14 @@ counters_message_get (void *cls, | |||
1603 | if (GNUNET_OK != ret) | 1490 | if (GNUNET_OK != ret) |
1604 | { | 1491 | { |
1605 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1492 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1606 | "mysql extract_result", statement); | 1493 | "mysql extract_result", stmt); |
1607 | return GNUNET_SYSERR; | 1494 | return GNUNET_SYSERR; |
1608 | } | 1495 | } |
1609 | 1496 | ||
1610 | if (0 != mysql_stmt_reset (statement)) | 1497 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1611 | { | 1498 | { |
1612 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1499 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1613 | "mysql_stmt_reset", statement); | 1500 | "mysql_stmt_reset", stmt); |
1614 | return GNUNET_SYSERR; | 1501 | return GNUNET_SYSERR; |
1615 | } | 1502 | } |
1616 | 1503 | ||
@@ -1632,15 +1519,6 @@ counters_state_get (void *cls, | |||
1632 | struct Plugin *plugin = cls; | 1519 | struct Plugin *plugin = cls; |
1633 | 1520 | ||
1634 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_state; | 1521 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_counters_state; |
1635 | MYSQL_STMT *statement = NULL; | ||
1636 | |||
1637 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1638 | if (NULL == statement) | ||
1639 | { | ||
1640 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1641 | "mysql get_stmt", statement); | ||
1642 | return GNUNET_SYSERR; | ||
1643 | } | ||
1644 | 1522 | ||
1645 | int ret = GNUNET_SYSERR; | 1523 | int ret = GNUNET_SYSERR; |
1646 | 1524 | ||
@@ -1654,7 +1532,7 @@ counters_state_get (void *cls, | |||
1654 | params_select)) | 1532 | params_select)) |
1655 | { | 1533 | { |
1656 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1534 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1657 | "mysql execute prepared", statement); | 1535 | "mysql execute prepared", stmt); |
1658 | return GNUNET_SYSERR; | 1536 | return GNUNET_SYSERR; |
1659 | } | 1537 | } |
1660 | 1538 | ||
@@ -1669,14 +1547,14 @@ counters_state_get (void *cls, | |||
1669 | if (GNUNET_OK != ret) | 1547 | if (GNUNET_OK != ret) |
1670 | { | 1548 | { |
1671 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1549 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1672 | "mysql extract_result", statement); | 1550 | "mysql extract_result", stmt); |
1673 | return GNUNET_SYSERR; | 1551 | return GNUNET_SYSERR; |
1674 | } | 1552 | } |
1675 | 1553 | ||
1676 | if (0 != mysql_stmt_reset (statement)) | 1554 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1677 | { | 1555 | { |
1678 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1556 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1679 | "mysql_stmt_reset", statement); | 1557 | "mysql_stmt_reset", stmt); |
1680 | return GNUNET_SYSERR; | 1558 | return GNUNET_SYSERR; |
1681 | } | 1559 | } |
1682 | 1560 | ||
@@ -1696,16 +1574,6 @@ state_assign (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt, | |||
1696 | { | 1574 | { |
1697 | int ret = GNUNET_SYSERR; | 1575 | int ret = GNUNET_SYSERR; |
1698 | 1576 | ||
1699 | MYSQL_STMT *statement = NULL; | ||
1700 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1701 | |||
1702 | if (NULL == statement) | ||
1703 | { | ||
1704 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1705 | "mysql get_stmt", statement); | ||
1706 | return GNUNET_SYSERR; | ||
1707 | } | ||
1708 | |||
1709 | struct GNUNET_MY_QueryParam params[] = { | 1577 | struct GNUNET_MY_QueryParam params[] = { |
1710 | GNUNET_MY_query_param_auto_from_type (channel_key), | 1578 | GNUNET_MY_query_param_auto_from_type (channel_key), |
1711 | GNUNET_MY_query_param_string (name), | 1579 | GNUNET_MY_query_param_string (name), |
@@ -1720,14 +1588,14 @@ state_assign (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *stmt, | |||
1720 | if (GNUNET_OK != ret) | 1588 | if (GNUNET_OK != ret) |
1721 | { | 1589 | { |
1722 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1590 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1723 | "mysql execute prepared", statement); | 1591 | "mysql execute prepared", stmt); |
1724 | return GNUNET_SYSERR; | 1592 | return GNUNET_SYSERR; |
1725 | } | 1593 | } |
1726 | 1594 | ||
1727 | if (0 != mysql_stmt_reset (statement)) | 1595 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1728 | { | 1596 | { |
1729 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1597 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1730 | "mysql_stmt_reset", statement); | 1598 | "mysql_stmt_reset", stmt); |
1731 | return GNUNET_SYSERR; | 1599 | return GNUNET_SYSERR; |
1732 | } | 1600 | } |
1733 | 1601 | ||
@@ -1740,16 +1608,6 @@ update_message_id (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *s | |||
1740 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, | 1608 | const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, |
1741 | uint64_t message_id) | 1609 | uint64_t message_id) |
1742 | { | 1610 | { |
1743 | MYSQL_STMT *statement = NULL; | ||
1744 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1745 | |||
1746 | if (NULL == statement) | ||
1747 | { | ||
1748 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
1749 | "mysql get_stmt", statement); | ||
1750 | return GNUNET_SYSERR; | ||
1751 | } | ||
1752 | |||
1753 | struct GNUNET_MY_QueryParam params[] = { | 1611 | struct GNUNET_MY_QueryParam params[] = { |
1754 | GNUNET_MY_query_param_uint64 (&message_id), | 1612 | GNUNET_MY_query_param_uint64 (&message_id), |
1755 | GNUNET_MY_query_param_auto_from_type (channel_key), | 1613 | GNUNET_MY_query_param_auto_from_type (channel_key), |
@@ -1761,14 +1619,14 @@ update_message_id (struct Plugin *plugin, struct GNUNET_MYSQL_StatementHandle *s | |||
1761 | params)) | 1619 | params)) |
1762 | { | 1620 | { |
1763 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1621 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1764 | "mysql execute prepared", statement); | 1622 | "mysql execute prepared", stmt); |
1765 | return GNUNET_SYSERR; | 1623 | return GNUNET_SYSERR; |
1766 | } | 1624 | } |
1767 | 1625 | ||
1768 | if (0 != mysql_stmt_reset (statement)) | 1626 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
1769 | { | 1627 | { |
1770 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1628 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1771 | "mysql_stmt_reset", statement); | 1629 | "mysql_stmt_reset", stmt); |
1772 | return GNUNET_SYSERR; | 1630 | return GNUNET_SYSERR; |
1773 | } | 1631 | } |
1774 | 1632 | ||
@@ -1985,9 +1843,6 @@ state_get (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, | |||
1985 | int sql_ret ; | 1843 | int sql_ret ; |
1986 | 1844 | ||
1987 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_one; | 1845 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_one; |
1988 | MYSQL_STMT *statement = NULL; | ||
1989 | |||
1990 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
1991 | 1846 | ||
1992 | struct GNUNET_MY_QueryParam params_select[] = { | 1847 | struct GNUNET_MY_QueryParam params_select[] = { |
1993 | GNUNET_MY_query_param_auto_from_type (channel_key), | 1848 | GNUNET_MY_query_param_auto_from_type (channel_key), |
@@ -2022,13 +1877,13 @@ state_get (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key, | |||
2022 | break; | 1877 | break; |
2023 | default: | 1878 | default: |
2024 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1879 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2025 | "mysql extract_result", statement); | 1880 | "mysql extract_result", stmt); |
2026 | } | 1881 | } |
2027 | 1882 | ||
2028 | if (0 != mysql_stmt_reset (statement)) | 1883 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
2029 | { | 1884 | { |
2030 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1885 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2031 | "mysql_stmt_reset", statement); | 1886 | "mysql_stmt_reset", stmt); |
2032 | return GNUNET_SYSERR; | 1887 | return GNUNET_SYSERR; |
2033 | } | 1888 | } |
2034 | 1889 | ||
@@ -2052,15 +1907,6 @@ state_get_prefix (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_ | |||
2052 | int ret = GNUNET_SYSERR; | 1907 | int ret = GNUNET_SYSERR; |
2053 | 1908 | ||
2054 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_prefix; | 1909 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_prefix; |
2055 | MYSQL_STMT *statement = NULL; | ||
2056 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
2057 | |||
2058 | if (NULL == statement) | ||
2059 | { | ||
2060 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
2061 | "mysql get_stmt", statement); | ||
2062 | return GNUNET_SYSERR; | ||
2063 | } | ||
2064 | 1910 | ||
2065 | uint32_t name_len = (uint32_t) strlen (name); | 1911 | uint32_t name_len = (uint32_t) strlen (name); |
2066 | 1912 | ||
@@ -2107,15 +1953,15 @@ state_get_prefix (void *cls, const struct GNUNET_CRYPTO_EddsaPublicKey *channel_ | |||
2107 | break; | 1953 | break; |
2108 | default: | 1954 | default: |
2109 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1955 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2110 | "mysql extract_result", statement); | 1956 | "mysql extract_result", stmt); |
2111 | } | 1957 | } |
2112 | } | 1958 | } |
2113 | while (sql_ret == GNUNET_YES); | 1959 | while (sql_ret == GNUNET_YES); |
2114 | 1960 | ||
2115 | if (0 != mysql_stmt_reset (statement)) | 1961 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
2116 | { | 1962 | { |
2117 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1963 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2118 | "mysql_stmt_reset", statement); | 1964 | "mysql_stmt_reset", stmt); |
2119 | return GNUNET_SYSERR; | 1965 | return GNUNET_SYSERR; |
2120 | } | 1966 | } |
2121 | 1967 | ||
@@ -2139,15 +1985,6 @@ state_get_signed (void *cls, | |||
2139 | int ret = GNUNET_SYSERR; | 1985 | int ret = GNUNET_SYSERR; |
2140 | 1986 | ||
2141 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_signed; | 1987 | struct GNUNET_MYSQL_StatementHandle *stmt = plugin->select_state_signed; |
2142 | MYSQL_STMT *statement = NULL; | ||
2143 | |||
2144 | statement = GNUNET_MYSQL_statement_get_stmt (stmt); | ||
2145 | if (NULL == statement) | ||
2146 | { | ||
2147 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | ||
2148 | "mysql get_stmt", statement); | ||
2149 | return GNUNET_SYSERR; | ||
2150 | } | ||
2151 | 1988 | ||
2152 | struct GNUNET_MY_QueryParam params_select[] = { | 1989 | struct GNUNET_MY_QueryParam params_select[] = { |
2153 | GNUNET_MY_query_param_auto_from_type (channel_key), | 1990 | GNUNET_MY_query_param_auto_from_type (channel_key), |
@@ -2190,15 +2027,15 @@ state_get_signed (void *cls, | |||
2190 | break; | 2027 | break; |
2191 | default: | 2028 | default: |
2192 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 2029 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2193 | "mysql extract_result", statement); | 2030 | "mysql extract_result", stmt); |
2194 | } | 2031 | } |
2195 | } | 2032 | } |
2196 | while (sql_ret == GNUNET_YES); | 2033 | while (sql_ret == GNUNET_YES); |
2197 | 2034 | ||
2198 | if (0 != mysql_stmt_reset (statement)) | 2035 | if (0 != mysql_stmt_reset (GNUNET_MYSQL_statement_get_stmt (stmt))) |
2199 | { | 2036 | { |
2200 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 2037 | LOG_MYSQL(plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
2201 | "mysql_stmt_reset", statement); | 2038 | "mysql_stmt_reset", stmt); |
2202 | return GNUNET_SYSERR; | 2039 | return GNUNET_SYSERR; |
2203 | } | 2040 | } |
2204 | 2041 | ||