FIX libmosquitto inflight_messages counter when reconnect

FIX MQTTKit remove handlers on disconnect

Author: lubbo

MQTTKit/MQTTKit.h

@@ -73,6 +73,8 @@ typedef void (^MQTTDisconnectionHandler)(NSUInteger code);
 - (MQTTClient*) initWithClientId: (NSString *)clientId
                     cleanSession: (BOOL )cleanSession;
 
+- (void) destroy;
+
 - (void) setMaxInflightMessages:(NSUInteger)maxInflightMessages;
 - (void) setMessageRetry: (NSUInteger)seconds;
 

MQTTKit/MQTTKit.m

@@ -10,7 +10,7 @@
 #import "MQTTKit.h"
 #import "mosquitto.h"
 
-#if 0 // set to 1 to enable logs
+#if 1 // set to 1 to enable logs
 
 #define LogDebug(frmt, ...) NSLog(frmt, ##__VA_ARGS__);
 
@@ -92,9 +92,9 @@ static void on_disconnect(struct mosquitto *mosq, void *obj, int rc)
 {
     MQTTClient* client = (__bridge MQTTClient*)obj;
     LogDebug(@"[%@] on_disconnect rc = %d", client.clientID, rc);
-    [client.publishHandlers removeAllObjects];
-    [client.subscriptionHandlers removeAllObjects];
-    [client.unsubscriptionHandlers removeAllObjects];
+//    [client.publishHandlers removeAllObjects];
+//    [client.subscriptionHandlers removeAllObjects];
+//    [client.unsubscriptionHandlers removeAllObjects];
 
     client.connected = NO;
     if (client.disconnectionHandler) {
@@ -216,6 +216,14 @@ - (MQTTClient*) initWithClientId: (NSString *)clientId
     return self;
 }
 
+- (void) destroy
+{
+    if (mosq) {
+        mosquitto_destroy(mosq);
+        mosq = NULL;
+    }
+}
+
 - (void) setMaxInflightMessages:(NSUInteger)maxInflightMessages
 {
     mosquitto_max_inflight_messages_set(mosq, (unsigned int)maxInflightMessages);
@@ -226,11 +234,9 @@ - (void) setMessageRetry: (NSUInteger)seconds
     mosquitto_message_retry_set(mosq, (unsigned int)seconds);
 }
 
-- (void) dealloc {
-    if (mosq) {
-        mosquitto_destroy(mosq);
-        mosq = NULL;
-    }
+- (void) dealloc
+{
+    [self destroy];
 }
 
 #pragma mark - Connection
@@ -255,7 +261,7 @@ - (void) connectWithCompletionHandler:(void (^)(MQTTConnectionReturnCode code))c
     }
     // add tls insecure set
     mosquitto_tls_insecure_set(mosq, self.tlsInsecure);
-    mosquitto_tls_opts_set(mosq,0,"tlsv1",nil);
+    mosquitto_tls_opts_set(mosq,1,"tlsv1",nil);
 
     mosquitto_connect(mosq, cstrHost, self.port, self.keepAlive);
 

libmosquitto/messages_mosq.c

@@ -147,10 +147,10 @@ void _mosquitto_messages_reconnect_reset(struct mosquitto *mosq)
 		message->timestamp = 0;
 		if(message->direction == mosq_md_out){
 			mosq->queue_len++;
-			if(message->msg.qos > 0){
-				mosq->inflight_messages++;
-			}
 			if(mosq->max_inflight_messages == 0 || mosq->inflight_messages < mosq->max_inflight_messages){
+                if(message->msg.qos > 0){
+                    mosq->inflight_messages++;
+                }
 				if(message->msg.qos == 1){
 					message->state = mosq_ms_wait_for_puback;
 				}else if(message->msg.qos == 2){

libmosquitto/tls_mosq.c

@@ -59,35 +59,6 @@ int _mosquitto_server_certificate_verify(int preverify_ok, X509_STORE_CTX *ctx)
 
 	/* Always reject if preverify_ok has failed. */
 	if(!preverify_ok) return 0;
-    {
-        char buf[256];
-        int err, depth;
-        cert = X509_STORE_CTX_get_current_cert(ctx);
-        err = X509_STORE_CTX_get_error(ctx);
-        depth = X509_STORE_CTX_get_error_depth(ctx);
-        X509_NAME_oneline(X509_get_subject_name(cert), buf, 256);
-
-        ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
-        long result = SSL_get_verify_result(ssl);
-
-        X509 *brokerCert = SSL_get_peer_certificate(ssl);
-
-        const char *dir;
-
-        dir = getenv(X509_get_default_cert_dir_env());
-
-        if (!dir)
-            dir = X509_get_default_cert_dir();
-
-        printf("verify error:num=%d:%s:depth=%d:%s\n", err,
-               X509_verify_cert_error_string(err), depth, buf);
-        //return 0;
-
-        if (err == 18)
-        {
-            return 1;
-        }
-    }
 
 	ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx());
 	mosq = SSL_get_ex_data(ssl, tls_ex_index_mosq);