Primitive v5 CONNACK support - no properties.

eclipse · Sep 19, 2018 · 4ee6941 · 4ee6941
1 parent 561513f
commit 4ee6941
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
@@ -116,7 +116,7 @@ enum mosquitto__protocol {
  mosq_p_mqtt31 = 1,
  mosq_p_mqtt311 = 2,
  mosq_p_mqtts = 3,
- mosq_p_mqtt5 = 4,
+ mosq_p_mqtt5 = 5,
 };
 
 enum mosquitto__threaded_state {

diff --git a/src/send_connack.c b/src/send_connack.c
@@ -39,14 +39,22 @@ int send__connack(struct mosquitto *context, int ack, int result)
  if(!packet) return MOSQ_ERR_NOMEM;
 
  packet->command = CONNACK;
- packet->remaining_length = 2;
+ if(context->protocol == mosq_p_mqtt5){
+ /* FIXME - proper property support */
+ packet->remaining_length = 3;
+ }else{
+ packet->remaining_length = 2;
+ }
  rc = packet__alloc(packet);
  if(rc){
  mosquitto__free(packet);
  return rc;
  }
  packet->payload[packet->pos+0] = ack;
  packet->payload[packet->pos+1] = result;
+ if(context->protocol == mosq_p_mqtt5){
+ packet->payload[packet->pos+2] = 0;
+ }
 
  return packet__queue(context, packet);
 }