--- mqtt/src/mqtt_pub.c	2011/12/24 17:30:29	1.1.2.3
+++ mqtt/src/mqtt_pub.c	2012/05/08 11:45:57	1.2.2.5
@@ -19,6 +19,7 @@ Usage(void)
 		" Syntax: mqtt_pub [options] <connect_to_broker[:port]> <ConnectID> <topic> <value_for_publish>\n\n"
 		"\t-f\t\t\t'value_for_publish' is file name instead text\n"
 		"\t-q <QoS>\t\tQoS level (0-at most 1, 1-at least 1, 2-exactly 1)\n"
+		"\t-m <message_id>\t\tMessage ID for publish message\n"
 		"\t-d\t\t\tSend duplicate message\n"
 		"\t-r\t\t\tRetain message from broker\n\n"
 		"\t-C\t\t\tNot clear before connect!!!\n"
@@ -49,7 +50,69 @@ cleanArgs(struct tagArgs * __restrict args)
 static int
 Publish(int sock)
 {
-	return 0;
+	int siz = 0;
+
+	siz = mqtt_msgPUBLISH(args->msg, AIT_GET_STR(&args->Publish), args->MsgID, args->Dup, 
+			args->QoS, args->Retain, AIT_ADDR(&args->Value), AIT_LEN(&args->Value));
+	if (siz == -1) {
+		printf("Error:: msgPUBLISH #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+		return -1;
+	}
+	if (SendTo(sock, siz) == -1)
+		return -1;
+	/* QoS == MQTT_QOS_ONCE, no wait for reply */
+	if (args->QoS == MQTT_QOS_ONCE)
+		return 0;
+
+	if ((siz = RecvFrom(sock)) == -1 || !siz)
+		return -1;
+	/* QoS == MQTT_QOS_ACK, wait for PUBACK */
+	if (args->QoS == MQTT_QOS_ACK) {
+		siz = mqtt_readPUBACK(args->msg);
+		if (siz == args->MsgID)
+			return siz;
+		if (!args->Dup) {
+			args->Dup++;
+			return Publish(sock);
+		}
+		goto end;
+	}
+
+
+	/* QoS == MQTT_QOS_EXACTLY */
+	siz = mqtt_readPUBREC(args->msg);
+	if (siz != args->MsgID) {
+		if (!args->Dup) {
+			args->Dup++;
+			return Publish(sock);
+		}
+		goto end;
+	}
+
+	do {
+		siz = mqtt_msgPUBREL(args->msg, args->MsgID);
+		if (siz == -1) {
+			printf("Error:: msgPUBREL #%d - %s\n", mqtt_GetErrno(), mqtt_GetError());
+			return -1;
+		}
+		if (SendTo(sock, siz) == -1)
+			return -1;
+
+		if ((siz = RecvFrom(sock)) == -1 || !siz)
+			return -1;
+
+		siz = mqtt_readPUBCOMP(args->msg);
+		if (siz == args->MsgID)
+			return siz;
+		if (!args->Dup) {
+			args->Dup++;
+			continue;
+		}
+	} while (0);
+
+end:
+	printf("Error:: Message not delivered\n");
+	return -1;
 }
 
 
@@ -59,7 +122,7 @@ main(int argc, char **argv)
 	char ch;
 	ait_val_t val;
 	u_short port = atoi(MQTT_PORT);
-	int sock, ret = 0;
+	int ret = 0;
 
 	if (!(args = malloc(sizeof(struct tagArgs)))) {
 		printf("Error:: in alloc arguments #%d - %s\n", errno, strerror(errno));
@@ -80,7 +143,7 @@ main(int argc, char **argv)
 	AIT_SET_STR(&args->Pass, "");
 
 	args->ka = MQTT_KEEPALIVE;
-	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:fvh")) != -1)
+	while ((ch = getopt(argc, argv, "T:U:P:p:q:drCW:M:m:fvh")) != -1)
 		switch (ch) {
 			case 'T':
 				args->ka = (u_short) strtol(optarg, NULL, 0);
@@ -101,6 +164,9 @@ main(int argc, char **argv)
 				AIT_FREE_VAL(&args->Pass);
 				AIT_SET_STR(&args->Pass, optarg);
 				break;
+			case 'm':
+				args->MsgID = (u_short) strtol(optarg, NULL, 0);
+				break;
 			case 'p':
 				port = (u_short) strtol(optarg, NULL, 0);
 				break;
@@ -158,16 +224,25 @@ main(int argc, char **argv)
 		Usage();
 		return 1;
 	}
-	ioVERBOSE(1) printf("Connecting to %s:%d ...\n", io_n2addr(&args->addr, &val), io_n2port(&args->addr));
+	if (args->QoS && !args->MsgID)
+		args->MsgID = MQTT_DEFAULT_MSGID;
+	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);
 		free(args);
 		return 2;
 	}
 
-	printf("Connected ... ");
-	switch ((ret = ConnectClient(sock))) {
+	if (args->isFile && !OpenFile()) {
+		mqtt_cli_Close(&args->cli);
+		args->free(args);
+		free(args);
+		return 3;
+	}
+
+	switch ((ret = ConnectClient(args->cli->sock))) {
 		case -1:
 			printf(">> FAILED!\n");
 			break;
@@ -192,14 +267,13 @@ main(int argc, char **argv)
 	}
 
 	if (ret == MQTT_RETCODE_ACCEPTED) {
-		ret = Publish(sock);
-		shutdown(sock, SHUT_RDWR);
-		CloseClient(sock);
-	} else {
-		close(sock);
-		ret = 3;
-	}
+		ret = !(Publish(args->cli->sock) == args->MsgID);
+	} else
+		ret = 4;
 
+	mqtt_cli_Close(&args->cli);
+
+	CloseFile();
 	args->free(args);
 	free(args);
 	return ret;