nicolabs/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-05-21 12:24:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bridge

Browse source
This commit is contained in:
Roger A. Light 2024-03-18 14:39:06 +00:00
parent 78cba447a2
commit 2f9bf0e5cf
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/send_connect.c
View file

@ -81,8 +81,8 @@ int send__connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session
version = MQTT_PROTOCOL_V5;
headerlen = 10;
proplen = 0;
proplen += mosquitto_property_get_remaining_length(properties);
proplen += mosquitto_property_get_remaining_length(local_props);
proplen += mosquitto_property_get_length_all(properties);
proplen += mosquitto_property_get_length_all(local_props);
varbytes = mosquitto_varint_bytes(proplen);
headerlen += proplen + varbytes;
}else if(mosq->protocol == mosq_p_mqtt311){

6
src/persist_read.c
View file

@ -252,6 +252,7 @@ static int persist__base_msg_chunk_restore(FILE *db_fptr, uint32_t length)
struct mosquitto__base_msg *base_msg = NULL;
int64_t message_expiry_interval64;
uint32_t message_expiry_interval;
uint32_t *p_message_expiry_interval = NULL;
int rc = 0;
memset(&chunk, 0, sizeof(struct P_base_msg));
@ -281,8 +282,7 @@ static int persist__base_msg_chunk_restore(FILE *db_fptr, uint32_t length)
}else{
message_expiry_interval = (uint32_t)message_expiry_interval64;
}
}else{
message_expiry_interval = 0;
p_message_expiry_interval = &message_expiry_interval;
}
base_msg = mosquitto_calloc(1, sizeof(struct mosquitto__base_msg));
@ -302,7 +302,7 @@ static int persist__base_msg_chunk_restore(FILE *db_fptr, uint32_t length)
base_msg->data.payload = chunk.payload;
base_msg->source_listener = chunk.source.listener;
rc = db__message_store(&chunk.source, base_msg, &message_expiry_interval,
rc = db__message_store(&chunk.source, base_msg, p_message_expiry_interval,
mosq_mo_client);
mosquitto_FREE(chunk.source.id);