Merge branch 'fixes'

CMakeLists.txt

@@ -11,7 +11,7 @@ project(mosquitto)
 cmake_minimum_required(VERSION 2.8)
 # Only for version 3 and up. cmake_policy(SET CMP0042 NEW)
 
-set (VERSION 1.6.7)
+set (VERSION 1.6.8)
 
 add_definitions (-DCMAKE -DVERSION=\"${VERSION}\")
 
@@ -111,9 +111,9 @@ install(FILES mosquitto.conf aclfile.example pskfile.example pwfile.example DEST
 # ========================================
 
 configure_file(libmosquitto.pc.in libmosquitto.pc @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquitto.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 configure_file(libmosquittopp.pc.in libmosquittopp.pc @ONLY)
-install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pkgconfig")
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmosquittopp.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 
 # ========================================
 # Testing

ChangeLog.txt

@@ -1,3 +1,51 @@
+1.6.8 - 20191128
+================
+
+Broker:
+- Various fixes for `allow_zero_length_clientid` config, where this option was
+ not being set correctly. Closes #1429.
+- Fix incorrect memory tracking causing problems with memory_limit option.
+ Closes #1437.
+- Fix subscription topics being limited to 200 characters instead of 200
+ hierarchy levels. Closes #1441.
+- Only a single CRL could be loaded at once. This has been fixed.
+ Closes #1442.
+- Fix problems with reloading config when `per_listener_settings` was true.
+ Closes #1459.
+- Fix retained messages with an expiry interval not being expired after being
+ restored from persistence. Closes #1464.
+- Fix messages with an expiry interval being sent without an expiry interval
+ property just before they were expired. Closes #1464.
+- Fix TLS Websockets clients not receiving messages after taking over a
+ previous connection. Closes #1489.
+- Fix MQTT 3.1.1 clients using clean session false, or MQTT 5.0 clients using
+ session-expiry-interval set to infinity never expiring, even when the global
+ `persistent_client_expiration` option was set. Closes #1494.
+
+Client library:
+- Fix publish properties not being passed to on_message_v5 callback for QoS 2
+ messages. Closes #1432.
+- Fix documentation issues in mosquitto.h. Closes #1478.
+- Document `mosquitto_connect_srv()`. Closes #1499.
+
+Clients:
+- Fix duplicate cfg definition in rr_client. Closes #1453.
+- Fix `mosquitto_pub -l` hang when stdin stream ends. Closes #1448.
+- Fix `mosquitto_pub -l` not sending the final line of stdin if it does not
+ end with a new line. Closes #1473.
+- Make documentation for `mosquitto_pub -l` match reality - blank lines are
+ sent as empty messages. Closes #1474.
+- Free memory in `mosquitto_sub` when quiting without having made a successful
+ connection. Closes #1513.
+
+Build:
+- Added `CLIENT_STATIC_LDADD` to makefile builds to allow more libraries to be
+ linked when compiling the clients with a static libmosquitto, as required
+ for e.g. openssl on some systems.
+
+Installer:
+- Fix mosquitto_rr.exe not being included in Windows installers. Closes #1463.
+
 1.6.7 - 20190925
 ================
 

client/Makefile

@@ -21,13 +21,13 @@ static : static_pub static_sub static_rr
  # libmosquitto only.
 
 static_pub : pub_client.o pub_shared.o client_props.o client_shared.o ../lib/libmosquitto.a
- ${CROSS_COMPILE}${CC} $^ -o mosquitto_pub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS}
+ ${CROSS_COMPILE}${CC} $^ -o mosquitto_pub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}
 
 static_sub : sub_client.o sub_client_output.o client_props.o client_shared.o ../lib/libmosquitto.a
- ${CROSS_COMPILE}${CC} $^ -o mosquitto_sub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS}
+ ${CROSS_COMPILE}${CC} $^ -o mosquitto_sub ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}
 
 static_rr : rr_client.o client_props.o client_shared.o pub_shared.o sub_client_output.o ../lib/libmosquitto.a
- ${CROSS_COMPILE}${CC} $^ -o mosquitto_rr ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS}
+ ${CROSS_COMPILE}${CC} $^ -o mosquitto_rr ${CLIENT_LDFLAGS} ${STATIC_LIB_DEPS} ${CLIENT_STATIC_LDADD}
 
 mosquitto_pub : pub_client.o pub_shared.o client_shared.o client_props.o
  ${CROSS_COMPILE}${CC} $(CLIENT_LDFLAGS) $^ -o $@ $(CLIENT_LDADD)

client/pub_client.c

@@ -45,6 +45,7 @@ static int line_buf_len = 1024;
 static bool disconnect_sent = false;
 static int publish_count = 0;
 static bool ready_for_repeat = false;
+static volatile int status = STATUS_CONNECTING;
 
 #ifdef WIN32
 static uint64_t next_publish_tv;
@@ -219,111 +220,122 @@ int pub_shared_init(void)
 }
 
 
-int pub_shared_loop(struct mosquitto *mosq)
+int pub_stdin_line_loop(struct mosquitto *mosq)
 {
- int read_len;
- int pos;
- int rc, rc2;
  char *buf2;
- int buf_len_actual;
- int mode;
- int loop_delay = 1000;
+ int buf_len_actual = 0;
+ int pos;
+ int rc = MOSQ_ERR_SUCCESS;
+ int read_len;
  bool stdin_finished = false;
 
- if(cfg.repeat_count > 1 && (cfg.repeat_delay.tv_sec == 0 || cfg.repeat_delay.tv_usec != 0)){
- loop_delay = cfg.repeat_delay.tv_usec / 2000;
- }
-
- mode = cfg.pub_mode;
-
- if(mode == MSGMODE_STDIN_LINE){
- mosquitto_loop_start(mosq);
- stdin_finished = false;
- }
-
+ mosquitto_loop_start(mosq);
+ stdin_finished = false;
  do{
- if(mode == MSGMODE_STDIN_LINE){
- if(status == STATUS_CONNACK_RECVD){
- pos = 0;
- read_len = line_buf_len;
- while(status == STATUS_CONNACK_RECVD && fgets(&line_buf[pos], read_len, stdin)){
- buf_len_actual = strlen(line_buf);
- if(line_buf[buf_len_actual-1] == '\n'){
- line_buf[buf_len_actual-1] = '\0';
- rc2 = my_publish(mosq, &mid_sent, cfg.topic, buf_len_actual-1, line_buf, cfg.qos, cfg.retain);
- if(rc2){
- err_printf(&cfg, "Error: Publish returned %d, disconnecting.\n", rc2);
- mosquitto_disconnect_v5(mosq, MQTT_RC_DISCONNECT_WITH_WILL_MSG, cfg.disconnect_props);
- }
- break;
- }else{
- line_buf_len += 1024;
- pos += 1023;
- read_len = 1024;
- buf2 = realloc(line_buf, line_buf_len);
- if(!buf2){
- err_printf(&cfg, "Error: Out of memory.\n");
- return MOSQ_ERR_NOMEM;
- }
- line_buf = buf2;
+ if(status == STATUS_CONNACK_RECVD){
+ pos = 0;
+ read_len = line_buf_len;
+ while(status == STATUS_CONNACK_RECVD && fgets(&line_buf[pos], read_len, stdin)){
+ buf_len_actual = strlen(line_buf);
+ if(line_buf[buf_len_actual-1] == '\n'){
+ line_buf[buf_len_actual-1] = '\0';
+ rc = my_publish(mosq, &mid_sent, cfg.topic, buf_len_actual-1, line_buf, cfg.qos, cfg.retain);
+ pos = 0;
+ if(rc){
+ err_printf(&cfg, "Error: Publish returned %d, disconnecting.\n", rc);
+ mosquitto_disconnect_v5(mosq, MQTT_RC_DISCONNECT_WITH_WILL_MSG, cfg.disconnect_props);
  }
- }
- if(feof(stdin)){
- if(mid_sent == -1){
- /* Empty file */
- mosquitto_disconnect_v5(mosq, 0, cfg.disconnect_props);
- disconnect_sent = true;
- status = STATUS_DISCONNECTING;
- }else{
- last_mid = mid_sent;
- status = STATUS_WAITING;
+ break;
+ }else{
+ line_buf_len += 1024;
+ pos += 1023;
+ read_len = 1024;
+ buf2 = realloc(line_buf, line_buf_len);
+ if(!buf2){
+ err_printf(&cfg, "Error: Out of memory.\n");
+ return MOSQ_ERR_NOMEM;
  }
- stdin_finished = true;
- }else if(status == STATUS_DISCONNECTED){
- /* Not end of stdin, so we've lost our connection and must
- * reconnect */
+ line_buf = buf2;
+ }
+ }
+ if(pos != 0){
+ rc = my_publish(mosq, &mid_sent, cfg.topic, buf_len_actual, line_buf, cfg.qos, cfg.retain);
+ if(rc){
+ err_printf(&cfg, "Error: Publish returned %d, disconnecting.\n", rc);
+ mosquitto_disconnect_v5(mosq, MQTT_RC_DISCONNECT_WITH_WILL_MSG, cfg.disconnect_props);
  }
- }else if(status == STATUS_WAITING){
- if(last_mid_sent == last_mid && disconnect_sent == false){
+ }
+ if(feof(stdin)){
+ if(mid_sent == -1){
+ /* Empty file */
  mosquitto_disconnect_v5(mosq, 0, cfg.disconnect_props);
  disconnect_sent = true;
+ status = STATUS_DISCONNECTING;
+ }else{
+ last_mid = mid_sent;
+ status = STATUS_WAITING;
  }
+ stdin_finished = true;
+ }else if(status == STATUS_DISCONNECTED){
+ /* Not end of stdin, so we've lost our connection and must
+ * reconnect */
+ }
+ }
+
+ if(status == STATUS_WAITING){
+ if(last_mid_sent == last_mid && disconnect_sent == false){
+ mosquitto_disconnect_v5(mosq, 0, cfg.disconnect_props);
+ disconnect_sent = true;
+ }
 #ifdef WIN32
-  Sleep(100);
+ Sleep(100);
 #else
-  struct timespec ts;
-  ts.tv_sec = 0;
-  ts.tv_nsec = 100000000;
-  nanosleep(&ts, NULL);
+ struct timespec ts;
+ ts.tv_sec = 0;
+ ts.tv_nsec = 100000000;
+ nanosleep(&ts, NULL);
 #endif
- }
+ }
+ }while(stdin_finished == false);
+ mosquitto_loop_stop(mosq, false);
+
+ if(status == STATUS_DISCONNECTED){
+ return MOSQ_ERR_SUCCESS;
+ }else{
+ return rc;
+ }
+}
+
+
+int pub_other_loop(struct mosquitto *mosq)
+{
+ int rc;
+ int loop_delay = 1000;
+
+ if(cfg.repeat_count > 1 && (cfg.repeat_delay.tv_sec == 0 || cfg.repeat_delay.tv_usec != 0)){
+ loop_delay = cfg.repeat_delay.tv_usec / 2000;
+ }
+
+ do{
+ rc = mosquitto_loop(mosq, loop_delay, 1);
+ if(ready_for_repeat && check_repeat_time()){
  rc = MOSQ_ERR_SUCCESS;
- }else{
- rc = mosquitto_loop(mosq, loop_delay, 1);
- if(ready_for_repeat && check_repeat_time()){
- rc = 0;
- switch(cfg.pub_mode){
- case MSGMODE_CMD:
- case MSGMODE_FILE:
- case MSGMODE_STDIN_FILE:
- rc = my_publish(mosq, &mid_sent, cfg.topic, cfg.msglen, cfg.message, cfg.qos, cfg.retain);
- break;
- case MSGMODE_NULL:
- rc = my_publish(mosq, &mid_sent, cfg.topic, 0, NULL, cfg.qos, cfg.retain);
- break;
- case MSGMODE_STDIN_LINE:
- break;
- }
- if(rc){
- err_printf(&cfg, "Error sending repeat publish: %s", mosquitto_strerror(rc));
- }
+ switch(cfg.pub_mode){
+ case MSGMODE_CMD:
+ case MSGMODE_FILE:
+ case MSGMODE_STDIN_FILE:
+ rc = my_publish(mosq, &mid_sent, cfg.topic, cfg.msglen, cfg.message, cfg.qos, cfg.retain);
+ break;
+ case MSGMODE_NULL:
+ rc = my_publish(mosq, &mid_sent, cfg.topic, 0, NULL, cfg.qos, cfg.retain);
+ break;
+ }
+ if(rc){
+ err_printf(&cfg, "Error sending repeat publish: %s", mosquitto_strerror(rc));
  }
  }
- }while(rc == MOSQ_ERR_SUCCESS && stdin_finished == false);
+ }while(rc == MOSQ_ERR_SUCCESS);
 
- if(mode == MSGMODE_STDIN_LINE){
- mosquitto_loop_stop(mosq, false);
- }
  if(status == STATUS_DISCONNECTED){
  return MOSQ_ERR_SUCCESS;
  }else{
@@ -332,6 +344,16 @@ int pub_shared_loop(struct mosquitto *mosq)
 }
 
 
+int pub_shared_loop(struct mosquitto *mosq)
+{
+ if(cfg.pub_mode == MSGMODE_STDIN_LINE){
+ return pub_stdin_line_loop(mosq);
+ }else{
+ return pub_other_loop(mosq);
+ }
+}
+
+
 void pub_shared_cleanup(void)
 {
  free(line_buf);

client/pub_shared.c

@@ -37,7 +37,6 @@ and the Eclipse Distribution License is available at
 /* Global variables for use in callbacks. See sub_client.c for an example of
  * using a struct to hold variables for use in callbacks. */
 int mid_sent = -1;
-int status = STATUS_CONNECTING;
 struct mosq_config cfg;
 
 void my_log_callback(struct mosquitto *mosq, void *obj, int level, const char *str)

client/pub_shared.h

@@ -23,7 +23,6 @@ and the Eclipse Distribution License is available at
 #define STATUS_DISCONNECTED 4
 
 extern int mid_sent;
-extern int status;
 extern struct mosq_config cfg;
 
 

client/rr_client.c

@@ -47,7 +47,8 @@ enum rr__state {
 
 static enum rr__state client_state = rr_s_new;
 
-struct mosq_config cfg;
+extern struct mosq_config cfg;
+
 bool process_messages = true;
 int msg_count = 0;
 struct mosquitto *mosq = NULL;

client/sub_client.c

@@ -44,7 +44,7 @@ int last_mid = 0;
 #ifndef WIN32
 void my_signal_handler(int signum)
 {
- if(signum == SIGALRM){
+ if(signum == SIGALRM || signum == SIGTERM || signum == SIGINT){
  process_messages = false;
  mosquitto_disconnect_v5(mosq, MQTT_RC_DISCONNECT_WITH_WILL_MSG, cfg.disconnect_props);
  }
@@ -344,6 +344,16 @@ int main(int argc, char *argv[])
  goto cleanup;
  }
 
+ if(sigaction(SIGTERM, &sigact, NULL) == -1){
+ perror("sigaction");
+ goto cleanup;
+ }
+
+ if(sigaction(SIGINT, &sigact, NULL) == -1){
+ perror("sigaction");
+ goto cleanup;
+ }
+
  if(cfg.timeout){
  alarm(cfg.timeout);
  }
@@ -364,6 +374,7 @@ int main(int argc, char *argv[])
  return rc;
 
 cleanup:
+ mosquitto_destroy(mosq);
  mosquitto_lib_cleanup();
  client_config_cleanup(&cfg);
  return 1;