simplify will

include/lwmqtt.h

@@ -189,17 +189,14 @@ void lwmqtt_set_callback(lwmqtt_client_t *client, void *ref, lwmqtt_callback_t c
  */
 typedef struct {
   lwmqtt_string_t topic;
-  void *payload;
-  int payload_len;
-  bool retained;
-  lwmqtt_qos_t qos;
+  lwmqtt_message_t message;
 } lwmqtt_will_t;
 
 /**
  * The default initializer for the will object.
  */
 #define lwmqtt_default_will \
-  { lwmqtt_default_string, NULL, 0, false, LWMQTT_QOS0 }
+  { lwmqtt_default_string, lwmqtt_default_message }
 
 /**
  * The object containing the connections options for a client.

src/os/unix.c

@@ -2,7 +2,6 @@
 #include <errno.h>
 #include <memory.h>
 #include <netdb.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <unistd.h>

src/packet.c

@@ -150,7 +150,7 @@ lwmqtt_err_t lwmqtt_encode_connect(unsigned char *buf, int buf_len, int *len, lw
 
   // add will if present
   if (will != NULL) {
-    rem_len += will->topic.len + 2 + will->payload_len + 2;
+    rem_len += will->topic.len + 2 + will->message.payload_len + 2;
   }
 
   // add username if present
@@ -189,8 +189,8 @@ lwmqtt_err_t lwmqtt_encode_connect(unsigned char *buf, int buf_len, int *len, lw
   // set will flags if present
   if (will != NULL) {
     flags.bits.will = 1;
-    flags.bits.will_qos = (unsigned int)will->qos;
-    flags.bits.will_retain = will->retained ? 1 : 0;
+    flags.bits.will_qos = (unsigned int)will->message.qos;
+    flags.bits.will_retain = will->message.retained ? 1 : 0;
   }
 
   // set username flag if present
@@ -215,9 +215,9 @@ lwmqtt_err_t lwmqtt_encode_connect(unsigned char *buf, int buf_len, int *len, lw
   // write will topic and payload if present
   if (will != NULL) {
     lwmqtt_write_string(&ptr, will->topic);
-    lwmqtt_write_int(&ptr, will->payload_len);
-    memcpy(ptr, will->payload, will->payload_len);
-    ptr += will->payload_len;
+    lwmqtt_write_int(&ptr, will->message.payload_len);
+    memcpy(ptr, will->message.payload, will->message.payload_len);
+    ptr += will->message.payload_len;
   }
 
   // write username if present

tests/packet.cpp

@@ -119,9 +119,9 @@ TEST(ConnectTest, Encode1) {
 
   lwmqtt_will_t will = lwmqtt_default_will;
   will.topic = lwmqtt_str("will");
-  will.payload = (void*)"send me home";
-  will.payload_len = (int)strlen((const char*)will.payload);
-  will.qos = LWMQTT_QOS1;
+  will.message.payload = (void*)"send me home";
+  will.message.payload_len = (int)strlen((const char*)will.message.payload);
+  will.message.qos = LWMQTT_QOS1;
 
   lwmqtt_options_t opts = lwmqtt_default_options;
   opts.clean_session = false;