mqtt/src/mqtt_pub.c - diff

Return to mqtt_pub.c CVS log

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

Diff for /mqtt/src/mqtt_pub.c between versions 1.1.2.6 and 1.4.4.1

version 1.1.2.6, 2012/01/05 10:26:02	version 1.4.4.1, 2013/01/18 10:17:22
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[];

struct tagArgs *args;	struct tagArgs *args;
Line 19 Usage(void)	Line 62 Usage(void)
" Syntax: mqtt_pub [options] <connect_to_broker[:port]> <ConnectID> <topic> <value_for_publish>\n\n"	" Syntax: mqtt_pub [options] <connect_to_broker[:port]> <ConnectID> <topic> <value_for_publish>\n\n"
"\t-f\t\t\t'value_for_publish' is file name instead text\n"	"\t-f\t\t\t'value_for_publish' is file name instead text\n"
"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"	"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"
"\t-m <message_id>\t\tMessage ID for publish message\n"
"\t-d\t\t\tSend duplicate message\n"	"\t-d\t\t\tSend duplicate message\n"
"\t-r\t\t\tRetain message from broker\n\n"	"\t-r\t\t\tRetain message from broker\n\n"
"\t-C\t\t\tNot clear before connect!!!\n"	"\t-C\t\t\tNot clear before connect!!!\n"
Line 51 static int	Line 93 static int
Publish(int sock)	Publish(int sock)
{	{
int siz = 0;	int siz = 0;
	u_short mid = 0;

siz = mqtt_msgPUBLISH(args->msg, AIT_GET_STR(&args->Publish), args->MsgID, args->Dup,	#ifdef __NetBSD__
args->QoS, args->Retain, AIT_GET_PTR2(&args->Value), AIT_LEN(&args->Value));	srandom(getpid() ^ time(NULL));
if (siz == -1) {	#else
printf("Error:: msgPUBLISH #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	srandomdev();
return -1;	#endif
}	mid = random() % USHRT_MAX;
if (SendTo(sock, siz) == -1)
return -1;
/* QoS == MQTT_QOS_ONCE, no wait for reply */
if (args->QoS == MQTT_QOS_ONCE)
return 0;

if ((siz = RecvFrom(sock)) == -1 \|\| !siz)	printf(" > Execute PUBLISH request #%d ... ", mid);
return -1;	siz = mqtt_cli_Publish(args->cli, mid, args->Dup, args->QoS, args->Retain,
/* QoS == MQTT_QOS_ACK, wait for PUBACK */	AIT_GET_STR(&args->Publish), AIT_ADDR(&args->Value), AIT_LEN(&args->Value));
if (args->QoS == MQTT_QOS_ACK)
return mqtt_readPUBACK(args->msg);


/* QoS == MQTT_QOS_EXACTLY */
if (mqtt_readPUBREC(args->msg) != args->MsgID) {
printf("Error:: Message not delivered\n");
return -1;
}

siz = mqtt_msgPUBREL(args->msg, args->MsgID);
if (siz == -1) {	if (siz == -1) {
printf("Error:: msgPUBREL #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
return -1;	return -1;
}	} else
if (SendTo(sock, siz) == -1)	printf("Sended %d bytes \n", siz);
return -1;

if ((siz = RecvFrom(sock)) == -1 \|\| !siz)	return siz;
return -1;
return mqtt_readPUBCOMP(args->msg);
}	}


Line 97 main(int argc, char **argv)	Line 121 main(int argc, char **argv)
char ch;	char ch;
ait_val_t val;	ait_val_t val;
u_short port = atoi(MQTT_PORT);	u_short port = atoi(MQTT_PORT);
int sock, ret = 0;	int ret = 0;

if (!(args = malloc(sizeof(struct tagArgs)))) {	if (!(args = e_malloc(sizeof(struct tagArgs)))) {
printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));	printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
return 1;	return 1;
} else	} else
Line 109 main(int argc, char **argv)	Line 133 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);
free(args);	e_free(args);
return 1;	return 1;
}	}

Line 118 main(int argc, char **argv)	Line 142 main(int argc, char **argv)
AIT_SET_STR(&args->Pass, "");	AIT_SET_STR(&args->Pass, "");

args->ka = MQTT_KEEPALIVE;	args->ka = MQTT_KEEPALIVE;
while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:m:fvh")) != -1)	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1)
switch (ch) {	switch (ch) {
case 'T':	case 'T':
args->ka = (u_short) strtol(optarg, NULL, 0);	args->ka = (u_short) strtol(optarg, NULL, 0);
Line 139 main(int argc, char **argv)	Line 163 main(int argc, char **argv)
AIT_FREE_VAL(&args->Pass);	AIT_FREE_VAL(&args->Pass);
AIT_SET_STR(&args->Pass, optarg);	AIT_SET_STR(&args->Pass, optarg);
break;	break;
case 'm':
args->MsgID = (u_short) strtol(optarg, NULL, 0);
break;
case 'p':	case 'p':
port = (u_short) strtol(optarg, NULL, 0);	port = (u_short) strtol(optarg, NULL, 0);
break;	break;
Line 150 main(int argc, char **argv)	Line 171 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);
free(args);	e_free(args);
return 1;	return 1;
}	}
break;	break;
Line 167 main(int argc, char **argv)	Line 188 main(int argc, char **argv)
args->isFile++;	args->isFile++;
break;	break;
case 'v':	case 'v':
io_incDebug;	e_incVerbose;
break;	break;
case 'h':	case 'h':
default:	default:
args->free(args);	args->free(args);
free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
Line 181 main(int argc, char **argv)	Line 202 main(int argc, char **argv)
if (argc < 4) {	if (argc < 4) {
printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n");	printf("Error:: host for connect not found, connection id, topic or value not supplied!\n\n");
args->free(args);	args->free(args);
free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
} else {	} else {
Line 192 main(int argc, char **argv)	Line 213 main(int argc, char **argv)
AIT_FREE_VAL(&args->Value);	AIT_FREE_VAL(&args->Value);
AIT_SET_STR(&args->Value, argv[3]);	AIT_SET_STR(&args->Value, argv[3]);
}	}
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);
free(args);	e_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
if (args->QoS && !args->MsgID)	printf("Connecting to %s:%d ... ", e_n2addr(&args->addr, &val), e_n2port(&args->addr));
args->MsgID = MQTT_DEFAULT_MSGID;	AIT_FREE_VAL(&val);
ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));

if ((sock = InitClient()) == -1) {	if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {
args->free(args);	args->free(args);
free(args);	e_free(args);
return 2;	return 2;
}	}

if (args->isFile && !OpenFile()) {	if (args->isFile && !OpenFile()) {
	mqtt_cli_Close(&args->cli);
args->free(args);	args->free(args);
free(args);	e_free(args);
return 3;	return 3;
}	}

printf("Connected ... ");	switch ((ret = ConnectClient(args->cli->sock))) {
switch ((ret = ConnectClient(sock))) {
case -1:	case -1:
printf(">> FAILED!\n");	printf(">> FAILED!\n");
break;	break;
Line 241 main(int argc, char **argv)	Line 261 main(int argc, char **argv)
}	}

if (ret == MQTT_RETCODE_ACCEPTED) {	if (ret == MQTT_RETCODE_ACCEPTED) {
ret = !(Publish(sock) == args->MsgID);	ret = (Publish(args->cli->sock) == -1);
CloseClient(sock);	} else
} else {
close(sock);
ret = 4;	ret = 4;
}

	mqtt_cli_Close(&args->cli);

CloseFile();	CloseFile();
args->free(args);	args->free(args);
free(args);	e_free(args);
return ret;	return ret;
}	}

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

Removed from v.1.1.2.6
changed lines
	Added in v.1.4.4.1