github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port from `fixes`

Browse Source
pull/2702/head
Roger A. Light 3 years ago
parent 5c0cfade12
commit d53653b017
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File

2
lib/net_mosq.c
Unescape Escape View File

@ -764,7 +764,7 @@ static int net__init_ssl_ctx(struct mosquitto *mosq)
if(mosq->tls_13_ciphers){
ret = SSL_CTX_set_ciphersuites(mosq->ssl_ctx, mosq->tls_13_ciphers);
if(ret == 0){
log__printf(NULL, MOSQ_LOG_ERR, "Error: Unable to set TLS 1.3 ciphersuites. Check cipher_tls13 list \"%s\".", mosq->tls_13_ciphers);
log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to set TLS 1.3 ciphersuites. Check cipher_tls13 list \"%s\".", mosq->tls_13_ciphers);
return MOSQ_ERR_TLS;
}
}

3
lib/property_mosq.c
Unescape Escape View File

@ -26,7 +26,6 @@ Contributors:
# include <strings.h>
#endif
#include "logging_mosq.h"
#include "memory_mosq.h"
#include "mqtt_protocol.h"
#include "packet_mosq.h"
@ -141,7 +140,6 @@ static int property__read(struct mosquitto__packet_in *packet, uint32_t *len, mo
break;
default:
log__printf(NULL, MOSQ_LOG_DEBUG, "Unsupported property type: %d", property_identifier);
return MOSQ_ERR_MALFORMED_PACKET;
}
@ -414,7 +412,6 @@ static int property__write(struct mosquitto__packet *packet, const mosquitto_pro
break;
default:
log__printf(NULL, MOSQ_LOG_DEBUG, "Unsupported property type: %d", property->identifier);
return MOSQ_ERR_INVAL;
}

8
lib/send_publish.c
Unescape Escape View File

@ -109,7 +109,7 @@ int send__publish(struct mosquitto *mosq, uint16_t mid, const char *topic, uint3
mosquitto__FREE(mapped_topic);
mapped_topic = topic_temp;
}
log__printf(NULL, MOSQ_LOG_DEBUG, "Sending PUBLISH to %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", SAFE_PRINT(mosq->id), dup, qos, retain, mid, mapped_topic, (long)payloadlen);
log__printf(mosq, MOSQ_LOG_DEBUG, "Sending PUBLISH to %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", SAFE_PRINT(mosq->id), dup, qos, retain, mid, mapped_topic, (long)payloadlen);
G_PUB_BYTES_SENT_INC(payloadlen);
rc = send__real_publish(mosq, mid, mapped_topic, payloadlen, payload, qos, retain, dup, subscription_identifier, store_props, expiry_interval);
mosquitto__FREE(mapped_topic);
@ -119,7 +119,7 @@ int send__publish(struct mosquitto *mosq, uint16_t mid, const char *topic, uint3
}
}
#endif
log__printf(NULL, MOSQ_LOG_DEBUG, "Sending PUBLISH to %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", SAFE_PRINT(mosq->id), dup, qos, retain, mid, topic, (long)payloadlen);
log__printf(mosq, MOSQ_LOG_DEBUG, "Sending PUBLISH to %s (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", SAFE_PRINT(mosq->id), dup, qos, retain, mid, topic, (long)payloadlen);
G_PUB_BYTES_SENT_INC(payloadlen);
#else
log__printf(mosq, MOSQ_LOG_DEBUG, "Client %s sending PUBLISH (d%d, q%d, r%d, m%d, '%s', ... (%ld bytes))", SAFE_PRINT(mosq->id), dup, qos, retain, mid, topic, (long)payloadlen);
@ -209,9 +209,9 @@ int send__real_publish(struct mosquitto *mosq, uint16_t mid, const char *topic,
}
if(packet__check_oversize(mosq, packetlen)){
#ifdef WITH_BROKER
log__printf(NULL, MOSQ_LOG_NOTICE, "Dropping too large outgoing PUBLISH for %s (%d bytes)", SAFE_PRINT(mosq->id), packetlen);
log__printf(mosq, MOSQ_LOG_NOTICE, "Dropping too large outgoing PUBLISH for %s (%d bytes)", SAFE_PRINT(mosq->id), packetlen);
#else
log__printf(NULL, MOSQ_LOG_NOTICE, "Dropping too large outgoing PUBLISH (%d bytes)", packetlen);
log__printf(mosq, MOSQ_LOG_NOTICE, "Dropping too large outgoing PUBLISH (%d bytes)", packetlen);
#endif
return MOSQ_ERR_OVERSIZE_PACKET;
}

4
lib/util_mosq.c
Unescape Escape View File

@ -84,7 +84,7 @@ int mosquitto__check_keepalive(struct mosquitto *mosq)
&& net__is_connected(mosq)
&& now - mosq->next_msg_out - mosq->keepalive >= mosq->bridge->idle_timeout){
log__printf(NULL, MOSQ_LOG_NOTICE, "Bridge connection %s has exceeded idle timeout, disconnecting.", mosq->id);
log__printf(mosq, MOSQ_LOG_NOTICE, "Bridge connection %s has exceeded idle timeout, disconnecting.", mosq->id);
net__socket_close(mosq);
return MOSQ_ERR_SUCCESS;
}
@ -93,7 +93,7 @@ int mosquitto__check_keepalive(struct mosquitto *mosq)
next_msg_out = mosq->next_msg_out;
last_msg_in = mosq->last_msg_in;
pthread_mutex_unlock(&mosq->msgtime_mutex);
if(mosq->keepalive && net__is_connected(mosq) &&
if(mosq->keepalive && net__is_connected(mosq) &&
(now >= next_msg_out || now - last_msg_in >= mosq->keepalive)){
state = mosquitto__get_state(mosq);

Write Preview
Loading…
Cancel
Save