Updated basic config and minor refactor

Author: codepr

conf/sol.conf

@@ -6,7 +6,7 @@
 # is set, UNIX family socket will be used
 
 ip_address 127.0.0.1
-ip_port 8883
+ip_port 1883  # 8883 for MQTT over TLS (MQTT clients such as mosquitto will automatically add TLS)
 
 # unix_socket /tmp/sol.sock
 

src/handlers.c

@@ -238,31 +238,34 @@ int publish_message(struct mqtt_packet *pkt, const struct topic *t)
 }
 
 /*
- * Check if a topic match a wildcard subscription. It works with + and # as
+ * Check if a topic matches a wildcard subscription. It works with + and # as
  * well
  */
-static inline int match_subscription(const char *topic, const char *wtopic,
-                                     bool multilevel)
+static int match_subscription(const char *topic, const char *wtopic,
+                              bool multilevel)
 {
     size_t len = strlen(wtopic);
     int i = 0, j = 0;
     bool found   = false;
     char *ptopic = (char *)topic;
+
+    if (!ptopic)
+        return -SOL_ERR;
+
     /*
      * Cycle through the wildcard topic, char by char, seeking for '+' char and
      * at the same time assuring that every char is equal in the topic as well,
      * we don't want to accept different topics
      */
     while (i < len && wtopic[i]) {
         j = 0;
-        for (; i < len; ++i) {
+        for (; i < len; ++i, ++j) {
             if (wtopic[i] == '+') {
                 found = true;
                 break;
-            } else if (!ptopic || (wtopic[i] != ptopic[j])) {
+            } else if (wtopic[i] != ptopic[j]) {
                 return -SOL_ERR;
             }
-            j++;
         }
         /*
          * Get a pointer to the next '/', called two times because we want to

src/server.c

@@ -37,7 +37,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
-#include <sys/event.h>
 #include <unistd.h>
 
 #define BUFSIZE 2048
@@ -432,7 +431,6 @@ static inline int write_data(Connection_Context *c)
 {
     ssize_t wrote = send_data(&c->conn, c->send_buf + c->written,
                               c->write_total - c->written);
-    printf("WEWEW %s (%zu)\n", c->cid, wrote);
     if (errno != EAGAIN && errno != EWOULDBLOCK && wrote < 0)
         goto e_client_dc;
     c->written += wrote > 0 ? wrote : 0;