hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compile listener and ssl as C++

Browse Source
This commit is contained in:
Johan Wikman 2017-03-24 11:11:15 +02:00
parent b04e8b93c9
commit 8d7653bdff
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/CMakeLists.txt
View File

@ -12,6 +12,7 @@ add_library(maxscale-common SHARED
hashtable.cc
hint.cc
housekeeper.cc
listener.cc
load_utils.cc
log_manager.cc
maxscale_pcre2.cc
@ -20,9 +21,9 @@ add_library(maxscale-common SHARED
modutil.cc
monitor.cc
paths.cc
poll.cc
query_classifier.cc
queuemanager.cc
poll.cc
random_jkiss.cc
resultset.cc
router.cc
@ -30,13 +31,14 @@ add_library(maxscale-common SHARED
server.cc
service.cc
session.cc
skygw_utils.cc
spinlock.cc
ssl.cc
statistics.cc
thread.cc
users.cc
utils.cc
skygw_utils.cc
statistics.cc
listener.c ssl.c mysql_utils.c mysql_binlog.c modulecmd.c)
mysql_utils.c mysql_binlog.c modulecmd.c)
if(WITH_JEMALLOC)
target_link_libraries(maxscale-common ${JEMALLOC_LIBRARIES})

0
server/core/listener.c → server/core/listener.cc
View File

6
server/core/ssl.c → server/core/ssl.cc
View File

@ -49,9 +49,9 @@
*/
int ssl_authenticate_client(DCB *dcb, bool is_capable)
{
char *user = dcb->user ? dcb->user : "";
char *remote = dcb->remote ? dcb->remote : "";
char *service = (dcb->service && dcb->service->name) ? dcb->service->name : "";
const char *user = dcb->user ? dcb->user : "";
const char *remote = dcb->remote ? dcb->remote : "";
const char *service = (dcb->service && dcb->service->name) ? dcb->service->name : "";
if (NULL == dcb->listener || NULL == dcb->listener->ssl)
{