[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r38127 - in gnunet/src: gns my mysql transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r38127 - in gnunet/src: gns my mysql transport |
Date: |
Tue, 11 Oct 2016 18:13:04 +0200 |
Author: grothoff
Date: 2016-10-11 18:13:03 +0200 (Tue, 11 Oct 2016)
New Revision: 38127
Modified:
gnunet/src/gns/gnunet-gns-proxy.c
gnunet/src/my/my.c
gnunet/src/mysql/mysql.c
gnunet/src/transport/plugin_transport_http_server.c
Log:
deprecate USE_SSL for USE_TLS, rename in code
Modified: gnunet/src/gns/gnunet-gns-proxy.c
===================================================================
--- gnunet/src/gns/gnunet-gns-proxy.c 2016-10-11 16:10:39 UTC (rev 38126)
+++ gnunet/src/gns/gnunet-gns-proxy.c 2016-10-11 16:13:03 UTC (rev 38127)
@@ -2302,7 +2302,7 @@
hd->is_ssl = GNUNET_YES;
hd->domain = GNUNET_strdup (domain);
hd->proxy_cert = pgc;
- hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_SSL |
MHD_USE_NO_LISTEN_SOCKET,
+ hd->daemon = MHD_start_daemon (MHD_USE_DEBUG | MHD_USE_TLS |
MHD_USE_NO_LISTEN_SOCKET,
0,
NULL, NULL,
&create_response, hd,
Modified: gnunet/src/my/my.c
===================================================================
--- gnunet/src/my/my.c 2016-10-11 16:10:39 UTC (rev 38126)
+++ gnunet/src/my/my.c 2016-10-11 16:13:03 UTC (rev 38127)
@@ -181,6 +181,7 @@
stmt,
field_off,
&result[field_off]))
+
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Pre-conversion for MySQL result failed at offset %u\n",
Modified: gnunet/src/mysql/mysql.c
===================================================================
--- gnunet/src/mysql/mysql.c 2016-10-11 16:10:39 UTC (rev 38126)
+++ gnunet/src/mysql/mysql.c 2016-10-11 16:13:03 UTC (rev 38127)
@@ -197,7 +197,7 @@
* our default options).
*
* @param mc database context to initialze
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
iopen (struct GNUNET_MYSQL_Context *mc)
@@ -300,7 +300,8 @@
mc = GNUNET_new (struct GNUNET_MYSQL_Context);
mc->cfg = cfg;
mc->section = section;
- mc->cnffile = get_my_cnf_path (cfg, section);
+ mc->cnffile = get_my_cnf_path (cfg,
+ section);
return mc;
}
@@ -383,18 +384,22 @@
*
* @param mc mysql context
* @param sql SQL statement to run
- * @return GNUNET_OK on success
- * GNUNET_SYSERR if there was a problem
+ * @return #GNUNET_OK on success
+ * #GNUNET_SYSERR if there was a problem
*/
int
-GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc, const char *sql)
+GNUNET_MYSQL_statement_run (struct GNUNET_MYSQL_Context *mc,
+ const char *sql)
{
- if ((NULL == mc->dbf) && (GNUNET_OK != iopen (mc)))
+ if ( (NULL == mc->dbf) &&
+ (GNUNET_OK != iopen (mc)) )
return GNUNET_SYSERR;
mysql_query (mc->dbf, sql);
if (mysql_error (mc->dbf)[0])
{
- LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR, "mysql_query", mc);
+ LOG_MYSQL (GNUNET_ERROR_TYPE_ERROR,
+ "mysql_query",
+ mc);
GNUNET_MYSQL_statements_invalidate (mc);
return GNUNET_SYSERR;
}
@@ -407,7 +412,7 @@
*
* @param mc mysql context
* @param sh statement handle to prepare
- * @return GNUNET_OK on success
+ * @return #GNUNET_OK on success
*/
static int
prepare_statement (struct GNUNET_MYSQL_StatementHandle *sh)
Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2016-10-11 16:10:39 UTC
(rev 38126)
+++ gnunet/src/transport/plugin_transport_http_server.c 2016-10-11 16:13:03 UTC
(rev 38127)
@@ -2200,7 +2200,7 @@
MHD_USE_DEBUG |
#endif
#if BUILD_HTTPS
- MHD_USE_SSL |
+ MHD_USE_TLS |
#endif
MHD_USE_SUSPEND_RESUME |
v6,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r38127 - in gnunet/src: gns my mysql transport,
gnunet <=