--- libelwix/example/test_pack.c	2013/06/30 22:06:25	1.1.2.4
+++ libelwix/example/test_pack.c	2014/02/11 00:08:13	1.3.2.1
@@ -12,6 +12,7 @@ main(int argc, char **argv)
 	short n16 = 0xdeba;
 	int n32 = 0xdeadbeef;
 	long long int n64 = 0x123456789abcdef0;
+	char *str;
 
 	if (argc < 2)
 		return 1;
@@ -23,6 +24,28 @@ main(int argc, char **argv)
 	} else
 		printf("create raw packet %p -> %s(%d)\n", rp, rp->r_buf, rp->r_len);
 
+	printf("test rpack_data::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++) {
+		if (i == 4) {
+			str = rpack_data(rp, "F0ST4T4", 8);
+			str[7] = 0;
+			printf("\t%d) %s\n", i, str ? str : NULL);
+			i += 8;
+		} else {
+			str = rpack_data(rp, NULL, 1);
+			printf("\t%d) %c\n", i, str ? *str : 0xff);
+		}
+		e_free(str);
+	}
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++) {
+		str = rpack_data(rp, NULL, 1);
+		printf("\t%d) %c\n", i, str ? *str : 0xff);
+		e_free(str);
+	}
+	RPACK_REWIND(rp);
+
+
 	printf("test rpack_uint8::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
@@ -37,34 +60,45 @@ main(int argc, char **argv)
 	printf("test rpack_uint16::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
-			printf("\t%d) %x\n", i, rpack_uint16(rp, (uint16_t*) &n16));
+			printf("\t%d) %x\n", i, rpack_uint16(rp, (uint16_t*) &n16, 0));
 		else
-			printf("\t%d) %x\n", i, rpack_uint16(rp, NULL));
+			printf("\t%d) %x\n", i, rpack_uint16(rp, NULL, 0));
 	RPACK_REWIND(rp);
 	for (i = 0; i < RPACK_LEN(rp); i++)
-		printf("\t%d) %x\n", i, rpack_uint16(rp, NULL));
+		printf("\t%d) %x\n", i, rpack_uint16(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
 	printf("test rpack_uint24::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
-			printf("\t%d) %x\n", i, rpack_uint24(rp, (uint32_t*) &n32));
+			printf("\t%d) %x\n", i, rpack_uint24(rp, (uint32_t*) &n32, 0));
 		else
-			printf("\t%d) %x\n", i, rpack_uint24(rp, NULL));
+			printf("\t%d) %x\n", i, rpack_uint24(rp, NULL, 0));
 	RPACK_REWIND(rp);
 	for (i = 0; i < RPACK_LEN(rp); i++)
-		printf("\t%d) %x\n", i, rpack_uint24(rp, NULL));
+		printf("\t%d) %x\n", i, rpack_uint24(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
 	printf("test rpack_uint32::\n");
 	for (i = 0; i < RPACK_LEN(rp); i++)
 		if (i == 4)
-			printf("\t%d) %x\n", i, rpack_uint32(rp, (uint32_t*) &n32));
+			printf("\t%d) %x\n", i, rpack_uint32(rp, (uint32_t*) &n32, 0));
 		else
-			printf("\t%d) %x\n", i, rpack_uint32(rp, NULL));
+			printf("\t%d) %x\n", i, rpack_uint32(rp, NULL, 0));
 	RPACK_REWIND(rp);
 	for (i = 0; i < RPACK_LEN(rp); i++)
-		printf("\t%d) %x\n", i, rpack_uint32(rp, NULL));
+		printf("\t%d) %x\n", i, rpack_uint32(rp, NULL, 0));
+	RPACK_REWIND(rp);
+
+	printf("test rpack_uint64::\n");
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		if (i == 4)
+			printf("\t%d) %llx\n", i, rpack_uint64(rp, (uint64_t*) &n64, 0));
+		else
+			printf("\t%d) %llx\n", i, rpack_uint64(rp, NULL, 0));
+	RPACK_REWIND(rp);
+	for (i = 0; i < RPACK_LEN(rp); i++)
+		printf("\t%d) %llx\n", i, rpack_uint64(rp, NULL, 0));
 	RPACK_REWIND(rp);
 
 	rpack_destroy(&rp);