Ensure socketpairR/W ARE initialized as INVALID_SOCKET

ChangeLog.txt

@@ -1,3 +1,14 @@
+2.0.13 - 2021-xx-xx
+===================
+
+Broker:
+- Fix `max_keepalive` option not being able to be set to 0.
+- Fix LWT messages not being delivered if `per_listener_settings` was set to
+ true. Closes #2314.
+- Various fixes around inflight quota management. Closes #2306.
+- Fix problem parsing config files with Windows line endings. Closes #2297.
+
+
 2.0.12 - 2021-08-31
 ===================
 

apps/db_dump/stubs.c

@@ -122,3 +122,15 @@ int keepalive__update(struct mosquitto *context)
  UNUSED(context);
  return 0;
 }
+
+void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+{
+ UNUSED(msg_data);
+ UNUSED(msg);
+}
+
+void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+{
+ UNUSED(msg_data);
+ UNUSED(msg);
+}

lib/mosquitto.c

@@ -155,6 +155,8 @@ int mosquitto_reinitialise(struct mosquitto *mosq, const char *id, bool clean_st
  }
  mosq->protocol = mosq_p_mqtt311;
  mosq->sock = INVALID_SOCKET;
+ mosq->sockpairR = INVALID_SOCKET;
+ mosq->sockpairW = INVALID_SOCKET;
  mosq->keepalive = 60;
  mosq->clean_start = clean_start;
  if(id){

lib/mosquitto_internal.h

@@ -190,10 +190,14 @@ struct mosquitto_msg_data{
 #ifdef WITH_BROKER
  struct mosquitto_client_msg *inflight;
  struct mosquitto_client_msg *queued;
- long msg_bytes;
- long msg_bytes12;
- int msg_count;
- int msg_count12;
+ long inflight_bytes;
+ long inflight_bytes12;
+ int inflight_count;
+ int inflight_count12;
+ long queued_bytes;
+ long queued_bytes12;
+ int queued_count;
+ int queued_count12;
 #else
  struct mosquitto_message_all *inflight;
  int queue_len;

man/mosquitto.conf.5.xml

@@ -599,7 +599,15 @@ log_timestamp_format %Y-%m-%dT%H:%M:%S
  be sent a server keepalive telling them to use
  max_keepalive. This only applies to MQTT v5 clients.
  The maximum value allowable, and default value, is
- 65535. Do not set below 10 seconds.</para>
+ 65535.</para>
+
+ <para>
+ Set to 0 to allow clients to set keepalive = 0, which
+ means no keepalive checks are made and the client will
+ never be disconnected by the broker if no messages are
+ received. You should be very sure this is the behaviour
+ that you want.
+ </para>
 
  <para>
  For MQTT v3.1.1 and v3.1 clients, there is no mechanism

mosquitto.conf

@@ -79,8 +79,13 @@
 # use the new keepalive value. The max_keepalive option allows you to specify
 # that clients may only connect with keepalive less than or equal to this
 # value, otherwise they will be sent a server keepalive telling them to use
-# max_keepalive. This only applies to MQTT v5 clients. The maximum value
-# allowable is 65535. Do not set below 10.
+# max_keepalive. This only applies to MQTT v5 clients. The default, and maximum
+# value allowable, is 65535.
+#
+# Set to 0 to allow clients to set keepalive = 0, which means no keepalive
+# checks are made and the client will never be disconnected by the broker if no
+# messages are received. You should be very sure this is the behaviour that you
+# want.
 #
 # For MQTT v3.1.1 and v3.1 clients, there is no mechanism to tell the client
 # what keepalive value they should use. If an MQTT v3.1.1 or v3.1 client

src/conf.c

@@ -757,6 +757,10 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload,
  }
  while((*buf)[slen-1] == 10 || (*buf)[slen-1] == 13){
  (*buf)[slen-1] = 0;
+ slen = strlen(*buf);
+ if(slen == 0){
+ continue;
+ }
  }
  token = strtok_r((*buf), " ", &saveptr);
  if(token){
@@ -1671,7 +1675,7 @@ static int config__read_file_core(struct mosquitto__config *config, bool reload,
  config->max_inflight_messages = (uint16_t)tmp_int;
  }else if(!strcmp(token, "max_keepalive")){
  if(conf__parse_int(&token, "max_keepalive", &tmp_int, saveptr)) return MOSQ_ERR_INVAL;
- if(tmp_int < 10 || tmp_int > UINT16_MAX){
+ if(tmp_int < 0 || tmp_int > UINT16_MAX){
  log__printf(NULL, MOSQ_LOG_ERR, "Error: Invalid max_keepalive value (%d).", tmp_int);
  return MOSQ_ERR_INVAL;
  }

src/context.c

@@ -212,9 +212,8 @@ void context__disconnect(struct mosquitto *context)
 
  plugin__handle_disconnect(context, -1);
 
- net__socket_close(context);
-
  context__send_will(context);
+ net__socket_close(context);
  if(context->session_expiry_interval == 0){
  /* Client session is due to be expired now */
 #ifdef WITH_BRIDGE