--- mqtt/example/Attic/cmds.c	2011/11/22 13:00:33	1.1.2.6
+++ mqtt/example/Attic/cmds.c	2011/11/28 13:19:38	1.1.2.9
@@ -39,19 +39,37 @@ main()
 
 	/* sub* */
 	memset(s, 0, sizeof s);
-	s[0].sub_sb.sb.l = 3;
-	s[0].sub_data = "a/b";
-	s[0].sub_qos = MQTT_QOS_ACK;
-	s[1].sub_sb.sb.l = 3;
-	s[1].sub_data = "c/d";
-	s[1].sub_qos = MQTT_QOS_ONCE;
-	s[2].sub_sb.sb.l = 7;
-	s[2].sub_data = "x/y/z/Q";
-	s[2].sub_qos = MQTT_QOS_EXACTLY;
+	s[0].sub_topic._size = 3;
+	s[0].sub_topic._base = "a/b";
+	s[0].sub_ret = MQTT_QOS_ACK;
+	s[1].sub_topic._size = 3;
+	s[1].sub_topic._base = "c/d";
+	s[1].sub_ret = MQTT_QOS_ONCE;
+	s[2].sub_topic._size = 7;
+	s[2].sub_topic._base = "x/y/z/Q";
+	s[2].sub_ret = MQTT_QOS_EXACTLY;
 	printf("subscribe=%d/%d\n", m->msg_len, mqtt_msgSUBSCRIBE(m, s, 10, 0, 0));
 	for (i = 0; i < m->msg_len; i++)
 		printf("%d\n", ((u_char*) m->msg_base)[i]);
 	printf("suback=%d/%d\n", m->msg_len, mqtt_msgSUBACK(m, s, 10));
+	for (i = 0; i < m->msg_len; i++)
+		printf("%d\n", ((u_char*) m->msg_base)[i]);
+	printf("unsubscribe=%d/%d\n", m->msg_len, mqtt_msgUNSUBSCRIBE(m, s, 10, 0, 1));
+	for (i = 0; i < m->msg_len; i++)
+		printf("%d\n", ((u_char*) m->msg_base)[i]);
+	printf("unsuback=%d/%d\n", m->msg_len, mqtt_msgUNSUBACK(m, 10));
+	for (i = 0; i < m->msg_len; i++)
+		printf("%d\n", ((u_char*) m->msg_base)[i]);
+
+	/* ping* */
+	printf("pingreq=%d/%d\n", m->msg_len, mqtt_msgPINGREQ(m));
+	for (i = 0; i < m->msg_len; i++)
+		printf("%d\n", ((u_char*) m->msg_base)[i]);
+	printf("pingresp=%d/%d\n", m->msg_len, mqtt_msgPINGRESP(m));
+	for (i = 0; i < m->msg_len; i++)
+		printf("%d\n", ((u_char*) m->msg_base)[i]);
+
+	printf("disconnect=%d/%d\n", m->msg_len, mqtt_msgDISCONNECT(m));
 	for (i = 0; i < m->msg_len; i++)
 		printf("%d\n", ((u_char*) m->msg_base)[i]);