Skip to content

P
paho.mqtt.c
Commit b925358d authored by Ian Craggs's avatar Ian Craggs
Browse files
Options

Add MQTTVersion fields to Trace output for MQTTClient, to match MQTTAsync

parent 6e79a6b0
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
src/MQTTClient.c
View file @ b925358d
......@@ -47,9 +47,9 @@
#endif
#define URI_TCP "tcp://"
#define BUILD_TIMESTAMP "##MQTTCLIENT_BUILD_TAG##"
#define CLIENT_VERSION "##MQTTCLIENT_VERSION_TAG##"
#define CLIENT_VERSION "##MQTTCLIENT_VERSION_TAG##"
char* client_timestamp_eye = "MQTTClientV3_Timestamp " BUILD_TIMESTAMP;
char* client_version_eye = "MQTTClientV3_Version " CLIENT_VERSION;
......@@ -232,7 +232,7 @@ int MQTTClient_create(MQTTClient* handle, char* serverURI, char* clientId,
#if defined(HEAP_H)
Heap_initialize();
#endif
Log_initialize(NULL);
Log_initialize((Log_nameValue*)MQTTClient_getVersionInfo());
bstate->clients = ListInitialize();
Socket_outInitialize();
Socket_setWriteCompleteCallback(MQTTClient_writeComplete);
......@@ -790,12 +790,12 @@ int MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectOptions* options,
rc = SSLSocket_connect(m->c->net.ssl, m->c->net.socket);
if (rc == -1)
m->c->connect_state = 2;
else if (rc == SSL_FATAL)
else if (rc == SSL_FATAL)
{
rc = SOCKET_ERROR;
goto exit;
goto exit;
}
else if (rc == 1 && !m->c->cleansession && m->c->session == NULL)
else if (rc == 1 && !m->c->cleansession && m->c->session == NULL)
m->c->session = SSL_get1_session(m->c->net.ssl);
}
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment