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.5 and 1.4

version 1.1.2.5, 2012/01/05 10:01:20	version 1.4, 2012/07/03 12:46:00
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
	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"
Line 19 Usage(void)	Line 64 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 95 static int
Publish(int sock)	Publish(int sock)
{	{
int siz = 0;	int siz = 0;
struct pollfd pfd;	u_short mid = 0;
struct mqtthdr *hdr;

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;

siz = send(sock, args->msg->msg_base, siz, 0);	printf(" > Execute PUBLISH request #%d ... ", mid);
	siz = mqtt_cli_Publish(args->cli, mid, args->Dup, args->QoS, args->Retain,
	AIT_GET_STR(&args->Publish), AIT_ADDR(&args->Value), AIT_LEN(&args->Value));
if (siz == -1) {	if (siz == -1) {
printf("Error:: send() #%d - %s\n", errno, strerror(errno));	printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
return -1;	return -1;
} else	} else
ioVERBOSE(3) printf("Sended PUBLISH %d bytes\n", siz);	printf("Sended %d bytes \n", siz);

/* QoS == MQTT_QOS_ONCE, no wait for reply */	return siz;
if (args->QoS == MQTT_QOS_ONCE)
return 0;

pfd.fd = sock;
pfd.events = POLLIN \| POLLPRI;
switch (poll(&pfd, 1, args->ka * 1000)) {
case -1:
printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
return -1;
case 0:
ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
return -1;
}
if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL))
return -1;

siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0);
if (siz == -1) {
printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
return -1;
} else
ioVERBOSE(3) printf("Received %d bytes\n", siz);
if (!siz)
return -1;

/* QoS == MQTT_QOS_ACK, wait for PUBACK */
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) {
printf("Error:: msgPUBLISH #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
return -1;
}

siz = send(sock, args->msg->msg_base, siz, 0);
if (siz == -1) {
printf("Error:: send() #%d - %s\n", errno, strerror(errno));
return -1;
} else
ioVERBOSE(3) printf("Sended PUBLISH %d bytes\n", siz);

pfd.events = POLLIN \| POLLPRI;
switch (poll(&pfd, 1, args->ka * 1000)) {
case -1:
printf("Error:: poll() #%d - %s\n", errno, strerror(errno));
return -1;
case 0:
ioVERBOSE(3) printf("Timeout reached (%d) ...\n", args->ka * 1000);
return -1;
}
if (pfd.revents & (POLLERR \| POLLHUP \| POLLNVAL))
return -1;

siz = recv(sock, args->msg->msg_base, args->msg->msg_len, 0);
if (siz == -1) {
printf("Error:: recv() #%d - %s\n", errno, strerror(errno));
return -1;
} else
ioVERBOSE(3) printf("Received %d bytes\n", siz);
if (!siz)
return -1;

return mqtt_readPUBCOMP(args->msg);
}	}


Line 148 main(int argc, char **argv)	Line 123 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 = io_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 160 main(int argc, char **argv)	Line 135 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);	io_free(args);
return 1;	return 1;
}	}

Line 169 main(int argc, char **argv)	Line 144 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 190 main(int argc, char **argv)	Line 165 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 201 main(int argc, char **argv)	Line 173 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);	io_free(args);
return 1;	return 1;
}	}
break;	break;
Line 223 main(int argc, char **argv)	Line 195 main(int argc, char **argv)
case 'h':	case 'h':
default:	default:
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
Line 232 main(int argc, char **argv)	Line 204 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);	io_free(args);
Usage();	Usage();
return 1;	return 1;
} else {	} else {
Line 246 main(int argc, char **argv)	Line 218 main(int argc, char **argv)
if (!io_gethostbyname(*argv, port, &args->addr)) {	if (!io_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", io_GetErrno(), io_GetError());
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
}	}
if (args->QoS && !args->MsgID)	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_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);	io_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);	io_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 292 main(int argc, char **argv)	Line 263 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);	io_free(args);
return ret;	return ret;
}	}

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

Removed from v.1.1.2.5
changed lines
	Added in v.1.4