Refactored some parts, fixed a nasty bug in unpack_publish

Author: codepr

src/config.h

@@ -32,7 +32,7 @@
 
 // Default parameters
 
-#define VERSION                     "0.1.9"
+#define VERSION                     "0.3.5"
 #define DEFAULT_SOCKET_FAMILY       INET
 #define DEFAULT_LOG_LEVEL           DEBUG
 #define DEFAULT_LOG_PATH            "/tmp/sol.log"
@@ -74,6 +74,7 @@ struct config {
     size_t stats_pub_interval;
 };
 
+
 extern struct config *conf;
 
 

src/solcore.c src/core.csrc/solcore.c renamed to src/core.c

@@ -27,7 +27,7 @@
 
 #include <string.h>
 #include "util.h"
-#include "solcore.h"
+#include "core.h"
 
 
 static int compare_cid(void *c1, void *c2) {
@@ -51,16 +51,27 @@ void topic_init(struct topic *t, const char *name) {
 
 void topic_add_subscriber(struct topic *t,
                           struct sol_client *client,
-                          unsigned qos) {
+                          unsigned qos,
+                          bool cleansession) {
     struct subscriber *sub = sol_malloc(sizeof(*sub));
     sub->client = client;
     sub->qos = qos;
     t->subscribers = list_push(t->subscribers, sub);
+
+    // It must be added to the session if cleansession is false
+    if (!cleansession)
+        client->session.subscriptions =
+            list_push(client->session.subscriptions, t);
+
 }
 
 
-void topic_del_subscriber(struct topic *t, struct sol_client *client) {
+void topic_del_subscriber(struct topic *t,
+                          struct sol_client *client,
+                          bool cleansession) {
     list_remove_node(t->subscribers, client, compare_cid);
+
+    // TODO remomve in case of cleansession == false
 }
 
 

src/solcore.h src/core.hsrc/solcore.h renamed to src/core.h

@@ -25,8 +25,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SOLCORE_H
-#define SOLCORE_H
+#ifndef CORE_H
+#define CORE_H
 
 #include "trie.h"
 #include "list.h"
@@ -49,9 +49,19 @@ struct sol {
 };
 
 
+struct session {
+    List *subscriptions;
+    // TODO add pending confirmed messages
+};
+
+/*
+ * Wrapper structure around a connected client, each client can be a publisher
+ * or a subscriber, it can be used to track sessions too.
+ */
 struct sol_client {
     char *client_id;
     int fd;
+    struct session session;
 };
 
 
@@ -65,9 +75,9 @@ struct topic *topic_create(const char *);
 
 void topic_init(struct topic *, const char *);
 
-void topic_add_subscriber(struct topic *, struct sol_client *, unsigned);
+void topic_add_subscriber(struct topic *, struct sol_client *, unsigned, bool);
 
-void topic_del_subscriber(struct topic *, struct sol_client *);
+void topic_del_subscriber(struct topic *, struct sol_client *, bool);
 
 void sol_topic_put(struct sol *, struct topic *);
 

src/hashtable.c

@@ -34,13 +34,23 @@
 #include "util.h"
 #include "hashtable.h"
 
+/* Hashtable definition */
+struct hashtable {
+    size_t table_size;
+    size_t size;
+    int (*destructor)(struct hashtable_entry *);
+    struct hashtable_entry *entries;
+};
+
 
 const int INITIAL_SIZE = 4;
 
 const int MAX_CHAIN_LENGTH = 8;
 
 const unsigned long KNUTH_PRIME = 2654435761;
 
+static unsigned long crc32(const uint8_t *, unsigned int);
+
 /*
  * Hashing function for a string
  */
@@ -497,7 +507,7 @@ static unsigned long crc32_tab[] = {
 };
 
 /* Return a 32-bit CRC of the contents of the buffer. */
-unsigned long crc32(const uint8_t *s, unsigned int len) {
+static unsigned long crc32(const uint8_t *s, unsigned int len) {
     unsigned int i;
     uint64_t crc32val;
 

src/hashtable.h

@@ -48,18 +48,11 @@ struct hashtable_entry {
     bool taken;
 };
 
-
 /*
  * An HashTable has some maximum size and current size, as well as the data to
  * hold.
  */
-typedef struct {
-    size_t table_size;
-    size_t size;
-    int (*destructor)(struct hashtable_entry *);
-    struct hashtable_entry *entries;
-} HashTable;
-
+typedef struct hashtable HashTable;
 
 /*
  * HashTable API to create a new `HashTable`, it require a function pointer to
@@ -69,8 +62,8 @@ typedef struct {
 HashTable *hashtable_create(int (*destructor)(struct hashtable_entry *));
 
 /* Destroy the hashtable by calling functor `destructor` on every
- * `struct hashtable_entry`, thus it needs to have a defined destructor function for
- * each different data-type inserted. In case of a NULL destructor, it' ll call
+ * `struct hashtable_entry`, thus it needs to have a defined destructor function
+ * for each different data-type inserted. In case of a NULL destructor, it' ll call
  * normal free.
  */
 void hashtable_release(HashTable *);
@@ -107,7 +100,4 @@ int hashtable_map2(HashTable *,
         int (*func)(struct hashtable_entry *, void *), void *);
 
 
-uint64_t crc32(const uint8_t *, const uint32_t);
-
-
 #endif

src/mqtt.c

@@ -25,6 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <string.h>
 #include <arpa/inet.h>
 #include "util.h"
 #include "mqtt.h"
@@ -496,7 +497,7 @@ static unsigned char *pack_mqtt_publish(const union mqtt_packet *pkt) {
     // Total len of the packet excluding fixed header len
     size_t len = 0L;
 
-    if (pkt->header.bits.qos > AT_MOST_ONCE)
+    if (pkt->publish.header.bits.qos > AT_MOST_ONCE)
         pktlen += sizeof(uint16_t);
 
     unsigned char *packed = sol_malloc(pktlen);
@@ -519,7 +520,7 @@ static unsigned char *pack_mqtt_publish(const union mqtt_packet *pkt) {
     pack_bytes(&ptr, pkt->publish.topic);
 
     // Packet id
-    if (pkt->header.bits.qos > AT_MOST_ONCE)
+    if (pkt->publish.header.bits.qos > AT_MOST_ONCE)
         pack_u16(&ptr, pkt->publish.pkt_id);
 
     // Finally the payload, same way of topic, payload len -> payload
@@ -586,7 +587,8 @@ struct mqtt_suback *mqtt_packet_suback(unsigned char byte,
     suback->header.byte = byte;
     suback->pkt_id = pkt_id;
     suback->rcslen = rcslen;
-    suback->rcs = (unsigned char *) sol_strdup((const char *) rcs);
+    suback->rcs = sol_malloc(rcslen);
+    memcpy(suback->rcs, rcs, rcslen);
 
     return suback;
 }

src/mqtt.h

@@ -214,8 +214,12 @@ typedef union mqtt_header mqtt_disconnect;
 
 union mqtt_packet {
 
+    // This will cover PUBACK, PUBREC, PUBREL, PUBCOMP and UNSUBACK
     struct mqtt_ack ack;
+
+    // This will cover PINGREQ, PINGRESP and DISCONNECT
     union mqtt_header header;
+
     struct mqtt_connect connect;
     struct mqtt_connack connack;
     struct mqtt_suback suback;

src/network.c

@@ -233,7 +233,7 @@ ssize_t send_bytes(int fd, const unsigned char *buf, size_t len) {
 
 err:
 
-    fprintf(stderr, "send(2) - error sending data: %s", strerror(errno));
+    fprintf(stderr, "send(2) - error sending data: %s\n", strerror(errno));
     return -1;
 }
 

src/pack.c

@@ -91,16 +91,18 @@ uint8_t unpack_u8(const uint8_t **buf) {
 
 
 uint16_t unpack_u16(const uint8_t **buf) {
-    uint16_t val = ntohs(*((uint16_t *) (*buf)));
+    uint16_t val;
+    memcpy(&val, *buf, sizeof(uint16_t));
     (*buf) += sizeof(uint16_t);
-    return val;
+    return ntohs(val);
 }
 
 
 uint32_t unpack_u32(const uint8_t **buf) {
-    uint32_t val = ntohl(*((uint32_t *) (*buf)));
+    uint32_t val;
+    memcpy(&val, *buf, sizeof(uint32_t));
     (*buf) += sizeof(uint32_t);
-    return val;
+    return ntohl(val);
 }
 
 
@@ -128,13 +130,15 @@ void pack_u8(uint8_t **buf, uint8_t val) {
 
 
 void pack_u16(uint8_t **buf, uint16_t val) {
-    *((uint16_t *) (*buf)) = htons(val);
+    uint16_t htonsval = htons(val);
+    memcpy(*buf, &htonsval, sizeof(uint16_t));
     (*buf) += sizeof(uint16_t);
 }
 
 
 void pack_u32(uint8_t **buf, uint32_t val) {
-    *((uint32_t *) (*buf)) = htonl(val);
+    uint32_t htonlval = htonl(val);
+    memcpy(*buf, &htonlval, sizeof(uint32_t));
     (*buf) += sizeof(uint32_t);
 }