mqtt/src/mqtt_subs.c - diff

Return to mqtt_subs.c CVS log

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

Diff for /mqtt/src/mqtt_subs.c between versions 1.2.2.8 and 1.2.2.12

version 1.2.2.8, 2012/05/22 14:15:04	version 1.2.2.12, 2012/06/19 08:32:17
Line 8 io_enableDEBUG;	Line 8 io_enableDEBUG;

extern char compiled[], compiledby[], compilehost[];	extern char compiled[], compiledby[], compilehost[];
volatile intptr_t Kill;	volatile intptr_t Kill;
	sched_root_task_t *root;

struct tagArgs *args;	struct tagArgs *args;

Line 56 Subscribe(int sock, FILE *lf)	Line 57 Subscribe(int sock, FILE *lf)
u_short mid;	u_short mid;
mqtt_subscr_t *sub;	mqtt_subscr_t *sub;

	#ifdef __NetBSD__
	srandom(getpid() ^ time(NULL));
	#else
srandomdev();	srandomdev();
	#endif
mid = random() % USHRT_MAX;	mid = random() % USHRT_MAX;

printf(" > Execute SUBSCRIBE request #%d ... ", mid);	printf(" > Execute SUBSCRIBE request #%d ... ", mid);
Line 80 Unsubscribe(int sock)	Line 85 Unsubscribe(int sock)
{	{
u_short mid;	u_short mid;

	#ifdef __NetBSD__
	srandom(getpid() ^ time(NULL));
	#else
srandomdev();	srandomdev();
	#endif
mid = random() % USHRT_MAX;	mid = random() % USHRT_MAX;

printf(" > Execute UNSUBSCRIBE request #%d ... ", mid);	printf(" > Execute UNSUBSCRIBE request #%d ... ", mid);
Line 94 Unsubscribe(int sock)	Line 103 Unsubscribe(int sock)
}	}


	static void *
	pubRX(sched_task_t *task)
	{
	int siz, rlen;
	char szTopic[BUFSIZ] = { 0 };
	void *data = NULL;
	u_short mid;

	rlen = RecvFrom(TASK_FD(task));
	if (siz == -1)
	goto end;
	siz = mqtt_readPUBLISH(args->msg->msg_base, szTopic, sizeof szTopic, &mid, &data);
	if (siz == -1)
	goto end;

	fprintf(TASK_ARG(task), "\nMessage ID: 0x%04hu\n", mid);

	if (data) {
	fputs((const char*) data, TASK_ARG(task));
	free(data);
	}
	end:
	schedReadSelf(task);
	return NULL;
	}


int	int
main(int argc, char **argv)	main(int argc, char **argv)
{	{
Line 105 main(int argc, char **argv)	Line 141 main(int argc, char **argv)
char *str, szStr[STRSIZ], szLogName[MAXPATHLEN] = { 0 };	char *str, szStr[STRSIZ], szLogName[MAXPATHLEN] = { 0 };
FILE *lf;	FILE *lf;

if (!(args = malloc(sizeof(struct tagArgs)))) {	if (!(args = io_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	} else
memset(args, 0, sizeof(struct tagArgs));	memset(args, 0, sizeof(struct tagArgs));
if (!(args->subscr = mqtt_subAlloc(idx))) {	if (!(args->subscr = mqtt_subAlloc(idx))) {
printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: in subscribes array #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
free(args);	io_free(args);
return 1;	return 1;
} else	} else
args->free = cleanArgs;	args->free = cleanArgs;
Line 120 main(int argc, char **argv)	Line 156 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 158 main(int argc, char **argv)	Line 194 main(int argc, char **argv)
if (!sub) {	if (!sub) {
printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());	printf("Error:: #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
args->free(args);	args->free(args);
free(args);	io_free(args);
return 1;	return 1;
} else	} else
sub += idx++;	sub += idx++;
Line 181 main(int argc, char **argv)	Line 217 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 206 main(int argc, char **argv)	Line 242 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 215 main(int argc, char **argv)	Line 251 main(int argc, char **argv)
if (argc < 2) {	if (argc < 2) {
printf("Error:: host for connect not found, connection id or topic not supplied!\n\n");	printf("Error:: host for connect not found, connection id or topic not supplied!\n\n");
args->free(args);	args->free(args);
free(args);	io_free(args);
Usage();	Usage();
return 1;	return 1;
} else {	} else {
Line 229 main(int argc, char **argv)	Line 265 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;
}	}
Line 238 main(int argc, char **argv)	Line 274 main(int argc, char **argv)

if (!(args->cli = mqtt_cli_Open(&args->addr.sa, args->ka))) {	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;
}	}

Line 272 main(int argc, char **argv)	Line 308 main(int argc, char **argv)
else	else
lf = stdout;	lf = stdout;
if (lf) {	if (lf) {
	root = schedBegin();

ret = Subscribe(args->cli->sock, lf);	ret = Subscribe(args->cli->sock, lf);

	schedRead(root, pubRX, lf, args->cli->sock, NULL, 0);
	schedRun(root, &Kill);

if (un)	if (un)
Unsubscribe(args->cli->sock);	Unsubscribe(args->cli->sock);
fclose(lf);	fclose(lf);

	schedEnd(&root);
} else	} else
printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));	printf("Error:: in subscribe file #%d - %s\n", errno, strerror(errno));
} else	} else
Line 284 main(int argc, char **argv)	Line 328 main(int argc, char **argv)
mqtt_cli_Close(&args->cli);	mqtt_cli_Close(&args->cli);

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.2.2.8
changed lines
	Added in v.1.2.2.12