Add missing helpers code.

lib/CMakeLists.txt

@@ -25,6 +25,7 @@ include_directories(${mosquitto_SOURCE_DIR} ${mosquitto_SOURCE_DIR}/lib
 link_directories(${mosquitto_SOURCE_DIR}/lib)
 
 add_library(libmosquitto SHARED
+	helpers.c
 	logging_mosq.c logging_mosq.h
 	memory_mosq.c memory_mosq.h
 	messages_mosq.c messages_mosq.h

lib/helpers.c

@@ -0,0 +1,179 @@
+/*
+Copyright (c) 2016 Roger Light <roger@atchoo.org>
+
+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.
+*/
+
+#include <errno.h>
+#include <stdbool.h>
+
+#include "mosquitto.h"
+#include "mosquitto_internal.h"
+
+#if 0
+	struct mosquitto_message *msg;
+	msg = mosquitto_subscribe_single("#", 0, 1, true, NULL, 1883, NULL, 60, NULL, NULL, NULL);
+#endif
+
+struct subscribe__userdata {
+	const char *topic;
+	struct mosquitto_message *messages;
+	int max_msg_count;
+	int message_count;
+	int qos;
+	bool retained;
+};
+
+
+void on_connect(struct mosquitto *mosq, void *obj, int rc)
+{
+	struct subscribe__userdata *userdata = obj;
+
+	mosquitto_subscribe(mosq, NULL, userdata->topic, userdata->qos);
+}
+
+
+void on_message(struct mosquitto *mosq, void *obj, const struct mosquitto_message *message)
+{
+	struct subscribe__userdata *userdata = obj;
+	int rc;
+
+	if(userdata->max_msg_count == 0){
+		return;
+	}
+
+	/* Don't process stale retained messages if 'retained' was false */
+	if(!userdata->retained && message->retain){
+		return;
+	}
+
+	userdata->max_msg_count--;
+
+	rc = mosquitto_message_copy(&userdata->messages[userdata->message_count], message);
+	userdata->message_count++;
+	if(userdata->max_msg_count == 0){
+		mosquitto_disconnect(mosq);
+	}
+}
+
+
+void on_log(struct mosquitto *mosq, void *obj, int level, const char *str)
+{
+	printf("LOG %s\n", str);
+}
+
+
+libmosq_EXPORT int mosquitto_subscribe_simple(
+		struct mosquitto_message **messages,
+		int msg_count,
+		const char *topic,
+		int qos,
+		bool retained,
+		const char *host,
+		int port,
+		const char *client_id,
+		int keepalive,
+		bool clean_session,
+		const char *username,
+		const char *password,
+		const struct libmosquitto_will *will,
+		const struct libmosquitto_tls *tls)
+{
+	struct mosquitto *mosq;
+	struct subscribe__userdata userdata;
+	int rc;
+
+	if(!topic || msg_count < 1 || !messages){
+		return MOSQ_ERR_INVAL;
+	}
+
+	*messages = NULL;
+
+	userdata.topic = topic;
+	userdata.qos = qos;
+	userdata.max_msg_count = msg_count;
+	userdata.retained = retained;
+	userdata.messages = calloc(sizeof(struct mosquitto_message), msg_count);
+	if(!userdata.messages){
+		return MOSQ_ERR_NOMEM;
+	}
+	userdata.message_count = 0;
+
+	mosq = mosquitto_new(client_id, clean_session, &userdata);
+	if(!mosq){
+		free(userdata.messages);
+		userdata.messages = NULL;
+		return MOSQ_ERR_NOMEM;
+	}
+
+	if(will){
+		rc = mosquitto_will_set(mosq, will->topic, will->payloadlen, will->payload, will->qos, will->retain);
+		if(rc){
+			free(userdata.messages);
+			userdata.messages = NULL;
+			mosquitto_destroy(mosq);
+			return rc;
+		}
+	}
+	if(username){
+		rc = mosquitto_username_pw_set(mosq, username, password);
+		if(rc){
+			free(userdata.messages);
+			userdata.messages = NULL;
+			mosquitto_destroy(mosq);
+			return rc;
+		}
+	}
+	if(tls){
+		rc = mosquitto_tls_set(mosq, tls->cafile, tls->capath, tls->certfile, tls->keyfile, tls->pw_callback);
+		if(rc){
+			free(userdata.messages);
+			userdata.messages = NULL;
+			mosquitto_destroy(mosq);
+			return rc;
+		}
+		rc = mosquitto_tls_opts_set(mosq, tls->cert_reqs, tls->tls_version, tls->ciphers);
+		if(rc){
+			free(userdata.messages);
+			userdata.messages = NULL;
+			mosquitto_destroy(mosq);
+			return rc;
+		}
+	}
+
+	mosquitto_log_callback_set(mosq, on_log);
+	mosquitto_connect_callback_set(mosq, on_connect);
+	mosquitto_message_callback_set(mosq, on_message);
+
+	rc = mosquitto_connect(mosq, host, port, keepalive);
+	if(rc){
+		free(userdata.messages);
+		userdata.messages = NULL;
+		mosquitto_destroy(mosq);
+		return rc;
+	}
+	rc = mosquitto_loop_forever(mosq, -1, 1);
+	printf("lp:%d\n", rc);
+	mosquitto_destroy(mosq);
+	if(!rc && userdata.max_msg_count == 0){
+		printf("*messages: %p\n", userdata.messages);
+		*messages = userdata.messages;
+		return MOSQ_ERR_SUCCESS;
+	}else{
+		// FIXME - free messages
+		free(userdata.messages);
+		userdata.messages = NULL;
+		return rc;
+	}
+}
+

man/libmosquitto.3.xml

@@ -376,7 +376,7 @@
 					<paramdef>struct mosquitto_message **<parameter>message</parameter></paramdef>
 					<paramdef>int <parameter>msg_count</parameter></paramdef>
 					<paramdef>const char *<parameter>topic</parameter></paramdef>
-					<paramdef>const char *<parameter>qos</parameter></paramdef>
+					<paramdef>int<parameter>qos</parameter></paramdef>
 					<paramdef>bool <parameter>retained</parameter></paramdef>
 					<paramdef>const char *<parameter>host</parameter></paramdef>
 					<paramdef>int <parameter>port</parameter></paramdef>