mqtt/src/mqtt_subs.c - diff

Return to mqtt_subs.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/mqtt_subs.c between versions 1.2.2.14 and 1.4.4.2

version 1.2.2.14, 2012/06/20 12:43:41	version 1.4.4.2, 2013/01/18 10:32:17
Line 1	Line 1
	/*************************************************************************
	* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitbg.com>
	* by Michael Pounov <misho@openbsd-bg.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	terms:

	All of the documentation and software included in the ELWIX and AITNET
	Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"
#include "rtlm.h"	#include "rtlm.h"
#include "mqtt.h"	#include "mqtt.h"
#include "client.h"	#include "client.h"


io_enableDEBUG;

extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
volatile intptr_t Kill;	volatile intptr_t Kill;
sched_root_task_t *root;	sched_root_task_t *root;
Line 73 Subscribe(int sock, FILE *lf)	Line 116 Subscribe(int sock, FILE *lf)
printf("OK\n");	printf("OK\n");

for (sub = args->subscr, qos = qoses; sub->sub_topic.msg_base; sub++, qos++)	for (sub = args->subscr, qos = qoses; sub->sub_topic.msg_base; sub++, qos++)
printf(" + Topic %s with QoS %d subscribed %s\n", (char*)	printf(" + Topic %s with QoS %d subscribe %s\n", (char*)
sub->sub_topic.msg_base, sub->sub_ret, *qos ? "done" : "failed");	sub->sub_topic.msg_base, sub->sub_ret, *qos ? "done" : "failed");

free(qoses);	free(qoses);
Line 126 execProc(sched_task_t *task)	Line 169 execProc(sched_task_t *task)
char szLine[MAXPATHLEN + BUFSIZ] = { 0 };	char szLine[MAXPATHLEN + BUFSIZ] = { 0 };

snprintf(szLine, sizeof szLine, "%s '%s' %hu %u", AIT_GET_STR(&args->Value),	snprintf(szLine, sizeof szLine, "%s '%s' %hu %u", AIT_GET_STR(&args->Value),
(char*) TASK_ARG(task), (u_short) TASK_VAL(task), TASK_DATLEN(task));	(char*) TASK_ARG(task), (u_short) TASK_VAL(task), (u_int) TASK_DATLEN(task));
if (TASK_ARG(task))	if (TASK_ARG(task))
io_free(TASK_ARG(task));	e_free(TASK_ARG(task));

f = popen(szLine, "w");	f = popen(szLine, "w");
if (!f) {	if (!f) {
ioSYSERR(0);	ESYSERR(0);
return NULL;	return NULL;
} else	} else
fputs(TASK_DATA(task), f);	fputs(TASK_DATA(task), f);
Line 148 pubRX(sched_task_t *task)	Line 191 pubRX(sched_task_t *task)
void *data = NULL;	void *data = NULL;
u_short mid;	u_short mid;
time_t tim;	time_t tim;
	struct mqtthdr *hdr;

rlen = RecvFrom(TASK_FD(task));	rlen = RecvFrom(TASK_FD(task));
if (rlen == -1)	if (rlen == -1)
Line 156 pubRX(sched_task_t *task)	Line 200 pubRX(sched_task_t *task)
Kill++;	Kill++;
return NULL;	return NULL;
}	}
siz = mqtt_readPUBLISH(args->msg, szTopic, sizeof szTopic, &mid, &data);
if (siz == -1)
goto end;

/* send to output */	while (rlen > 0) {
tim = time(NULL);	hdr = (struct mqtthdr*) args->msg->msg_base;
strftime(szTime, sizeof szTime, "%Y-%m-%d %H:%M:%S", localtime(&tim));
fprintf(TASK_ARG(task), "\n[%s] Message ID: 0x%04hu, Length: %u, Topic: %s\n",
szTime, mid, siz, szTopic);

if (data) {	switch (hdr->mqtt_msg.type) {
fputs((const char*) data, TASK_ARG(task));	case MQTT_TYPE_PUBLISH:
free(data);	siz = mqtt_readPUBLISH(args->msg, szTopic, sizeof szTopic, &mid, &data);
}	if (siz == -1)
	goto end;
	else {
	siz = mqtt_pktLen(hdr);
	rlen -= siz;
	EVERBS(4) printf("Remains %d bytes, packet %d bytes\n", rlen, siz);
	}

fprintf(TASK_ARG(task), "\n");	/* send to output */
fflush(TASK_ARG(task));	tim = time(NULL);
	strftime(szTime, sizeof szTime, "%Y-%m-%d %H:%M:%S", localtime(&tim));
	fprintf(TASK_ARG(task), "\n[%s] Message ID: %04hu, QoS: %hhu, "
	"Length: %u, Topic: %s\n", szTime, mid, hdr->mqtt_msg.qos,
	siz, szTopic);

/* if exists exec script */	if (data) {
if (!AIT_ISEMPTY(&args->Value))	fputs((const char*) data, TASK_ARG(task));
schedEvent(root, execProc, io_strdup(szTopic), mid, data, siz);	free(data);
	}

	fprintf(TASK_ARG(task), "\n");
	fflush(TASK_ARG(task));

	/* if exists exec script */
	if (!AIT_ISEMPTY(&args->Value))
	schedEvent(root, execProc, e_strdup(szTopic), mid, data, siz);

	memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen);
	break;
	case MQTT_TYPE_PINGREQ:
	siz = mqtt_msgPINGRESP(args->msg);
	if (siz == -1)
	goto end;
	else
	rlen -= siz;

	/* send ping reply */
	if (SendTo(TASK_FD(task), siz) == -1)
	goto end;

	memmove(args->msg->msg_base, args->msg->msg_base + siz, rlen);
	break;
	default:
	EVERBS(1) printf("Unwanted message type #%d ...\n", hdr->mqtt_msg.type);
	goto end;
	}
	}
end:	end:
schedReadSelf(task);	schedReadSelf(task);
return NULL;	return NULL;
Line 195 main(int argc, char **argv)	Line 272 main(int argc, char **argv)
FILE *lf;	FILE *lf;
struct sigaction sa;	struct sigaction sa;

if (!(args = io_malloc(sizeof(struct tagArgs)))) {	if (!(args = e_malloc(sizeof(struct tagArgs)))) {
printf("Error:: in arguments #%d - %s\n", errno, strerror(errno));	printf("Error:: in arguments #%d - %s\n", errno, strerror(errno));
return 1;	return 1;
} else	} else
memset(args, 0, sizeof(struct tagArgs));	memset(args, 0, sizeof(struct tagArgs));
if (!(args->subscr = mqtt_subAlloc(idx))) {	if (!(args->subscr = mqtt_subAlloc(idx))) {
printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
io_free(args);	e_free(args);
return 1;	return 1;
} else	} else
args->free = cleanArgs;	args->free = cleanArgs;
Line 210 main(int argc, char **argv)	Line 287 main(int argc, char **argv)
if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {	if (!(args->msg = mqtt_msgAlloc(USHRT_MAX))) {
printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: in mqtt buffer #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
args->free(args);	args->free(args);
io_free(args);	e_free(args);
return 1;	return 1;
}	}

Line 248 main(int argc, char **argv)	Line 325 main(int argc, char **argv)
if (!sub) {	if (!sub) {
printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
args->free(args);	args->free(args);
io_free(args);	e_free(args);
return 1;	return 1;
} else	} else
sub += idx++;	sub += idx++;
Line 271 main(int argc, char **argv)	Line 348 main(int argc, char **argv)
if (args->QoS > MQTT_QOS_EXACTLY) {	if (args->QoS > MQTT_QOS_EXACTLY) {
printf("Error:: invalid QoS level %d\n", args->QoS);	printf("Error:: invalid QoS level %d\n", args->QoS);
args->free(args);	args->free(args);
io_free(args);	e_free(args);
return 1;	return 1;
}	}
break;	break;
Line 288 main(int argc, char **argv)	Line 365 main(int argc, char **argv)
batch = 0;	batch = 0;
break;	break;
case 'v':	case 'v':
io_incDebug;	e_incVerbose;
break;	break;
case 'u':	case 'u':
un = 1;	un = 1;
Line 296 main(int argc, char **argv)	Line 373 main(int argc, char **argv)
case 'h':	case 'h':
default:	default:
args->free(args);	args->free(args);
io_free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
Line 305 main(int argc, char **argv)	Line 382 main(int argc, char **argv)
if (argc < 2) {	if (argc < 2) {
printf("Error:: host for connect not found, connection id or topic not supplied!\n\n");	printf("Error:: host for connect not found, connection id or topic not supplied!\n\n");
args->free(args);	args->free(args);
io_free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
} else {	} else {
Line 316 main(int argc, char **argv)	Line 393 main(int argc, char **argv)
AIT_FREE_VAL(&args->Value);	AIT_FREE_VAL(&args->Value);
AIT_SET_STR(&args->Value, argv[2]);	AIT_SET_STR(&args->Value, argv[2]);
}	}
if (!io_gethostbyname(*argv, port, &args->addr)) {	if (!e_gethostbyname(*argv, port, &args->addr)) {
printf("Error:: host not valid #%d - %s\n", io_GetErrno(), io_GetError());	printf("Error:: host not valid #%d - %s\n", elwix_GetErrno(), elwix_GetError());
args->free(args);	args->free(args);
io_free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));	printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr));
AIT_FREE_VAL(&val);	AIT_FREE_VAL(&val);

	memset(&sa, 0, sizeof sa);
sa.sa_handler = sigz;	sa.sa_handler = sigz;
sigemptyset(&sa.sa_mask);	sigemptyset(&sa.sa_mask);
sigaction(SIGTERM, &sa, NULL);	sigaction(SIGTERM, &sa, NULL);
Line 390 main(int argc, char **argv)	Line 468 main(int argc, char **argv)
else	else
lf = stdout;	lf = stdout;
if (lf) {	if (lf) {
root = schedBegin();

ret = Subscribe(args->cli->sock, lf);	ret = Subscribe(args->cli->sock, lf);

	root = schedBegin();

schedRead(root, pubRX, lf, args->cli->sock, NULL, 0);	schedRead(root, pubRX, lf, args->cli->sock, NULL, 0);
schedRun(root, &Kill);	schedRun(root, &Kill);

	schedEnd(&root);

if (un)	if (un)
Unsubscribe(args->cli->sock);	Unsubscribe(args->cli->sock);
fclose(lf);	fclose(lf);

schedEnd(&root);
} else	} else
printf("Error:: in output file #%d - %s\n", errno, strerror(errno));	printf("Error:: in output file #%d - %s\n", errno, strerror(errno));
} else	} else
Line 410 main(int argc, char **argv)	Line 488 main(int argc, char **argv)
mqtt_cli_Close(&args->cli);	mqtt_cli_Close(&args->cli);
end:	end:
args->free(args);	args->free(args);
io_free(args);	e_free(args);
return ret;	return ret;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.14
changed lines
	Added in v.1.4.4.2