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.1 and 1.1.2.4

version 1.1.2.1, 2011/12/20 15:03:42	version 1.1.2.4, 2011/12/29 14:13:13
Line 6	Line 6

io_enableDEBUG;	io_enableDEBUG;

sl_config cfg;
extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
static char szCfgName[MAXPATHLEN];

struct tagArgs *args;	struct tagArgs *args;

Line 30 Usage(void)	Line 28 Usage(void)
"\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"
"\t-M <message>\t\tWill Message\n"	"\t-M <message>\t\tWill Message\n"
"\t-c <config>\t\tService config\n"
"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"	"\t-v\t\t\tVerbose (more -vvv, more verbose)\n"
"\t-h\t\t\tHelp! This screen\n\n",	"\t-h\t\t\tHelp! This screen\n\n",
compiledby, compilehost, compiled);	compiledby, compilehost, compiled);
Line 52 cleanArgs(struct tagArgs * __restrict args)	Line 49 cleanArgs(struct tagArgs * __restrict args)
static int	static int
Publish(int sock)	Publish(int sock)
{	{
return 0;	int siz = 0;

	return siz;
}	}


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

args->ka = MQTT_KEEPALIVE;	args->ka = MQTT_KEEPALIVE;
strlcpy(szCfgName, DEFAULT_CONFIG, sizeof szCfgName);	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1)
while ((ch = getopt(argc, argv, "T:U:P:p:q:drCc:W: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 129 main(int argc, char **argv)	Line 127 main(int argc, char **argv)
case 'f':	case 'f':
args->isFile++;	args->isFile++;
break;	break;
case 'c':
strlcpy(szCfgName, optarg, sizeof szCfgName);
break;
case 'v':	case 'v':
io_incDebug;	io_incDebug;
break;	break;
Line 173 main(int argc, char **argv)	Line 168 main(int argc, char **argv)
return 2;	return 2;
}	}

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

printf("Connected ... ");	printf("Connected ... ");
switch ((ret = try2Connect(sock))) {	switch ((ret = ConnectClient(sock))) {
case -1:	case -1:
printf(">> FAILED!\n");	printf(">> FAILED!\n");
break;	break;
Line 201 main(int argc, char **argv)	Line 202 main(int argc, char **argv)
if (ret == MQTT_RETCODE_ACCEPTED) {	if (ret == MQTT_RETCODE_ACCEPTED) {
ret = Publish(sock);	ret = Publish(sock);
shutdown(sock, SHUT_RDWR);	shutdown(sock, SHUT_RDWR);
} else	CloseClient(sock);
ret = 3;	} else {
	close(sock);
	ret = 4;
	}

close(sock);	CloseFile();
args->free(args);	args->free(args);
free(args);	free(args);
return ret;	return ret;

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

Removed from v.1.1.2.1
changed lines
	Added in v.1.1.2.4