* @file my/my_query_helper.c
* @brief library to help with access to a MySQL database
* @author Christian Grothoff
+ * @author Christophe Genevey
*/
#include "platform.h"
#include <mysql/mysql.h>
#include "gnunet_my_lib.h"
+
+/**
+ * Function called to clean up memory allocated
+ * by a #GNUNET_MY_QueryConverter.
+ *
+ * @param cls closure
+ * @param qbind array of parameter to clean up
+ */
+static void
+my_clean_query (void *cls,
+ MYSQL_BIND *qbind)
+{
+ GNUNET_free (qbind[0].buffer);
+}
+
+
/**
* Function called to convert input argument into SQL parameters.
*
size_t ptr_size)
{
struct GNUNET_MY_QueryParam qp = {
- &my_conv_fixed_size,
- NULL,
- 1,
- ptr,
- (unsigned long) ptr_size
+ .conv = &my_conv_fixed_size,
+ .cleaner = NULL,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = ptr,
+ .data_len = (unsigned long) ptr_size
};
return qp;
}
strlen(ptr));
}
+
/**
* Function called to convert input argument into SQL parameters
*
*@param cls closure
*@param pq data about the query
* @param qbind array of parameters to initialize
- *@return -1 on error
+ *@return -1 on error
*/
static int
my_conv_uint16 (void *cls,
const struct GNUNET_MY_QueryParam * qp,
MYSQL_BIND *qbind)
{
- const uint16_t *u_hbo = qp->data;
- uint16_t *u_nbo;
-
GNUNET_assert (1 == qp->num_params);
-
-
- u_nbo = GNUNET_new (uint16_t);
- if (NULL == u_nbo)
- return -1;
-
-// *u_nbo = htons (*u_hbo);
- *u_nbo = *u_hbo;
-
- qbind->buffer = (void *) u_nbo;
- qbind->buffer_length = sizeof(uint16_t);
+ qbind->buffer = (void *) qp->data;
+ qbind->buffer_length = sizeof (uint16_t);
qbind->buffer_type = MYSQL_TYPE_SHORT;
-
return 1;
}
+
/**
* Generate query parameter for an uint16_t in host byte order.
*
struct GNUNET_MY_QueryParam
GNUNET_MY_query_param_uint16 (const uint16_t *x)
{
- struct GNUNET_MY_QueryParam res = {
- &my_conv_uint16,
- NULL,
- 1,
- x,
- sizeof (*x)
- };
+ struct GNUNET_MY_QueryParam res = {
+ .conv = &my_conv_uint16,
+ .cleaner = NULL,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = x,
+ .data_len = sizeof (*x)
+ };
return res;
}
+
/**
* Function called to convert input argument into SQL parameters
*
*@param cls closure
*@param pq data about the query
* @param qbind array of parameters to initialize
- *@return -1 on error
+ *@return -1 on error
*/
-static int
+static int
my_conv_uint32 (void *cls,
const struct GNUNET_MY_QueryParam *qp,
MYSQL_BIND *qbind)
{
- const uint32_t *u_hbo = qp->data;
- uint32_t * u_nbo;
-
GNUNET_assert (1 == qp->num_params);
-
- u_nbo = GNUNET_new (uint32_t);
-// *u_nbo = htonl (*u_hbo);
- *u_nbo = *u_hbo;
-
- qbind->buffer = (void *) u_nbo;
+ qbind->buffer = (void *) qp->data;
qbind->buffer_length = sizeof(uint32_t);
qbind->buffer_type = MYSQL_TYPE_LONG;
return 1;
}
+
/**
* Generate query parameter for an uint32_t in host byte order
*
GNUNET_MY_query_param_uint32 (const uint32_t *x)
{
struct GNUNET_MY_QueryParam res = {
- &my_conv_uint32,
- NULL,
- 1,
- x,
- sizeof (*x)
+ .conv = &my_conv_uint32,
+ .cleaner = NULL,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = x,
+ .data_len = sizeof (*x)
};
-
+
return res;
}
+
/**
* Function called to convert input argument into SQL parameters
*
*@param cls closure
*@param pq data about the query
* @param qbind array of parameters to initialize
- *@return -1 on error
+ *@return -1 on error
*/
static int
my_conv_uint64 (void *cls,
- const struct GNUNET_MY_QueryParam *qp,
- MYSQL_BIND * qbind)
+ const struct GNUNET_MY_QueryParam *qp,
+ MYSQL_BIND * qbind)
{
- const uint64_t * u_hbo = qp->data;
- uint64_t *u_nbo;
-
GNUNET_assert (1 == qp->num_params);
-
- u_nbo = GNUNET_new(uint64_t);
- //*u_nbo = GNUNET_htonll (*u_hbo);
- *u_nbo = *u_hbo;
-
- qbind->buffer = (void *) u_nbo;
+ qbind->buffer = (void *) qp->data;
qbind->buffer_length = sizeof (uint64_t);
qbind->buffer_type = MYSQL_TYPE_LONGLONG;
-
- return 1;
+ return 1;
}
+
/**
* Generate query parameter for an uint64_t in host byte order
*
GNUNET_MY_query_param_uint64 (const uint64_t *x)
{
struct GNUNET_MY_QueryParam res = {
- &my_conv_uint64,
- NULL,
- 1,
- x,
- sizeof(*x)
+ .conv = &my_conv_uint64,
+ .cleaner = NULL,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = x,
+ .data_len = sizeof(*x)
};
return res;
}
+
/**
* Function called to convert input argument into SQL parameters
*
*@param cls closure
*@param pq data about the query
* @param qbind array of parameters to initialize
- *@return -1 on error
+ *@return -1 on error
*/
static int
my_conv_rsa_public_key (void *cls,
const struct GNUNET_MY_QueryParam *qp,
MYSQL_BIND * qbind)
- {
- const struct GNUNET_CRYPTO_RsaPublicKey *rsa = qp->data;
- char *buf;
- size_t buf_size;
+{
+ const struct GNUNET_CRYPTO_RsaPublicKey *rsa = qp->data;
+ char *buf;
+ size_t buf_size;
- GNUNET_assert(1 == qp->num_params);
+ GNUNET_assert(1 == qp->num_params);
+
+ buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, &buf);
- buf_size = GNUNET_CRYPTO_rsa_public_key_encode (rsa, &buf);
+ qbind->buffer = (void *) buf;
+ qbind->buffer_length = buf_size;
+ qbind->buffer_type = MYSQL_TYPE_BLOB;
- qbind->buffer = (void *)buf;
- qbind->buffer_length = buf_size - 1;
- qbind->buffer_type = MYSQL_TYPE_LONG;
+ return 1;
+}
- return 1;
- }
- /**
- * Generate query parameter for an RSA public key. The
- * database must contain a BLOB type in the respective position.
- *
- * @param x the query parameter to pass
- * @return array entry for the query parameters to use
- */
+/**
+ * Generate query parameter for an RSA public key. The
+ * database must contain a BLOB type in the respective position.
+ *
+ * @param x the query parameter to pass
+ * @return array entry for the query parameters to use
+ */
struct GNUNET_MY_QueryParam
GNUNET_MY_query_param_rsa_public_key (const struct GNUNET_CRYPTO_RsaPublicKey *x)
{
struct GNUNET_MY_QueryParam res = {
- &my_conv_rsa_public_key,
- NULL,
- 1,
- x,
- 0
+ .conv = &my_conv_rsa_public_key,
+ .cleaner = &my_clean_query,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = x,
+ .data_len = 0
};
return res;
}
+
/**
* Function called to convert input argument into SQL parameters
*
*@param cls closure
*@param pq data about the query
- * @param qbind array of parameters to initialize
- *@return -1 on error
+ *@param qbind array of parameters to initialize
+ *@return -1 on error
*/
-static int
+static int
my_conv_rsa_signature (void *cls,
- const struct GNUNET_MY_QueryParam *qp,
- MYSQL_BIND * qbind)
+ const struct GNUNET_MY_QueryParam *qp,
+ MYSQL_BIND *qbind)
{
const struct GNUNET_CRYPTO_RsaSignature *sig = qp->data;
char *buf;
GNUNET_assert(1 == qp->num_params);
- buf_size = GNUNET_CRYPTO_rsa_signature_encode(sig,
- &buf);
-
- qbind->buffer = (void *)buf;
- qbind->buffer_length = buf_size - 1;
- qbind->buffer_type = MYSQL_TYPE_LONG;
+ buf_size = GNUNET_CRYPTO_rsa_signature_encode (sig,
+ &buf);
+ qbind->buffer = (void *) buf;
+ qbind->buffer_length = buf_size;
+ qbind->buffer_type = MYSQL_TYPE_BLOB;
return 1;
}
+
/**
* Generate query parameter for an RSA signature. The
* database must contain a BLOB type in the respective position
GNUNET_MY_query_param_rsa_signature (const struct GNUNET_CRYPTO_RsaSignature *x)
{
struct GNUNET_MY_QueryParam res = {
- &my_conv_rsa_signature,
- NULL,
- 1,
- (x),
- 0
+ .conv = &my_conv_rsa_signature,
+ .cleaner = &my_clean_query,
+ .conv_cls = NULL,
+ .num_params = 1,
+ .data = (x),
+ .data_len = 0
};
return res;
}
+
/**
* Generate query parameter for an absolute time value.
* The database must store a 64-bit integer.
return GNUNET_MY_query_param_uint64 (&x->abs_value_us);
}
+
/**
* Generate query parameter for an absolute time value.
* The database must store a 64-bit integer.
return GNUNET_MY_query_param_auto_from_type (&x->abs_value_us__);
}
-/* end of my_query_helper.c */
\ No newline at end of file
+
+/* end of my_query_helper.c */
projects / oweals / gnunet.git / blobdiff