diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d537e776..48f0c89c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -50,7 +50,7 @@ set(C_SRC messages_mosq.c messages_mosq.h mosquitto.c mosquitto.h mosquitto_internal.h - mqtt3_protocol.h + mqtt_protocol.h net_mosq.c net_mosq.h options.c packet_mosq.c packet_mosq.h diff --git a/lib/actions.c b/lib/actions.c index 5e50dbe5..9fb36d61 100644 --- a/lib/actions.c +++ b/lib/actions.c @@ -22,7 +22,7 @@ Contributors: #include "mosquitto_internal.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "send_mosq.h" #include "util_mosq.h" diff --git a/lib/handle_ping.c b/lib/handle_ping.c index 17b53be0..ad56dda0 100644 --- a/lib/handle_ping.c +++ b/lib/handle_ping.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/handle_pubackcomp.c b/lib/handle_pubackcomp.c index 37788456..a6586f8f 100644 --- a/lib/handle_pubackcomp.c +++ b/lib/handle_pubackcomp.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/handle_pubrec.c b/lib/handle_pubrec.c index 59eea1b7..3f79d506 100644 --- a/lib/handle_pubrec.c +++ b/lib/handle_pubrec.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/handle_pubrel.c b/lib/handle_pubrel.c index 56660987..7c1f137c 100644 --- a/lib/handle_pubrel.c +++ b/lib/handle_pubrel.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/handle_unsuback.c b/lib/handle_unsuback.c index 6297bb10..357ef5c9 100644 --- a/lib/handle_unsuback.c +++ b/lib/handle_unsuback.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/mqtt3_protocol.h b/lib/mqtt_protocol.h similarity index 99% rename from lib/mqtt3_protocol.h rename to lib/mqtt_protocol.h index 4884bacb..e148e1ed 100644 --- a/lib/mqtt3_protocol.h +++ b/lib/mqtt_protocol.h @@ -4,12 +4,12 @@ Copyright (c) 2009-2018 Roger Light All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 and Eclipse Distribution License v1.0 which accompany this distribution. - + The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html and the Eclipse Distribution License is available at http://www.eclipse.org/org/documents/edl-v10.php. - + Contributors: Roger Light - initial implementation and documentation. */ diff --git a/lib/net_mosq.c b/lib/net_mosq.c index d593c7b2..a84d10c5 100644 --- a/lib/net_mosq.c +++ b/lib/net_mosq.c @@ -64,7 +64,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "time_mosq.h" #include "util_mosq.h" diff --git a/lib/packet_mosq.c b/lib/packet_mosq.c index bb2077c7..ddfaef49 100644 --- a/lib/packet_mosq.c +++ b/lib/packet_mosq.c @@ -30,7 +30,7 @@ Contributors: #endif #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/read_handle.c b/lib/read_handle.c index 274a4da5..fab8b7dd 100644 --- a/lib/read_handle.c +++ b/lib/read_handle.c @@ -24,7 +24,7 @@ Contributors: #include "logging_mosq.h" #include "memory_mosq.h" #include "messages_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/lib/send_connect.c b/lib/send_connect.c index 458f522f..59802c9b 100644 --- a/lib/send_connect.c +++ b/lib/send_connect.c @@ -27,7 +27,7 @@ Contributors: #include "memory_mosq.h" #include "mosquitto.h" #include "mosquitto_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "packet_mosq.h" int send__connect(struct mosquitto *mosq, uint16_t keepalive, bool clean_session) diff --git a/lib/send_disconnect.c b/lib/send_disconnect.c index 0cfea276..e5009d69 100644 --- a/lib/send_disconnect.c +++ b/lib/send_disconnect.c @@ -25,7 +25,7 @@ Contributors: #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "send_mosq.h" diff --git a/lib/send_mosq.c b/lib/send_mosq.c index ee544e3e..3c58d724 100644 --- a/lib/send_mosq.c +++ b/lib/send_mosq.c @@ -30,7 +30,7 @@ Contributors: #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "net_mosq.h" #include "packet_mosq.h" diff --git a/lib/send_publish.c b/lib/send_publish.c index e9aeeef8..124fc85f 100644 --- a/lib/send_publish.c +++ b/lib/send_publish.c @@ -29,7 +29,7 @@ Contributors: #include "mosquitto.h" #include "mosquitto_internal.h" #include "logging_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "net_mosq.h" #include "packet_mosq.h" diff --git a/lib/send_subscribe.c b/lib/send_subscribe.c index c60ca0f2..6fa4720d 100644 --- a/lib/send_subscribe.c +++ b/lib/send_subscribe.c @@ -27,7 +27,7 @@ Contributors: #include "mosquitto_internal.h" #include "logging_mosq.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "packet_mosq.h" #include "util_mosq.h" diff --git a/lib/send_unsubscribe.c b/lib/send_unsubscribe.c index fb66e88c..18317a1d 100644 --- a/lib/send_unsubscribe.c +++ b/lib/send_unsubscribe.c @@ -26,7 +26,7 @@ Contributors: #include "mosquitto.h" #include "logging_mosq.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "packet_mosq.h" #include "util_mosq.h" diff --git a/lib/will_mosq.c b/lib/will_mosq.c index 3e9495ff..fe5a0443 100644 --- a/lib/will_mosq.c +++ b/lib/will_mosq.c @@ -28,7 +28,7 @@ Contributors: #include "logging_mosq.h" #include "messages_mosq.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "net_mosq.h" #include "read_handle.h" #include "send_mosq.h" diff --git a/src/conf.c b/src/conf.c index f5e989ff..e32ba839 100644 --- a/src/conf.c +++ b/src/conf.c @@ -44,7 +44,7 @@ Contributors: #include "memory_mosq.h" #include "tls_mosq.h" #include "util_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" struct config_recurse { int log_dest; diff --git a/src/conf_includedir.c b/src/conf_includedir.c index 43da9a16..4fc04a28 100644 --- a/src/conf_includedir.c +++ b/src/conf_includedir.c @@ -44,7 +44,7 @@ Contributors: #include "memory_mosq.h" #include "tls_mosq.h" #include "util_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" int strcasecmp_p(const void *p1, const void *p2) { diff --git a/src/handle_connack.c b/src/handle_connack.c index 52e78e4f..9451de85 100644 --- a/src/handle_connack.c +++ b/src/handle_connack.c @@ -21,7 +21,7 @@ Contributors: #include "mosquitto_broker_internal.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "packet_mosq.h" #include "send_mosq.h" #include "util_mosq.h" diff --git a/src/handle_connect.c b/src/handle_connect.c index 87964456..c3e747b3 100644 --- a/src/handle_connect.c +++ b/src/handle_connect.c @@ -20,7 +20,7 @@ Contributors: #include #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "send_mosq.h" diff --git a/src/handle_publish.c b/src/handle_publish.c index 54976afc..a6e990ef 100644 --- a/src/handle_publish.c +++ b/src/handle_publish.c @@ -21,7 +21,7 @@ Contributors: #include #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/src/handle_unsubscribe.c b/src/handle_unsubscribe.c index a0f00046..76b263ff 100644 --- a/src/handle_unsubscribe.c +++ b/src/handle_unsubscribe.c @@ -21,7 +21,7 @@ Contributors: #include "mosquitto_broker_internal.h" #include "memory_mosq.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "packet_mosq.h" #include "send_mosq.h" /* diff --git a/src/net.c b/src/net.c index 64f8bdc5..ca3e2d64 100644 --- a/src/net.c +++ b/src/net.c @@ -45,7 +45,7 @@ Contributors: #endif #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "net_mosq.h" #include "util_mosq.h" diff --git a/src/read_handle.c b/src/read_handle.c index ac448aab..9d032ed2 100644 --- a/src/read_handle.c +++ b/src/read_handle.c @@ -21,7 +21,7 @@ Contributors: #include #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "read_handle.h" diff --git a/src/send_connack.c b/src/send_connack.c index 12b20724..2a15ae3d 100644 --- a/src/send_connack.c +++ b/src/send_connack.c @@ -17,7 +17,7 @@ Contributors: #include "config.h" #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "util_mosq.h" diff --git a/src/send_suback.c b/src/send_suback.c index adaeb16b..7bbe72fa 100644 --- a/src/send_suback.c +++ b/src/send_suback.c @@ -17,7 +17,7 @@ Contributors: #include "config.h" #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "util_mosq.h" diff --git a/src/websockets.c b/src/websockets.c index 1ab02a9b..7c0dca32 100644 --- a/src/websockets.c +++ b/src/websockets.c @@ -34,7 +34,7 @@ POSSIBILITY OF SUCH DAMAGE. #include #include "mosquitto_internal.h" #include "mosquitto_broker_internal.h" -#include "mqtt3_protocol.h" +#include "mqtt_protocol.h" #include "memory_mosq.h" #include "packet_mosq.h" #include "sys_tree.h"