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.4 and 1.2.2.7

version 1.1.2.4, 2011/12/29 14:13:13	version 1.2.2.7, 2012/05/27 10:04:05
Line 50 static int	Line 50 static int
Publish(int sock)	Publish(int sock)
{	{
int siz = 0;	int siz = 0;
	u_short mid = 0;

	srandomdev();
	mid = random() % USHRT_MAX;

	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) {
	printf("Error:: Publish #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
	return -1;
	} else
	printf("OK\n");

return siz;	return siz;
}	}

Line 61 main(int argc, char **argv)	Line 74 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 73 main(int argc, char **argv)	Line 86 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 111 main(int argc, char **argv)	Line 124 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 133 main(int argc, char **argv)	Line 146 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 142 main(int argc, char **argv)	Line 155 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 156 main(int argc, char **argv)	Line 169 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;
}	}
ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));	printf("Connecting to %s:%d ... ", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
	AIT_FREE_VAL(&val);

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 200 main(int argc, char **argv)	Line 214 main(int argc, char **argv)
}	}

if (ret == MQTT_RETCODE_ACCEPTED) {	if (ret == MQTT_RETCODE_ACCEPTED) {
ret = Publish(sock);	ret = (Publish(args->cli->sock) == -1);
shutdown(sock, SHUT_RDWR);	} else
CloseClient(sock);
} 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.4
changed lines
	Added in v.1.2.2.7