mqtt/src/mqtt.c - diff - 1.1.1.1.2.27

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.24 and 1.1.1.1.2.27

version 1.1.1.1.2.24, 2011/12/13 09:51:35	version 1.1.1.1.2.27, 2011/12/13 15:23:43
Line 19 Usage(void)	Line 19 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]> <ConnectID> [value_for_publish]\n\n"
"\t-t <topic>\t\tPublish topic\n"	"\t-t <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>\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-d\t\t\tSend duplicate message\n"	"\t-d\t\t\tSend duplicate message\n"
"\t-r\t\t\tRetain message from broker\n"	"\t-r\t\t\tRetain message from broker\n"
	"\t-C\t\t\tNot clear before connect!\n"
"\t-c <config>\t\tService config\n"	"\t-c <config>\t\tService config\n"
"\t-f\t\t\t'value_for_publish' is file instead text\n"	"\t-f\t\t\t'value_for_publish' is file instead text\n"
"\t-p <port>\t\tDifferent port for connect (default: 1883)\n"	"\t-p <port>\t\tDifferent port for connect (default: 1883)\n"
	"\t-T <timeout>\t\tKeep alive timeout in seconds\n"
"\t-U <username>\t\tUsername\n"	"\t-U <username>\t\tUsername\n"
"\t-P <password>\t\tPassword\n"	"\t-P <password>\t\tPassword\n"
"\t-W <topic>\t\tWill Topic\n"	"\t-W <topic>\t\tWill Topic\n"
Line 48 cleanArgs(struct tagArgs * __restrict args)	Line 50 cleanArgs(struct tagArgs * __restrict args)
AIT_FREE_VAL(&args->Pass);	AIT_FREE_VAL(&args->Pass);
AIT_FREE_VAL(&args->Publish);	AIT_FREE_VAL(&args->Publish);
AIT_FREE_VAL(&args->Value);	AIT_FREE_VAL(&args->Value);
	AIT_FREE_VAL(&args->ConnID);
io_freeVars(&args->Subscribes);	io_freeVars(&args->Subscribes);
}	}

Line 55 cleanArgs(struct tagArgs * __restrict args)	Line 58 cleanArgs(struct tagArgs * __restrict args)
int	int
main(int argc, char **argv)	main(int argc, char **argv)
{	{
char ch, batch = 1, szStr[STRSIZ] = { 0 };	char ch, batch = 1;
ait_val_t *v, val;	ait_val_t *v, val;
u_short port = atoi(MQTT_PORT);	u_short port = atoi(MQTT_PORT);
int sock;	int sock;
Line 79 main(int argc, char **argv)	Line 82 main(int argc, char **argv)
return 1;	return 1;
}	}

	AIT_SET_STR(&args->ConnID, "");
	AIT_SET_STR(&args->User, "");
	AIT_SET_STR(&args->Pass, "");

strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);	strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);
while ((ch = getopt(argc, argv, "U:P:p:t:s:q:drc:W:M:fDvh")) != -1)	while ((ch = getopt(argc, argv, "T:U:P:p:t:s:q:drc:W:M:fDvh")) != -1)
switch (ch) {	switch (ch) {
	case 'T':
	args->ka = (u_short) strtol(optarg, NULL, 0);
	break;
case 'M':	case 'M':
AIT_FREE_VAL(&args->Will.Msg);	AIT_FREE_VAL(&args->Will.Msg);
AIT_SET_STR(&args->Will.Msg, optarg);	AIT_SET_STR(&args->Will.Msg, optarg);
Line 106 main(int argc, char **argv)	Line 116 main(int argc, char **argv)
AIT_SET_STR(&args->Publish, optarg);	AIT_SET_STR(&args->Publish, optarg);
break;	break;
case 's':	case 's':
v = malloc(sizeof(ait_val_t));	v = io_allocVar();
if (!v) {	if (!v) {
printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno));	printf("Error:: not enough memory #%d - %s\n", errno, strerror(errno));
args->free(args);	args->free(args);
Line 114 main(int argc, char **argv)	Line 124 main(int argc, char **argv)
return 1;	return 1;
} else	} else
AIT_SET_STR(v, optarg);	AIT_SET_STR(v, optarg);
io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), (void**) &v);	io_arrayElem(args->Subscribes, io_arraySize(args->Subscribes), v);
break;	break;
case 'q':	case 'q':
args->QoS = (char) strtol(optarg, NULL, 0);	args->QoS = (char) strtol(optarg, NULL, 0);
if (args->QoS < MQTT_QOS_ONCE \|\| 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);	free(args);
Line 131 main(int argc, char **argv)	Line 141 main(int argc, char **argv)
case 'r':	case 'r':
args->Retain++;	args->Retain++;
break;	break;
	case 'C':
	args->notClear++;
	break;
case 'f':	case 'f':
args->isFile++;	args->isFile++;
break;	break;
Line 152 main(int argc, char **argv)	Line 165 main(int argc, char **argv)
}	}
argc -= optind;	argc -= optind;
argv += optind;	argv += optind;
if (!argc) {	if (argc < 2) {
printf("Error:: host for connect not found!\n");	printf("Error:: host for connect not found or connection id not supplied!\n");
args->free(args);	args->free(args);
free(args);	free(args);
Usage();	Usage();
return 1;	return 1;
	} else {
	AIT_FREE_VAL(&args->ConnID);
	AIT_SET_STR(&args->ConnID, argv[1]);
}	}
if (argc > 1)	if (argc > 2)
AIT_SET_STR(&args->Value, argv[1]);	AIT_SET_STR(&args->Value, argv[2]);
if (!io_gethostbyname(*argv, port, &args->addr)) {	if (!io_gethostbyname(*argv, port, &args->addr)) {
printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError());	printf("Error:: host not connect #%d - %s\n", io_GetErrno(), io_GetError());
args->free(args);	args->free(args);
Line 184 main(int argc, char **argv)	Line 200 main(int argc, char **argv)
return 2;	return 2;
}	}

if (SendConnect(sock) == -1) {	if (try2Connect(sock) == -1) {
close(sock);	close(sock);
UnloadConfig(&cfg);	UnloadConfig(&cfg);
args->free(args);	args->free(args);

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

Removed from v.1.1.1.1.2.24
changed lines
	Added in v.1.1.1.1.2.27