Updated changes from mosquitto.org(v1.3.2)v0.5.0

2 files changed, 11 insertions, 0 deletions

diff --git a/docs/release-note/0.5.0.md b/docs/release-note/0.5.0.md
new file mode 100644
index 0000000..c002e58
--- /dev/null
+++ b/docs/release-note/0.5.0.md
@@ -0,0 +1,3 @@
+## mqtt-dirpub
+Release date: 2014-07-18
+* Updated changes from mosquitto.org(v1.3.2).
diff --git a/sub_client.c b/sub_client.c
index a64a9b6..787ed14 100644
--- a/sub_client.c
+++ b/sub_client.c
@@ -487,7 +487,11 @@ void print_usage(void)
 	printf("mosquitto_sub version %s running on libmosquitto %d.%d.%d.\n\n", VERSION, major, minor, revision);
 	printf("Usage: mosquitto_sub [-c] [-h host] [-k keepalive] [-p port] [-q qos] [-R] -t topic ...\n");
 	printf("                     [-T filter_out]\n");
+#ifdef WITH_SRV
 	printf("                     [-A bind_address] [-S]\n");
+#else
+	printf("                     [-A bind_address]\n");
+#endif
 	printf("                     [-i id] [-I id_prefix]\n");
 	printf("                     [-d] [-N] [--quiet] [-v]\n");
 	printf("                     [-u username [-P password]]\n");
@@ -514,7 +518,9 @@ void print_usage(void)
 	printf(" -p : network port to connect to. Defaults to 1883.\n");
 	printf(" -q : quality of service level to use for the subscription. Defaults to 0.\n");
 	printf(" -R : do not print stale messages (those with retain set).\n");
+#ifdef WITH_SRV
 	printf(" -S : use SRV lookups to determine which host to connect to.\n");
+#endif
 	printf(" -t : mqtt topic to subscribe to. May be repeated multiple times.\n");
 	printf(" -u : provide a username (requires MQTT 3.1 broker)\n");
 	printf(" -v : print published messages verbosely.\n");
@@ -774,8 +780,10 @@ int main(int argc, char *argv[])
 			ud.quiet = true;
 		}else if(!strcmp(argv[i], "-R")){
 			ud.no_retain = true;
+#ifdef WITH_SRV
 		}else if(!strcmp(argv[i], "-S")){
 			use_srv = true;
+#endif
 		}else if(!strcmp(argv[i], "-t") || !strcmp(argv[i], "--topic")){
 			if(i==argc-1){
 				fprintf(stderr, "Error: -t argument given but no topic specified.\n\n");