diff --git a/client/test/Makefile.in b/client/test/Makefile.in
index 3910089..4a5a55e 100644
--- a/client/test/Makefile.in
+++ b/client/test/Makefile.in
@@ -1,7 +1,8 @@
 .SUFFIXES: .c .o
 
 COMPILE = $(CC) $(CFLAGS)
-INC_PATH = -I/usr/include/fastcommon -I/usr/include/fastdfs
+INC_PATH = -I/usr/include/fastcommon -I/usr/include/fastdfs \
+           -I/usr/local/include/fastcommon -I/usr/local/include/fastdfs
 LIB_PATH = -L/usr/local/lib -lfastcommon -lfdfsclient $(LIBS)
 TARGET_PATH = $(TARGET_PATH)
 
diff --git a/client/test/fdfs_monitor.c b/client/test/fdfs_monitor.c
index 7978b29..67afd9f 100644
--- a/client/test/fdfs_monitor.c
+++ b/client/test/fdfs_monitor.c
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <errno.h>
 #include <signal.h>
+#include <netdb.h>
 #include <sys/types.h>
 #include "fastcommon/sockopt.h"
 #include "fastcommon/logger.h"
@@ -25,8 +26,11 @@ static int list_all_groups(const char *group_name);
 
 static void usage(char *argv[])
 {
-	printf("Usage: %s <config_file> [-h <tracker_server>] [list|delete|set_trunk_server <group_name> " \
-		"[storage_id]]\n", argv[0]);
+	printf("Usage: %s <config_file> [-h <tracker_server>] "
+            "[list|delete|set_trunk_server <group_name> [storage_id]]\n"
+            "\tthe tracker server format: host[:port], "
+            "the tracker default port is %d\n\n",
+            argv[0], FDFS_TRACKER_SERVER_DEF_PORT);
 }
 
 int main(int argc, char *argv[])
@@ -115,21 +119,20 @@ int main(int argc, char *argv[])
 	else
 	{
 		int i;
-		char ip_addr[IP_ADDRESS_SIZE];
+        ConnectionInfo conn;
 
-		*ip_addr = '\0';
-		if (getIpaddrByName(tracker_server, ip_addr, sizeof(ip_addr)) \
-			 == INADDR_NONE)
+        if ((result=conn_pool_parse_server_info(tracker_server, &conn,
+                        FDFS_TRACKER_SERVER_DEF_PORT)) != 0)
 		{
-			printf("resolve ip address of tracker server: %s " \
-				"fail!\n", tracker_server);
-			return 2;
+			printf("resolve ip address of tracker server: %s "
+				"fail!, error info: %s\n", tracker_server, hstrerror(h_errno));
+			return result;
 		}
 
 		for (i=0; i<g_tracker_group.server_count; i++)
 		{
-			if (strcmp(g_tracker_group.servers[i].ip_addr, \
-					ip_addr) == 0)
+			if (fdfs_server_contain1(g_tracker_group.servers + i,
+					&conn) == 0)
 			{
 				g_tracker_group.server_index = i;
 				break;
@@ -143,7 +146,8 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	printf("server_count=%d, server_index=%d\n", g_tracker_group.server_count, g_tracker_group.server_index);
+	printf("server_count=%d, server_index=%d\n",
+            g_tracker_group.server_count, g_tracker_group.server_index);
 
 	pTrackerServer = tracker_get_connection();
 	if (pTrackerServer == NULL)
diff --git a/client/test/fdfs_test.c b/client/test/fdfs_test.c
index 468275f..639bac8 100644
--- a/client/test/fdfs_test.c
+++ b/client/test/fdfs_test.c
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
 			group_name, storageServer.ip_addr, \
 			storageServer.port);
 
-		if ((pStorageServer=tracker_connect_server(&storageServer, \
+		if ((pStorageServer=tracker_make_connection(&storageServer, \
 			&result)) == NULL)
 		{
 			fdfs_client_destroy();
@@ -491,7 +491,7 @@ int main(int argc, char *argv[])
 		printf("storage=%s:%d\n", storageServer.ip_addr, \
 			storageServer.port);
 
-		if ((pStorageServer=tracker_connect_server(&storageServer, \
+		if ((pStorageServer=tracker_make_connection(&storageServer, \
 			&result)) == NULL)
 		{
 			fdfs_client_destroy();
diff --git a/client/test/fdfs_test1.c b/client/test/fdfs_test1.c
index 2fde169..124fc49 100644
--- a/client/test/fdfs_test1.c
+++ b/client/test/fdfs_test1.c
@@ -191,7 +191,7 @@ int main(int argc, char *argv[])
 			group_name, storageServer.ip_addr, \
 			storageServer.port);
 
-		if ((pStorageServer=tracker_connect_server(&storageServer, \
+		if ((pStorageServer=tracker_make_connection(&storageServer, \
 			&result)) == NULL)
 		{
 			fdfs_client_destroy();
@@ -458,7 +458,7 @@ int main(int argc, char *argv[])
 		printf("storage=%s:%d\n", storageServer.ip_addr, \
 			storageServer.port);
 
-		if ((pStorageServer=tracker_connect_server(&storageServer, \
+		if ((pStorageServer=tracker_make_connection(&storageServer, \
 			&result)) == NULL)
 		{
 			fdfs_client_destroy();