From 7cef936ba67667364bcecdbabd1f35ef285c084e Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Tue, 3 Jun 2014 15:16:27 +0100 Subject: [PATCH] Logging fixes. --- src/read_handle_server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/read_handle_server.c b/src/read_handle_server.c index 34579572..3d470d5e 100644 --- a/src/read_handle_server.c +++ b/src/read_handle_server.c @@ -124,7 +124,7 @@ int mqtt3_handle_connect(struct mosquitto_db *db, struct mosquitto *context) mqtt3_context_disconnect(db, context); return 1; } - clean_session = connect_flags & 0x02; + clean_session = (connect_flags & 0x02) >> 1; will = connect_flags & 0x04; will_qos = (connect_flags & 0x18) >> 3; if(will_qos == 3){ @@ -451,15 +451,15 @@ int mqtt3_handle_connect(struct mosquitto_db *db, struct mosquitto *context) if(db->config->connection_messages == true){ if(context->is_bridge){ if(context->username){ - _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New bridge connected from %s as %s (c%d, k%d, u%s).", context->address, context->id, clean_session, context->keepalive, context->username); + _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New bridge connected from %s as %s (c%d, k%d, u%s).", context->address, client_id, clean_session, context->keepalive, context->username); }else{ - _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New bridge connected from %s as %s (c%d, k%d).", context->address, context->id, clean_session, context->keepalive); + _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New bridge connected from %s as %s (c%d, k%d).", context->address, client_id, clean_session, context->keepalive); } }else{ if(context->username){ - _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New client connected from %s as %s (c%d, k%d, u%s).", context->address, context->id, clean_session, context->keepalive, context->username); + _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New client connected from %s as %s (c%d, k%d, u%s).", context->address, client_id, clean_session, context->keepalive, context->username); }else{ - _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New client connected from %s as %s (c%d, k%d).", context->address, context->id, clean_session, context->keepalive); + _mosquitto_log_printf(NULL, MOSQ_LOG_NOTICE, "New client connected from %s as %s (c%d, k%d).", context->address, client_id, clean_session, context->keepalive); } } }