mqtt/src/mqtt.c - diff - 1.1.1.1.2.22

Return to mqtt.c CVS log

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

Diff for /mqtt/src/Attic/mqtt.c between versions 1.1.1.1.2.21 and 1.1.1.1.2.22

version 1.1.1.1.2.21, 2011/12/12 09:45:16	version 1.1.1.1.2.22, 2011/12/13 08:43:51
Line 1	Line 1
#include "global.h"	#include "global.h"
#include "rtlm.h"	#include "rtlm.h"
#include "mqtt.h"	#include "mqtt.h"
	#include "client.h"


sl_config cfg;	sl_config cfg;
Line 19 Usage(void)	Line 20 Usage(void)
printf( " -= MQTT Client =- Publisher/Subscriber from ELWIX\n"	printf( " -= MQTT Client =- Publisher/Subscriber from ELWIX\n"
"=== %s@%s === Compiled: %s ===\n\n"	"=== %s@%s === Compiled: %s ===\n\n"
" Syntax: mqtt [options] <connect_to_broker[:port]> [value_for_publish]\n\n"	" Syntax: mqtt [options] <connect_to_broker[:port]> [value_for_publish]\n\n"
"\t-p <topic>\tPublish topic\n"	"\t-p <topic>\t\tPublish topic\n"
"\t-s <topic[\|QoS]>\tSubscribe for this topic, if wish add different \|QoS to topic\n"	"\t-s <topic[\|QoS]>\tSubscribe for this topic, if wish add different \|QoS to topic\n"
"\t-q <QoS>\tQoS level (0-at most 1, 1-at least 1, 2-explicit 1)\n"	"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"
"\t-d\t\tSend duplicate message\n"	"\t-d\t\t\tSend duplicate message\n"
"\t-r\t\tRetain message from broker\n"	"\t-r\t\t\tRetain message from broker\n"
"\t-c <config>\tService config\n"	"\t-c <config>\t\tService config\n"
"\t-f\t\t'value_for_publish' is file instead text\n"	"\t-f\t\t\t'value_for_publish' is file instead text\n"
"\t-D\t\tDaemon mode\n"	"\t-P <port>\t\tDifferent port for connect (default: 1883)\n"
"\t-v\t\tVerbose (more -vvv, more verbose)\n"	"\t-D\t\t\tDaemon mode\n"
"\t-h\t\tHelp! This screen\n\n",	"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
	"\t-h\t\t\tHelp! This screen\n\n",
compiledby, compilehost, compiled);	compiledby, compilehost, compiled);
}	}

	static void
	cleanArgs(struct tagArgs * __restrict args)
	{
	AIT_FREE_VAL(&args->Publish);
	AIT_FREE_VAL(&args->Value);
	io_freeVars(&args->Subscribes);
	}


int	int
main(int argc, char **argv)	main(int argc, char **argv)
{	{
char ch, batch = 1, szStr[STRSIZ] = { 0 };	char ch, batch = 1, szStr[STRSIZ] = { 0 };
	ait_val_t *v, val;
	u_short port = atoi(MQTT_PORT);
	int sock;

if (!(args = malloc(sizeof(struct tagArgs)))) {	if (!(args = 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 if (!(args->Subscribes = io_allocVars(1))) {
	printf("Error:: in subscribes array #%d - %s\n", io_GetErrno(), io_GetError());
	free(args);
	return 1;
	} else
	args->free = cleanArgs;

strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
while ((ch = getopt(argc, argv, "p:s:q:drc:fDvh")) != -1)	while ((ch = getopt(argc, argv, "P:p:s:q:drc:fDvh")) != -1)
switch (ch) {	switch (ch) {
	case 'P':
	port = (u_short) strtol(optarg, NULL, 0);
	break;
case 'p':	case 'p':
	AIT_FREE_VAL(&args->Publish);
	AIT_SET_STR(&args->Publish, optarg);
break;	break;
case 's':	case 's':
	v = malloc(sizeof(ait_val_t));
	if (!v) {
	printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno));
	args->free(args);
	free(args);
	return 1;
	} else
	AIT_SET_STR(v, optarg);
	io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), (void**) &v);
break;	break;
case 'q':	case 'q':
	args->QoS = (char) strtol(optarg, NULL, 0);
	if (args->QoS < MQTT_QOS_ONCE \|\| args->QoS > MQTT_QOS_EXACTLY) {
	printf("Error:: invalid QoS level %d\n", args->QoS);
	args->free(args);
	free(args);
	return 1;
	}
break;	break;
case 'd':	case 'd':
	args->Dup++;
break;	break;
case 'r':	case 'r':
	args->Retain++;
break;	break;
case 'f':	case 'f':
	args->isFile++;
break;	break;
case 'c':	case 'c':
strlcpy(szCfgName, optarg, sizeof szCfgName);	strlcpy(szCfgName, optarg, sizeof szCfgName);
Line 69 main(int argc, char **argv)	Line 111 main(int argc, char **argv)
break;	break;
case 'h':	case 'h':
default:	default:
	args->free(args);
free(args);	free(args);
Usage();	Usage();
return 1;	return 1;
}	}
argc -= optind;	argc -= optind;
argv += optind;	argv += optind;
	if (!argc) {
	printf("Error:: host for connect not found!\n");
	args->free(args);
	free(args);
	Usage();
	return 1;
	}
	if (argc > 1)
	AIT_SET_STR(&args->Value, argv[1]);
	if (!io_gethostbyname(*argv, port, &args->addr)) {
	printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError());
	args->free(args);
	free(args);
	Usage();
	return 1;
	}
	VERB(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));

if (LoadConfig(szCfgName, &cfg)) {	if (LoadConfig(szCfgName, &cfg)) {
printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());	printf("Error:: can't load #%d - %s\n", cfg_GetErrno(), cfg_GetError());
	args->free(args);
free(args);	free(args);
return 1;	return 1;
}	}

	if ((sock = InitClient()) == -1) {
	args->free(args);
	free(args);
	return 2;
	}

	shutdown(sock, SHUT_RDWR);
	close(sock);

UnloadConfig(&cfg);	UnloadConfig(&cfg);
	args->free(args);
free(args);	free(args);
return 0;	return 0;
}	}

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

Removed from v.1.1.1.1.2.21
changed lines
	Added in v.1.1.1.1.2.22