From 08fe0c6e015c2c9b2948c6224d4171dfdab6abf0 Mon Sep 17 00:00:00 2001
From: yuqing <yuqing@yongche.com>
Date: Wed, 14 Jan 2015 12:58:08 +0800
Subject: [PATCH] support php extension

---
 php-ext/fastcommon.c       | 28 ++++++++++++++++++++++------
 php-ext/fastcommon.h       |  1 +
 php-ext/fastcommon.spec.in |  2 +-
 php-ext/test.php           |  5 +++++
 4 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 php-ext/test.php

diff --git a/php-ext/fastcommon.c b/php-ext/fastcommon.c
index 2695ba1..7566b0e 100644
--- a/php-ext/fastcommon.c
+++ b/php-ext/fastcommon.c
@@ -36,6 +36,7 @@ const zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, N
 // Every user visible function must have an entry in fastcommon_functions[].
 	zend_function_entry fastcommon_functions[] = {
 		ZEND_FE(fastcommon_version, NULL)
+		ZEND_FE(fastcommon_gethostaddrs, NULL)
 		{NULL, NULL, NULL}  /* Must be the last line */
 	};
 
@@ -114,9 +115,12 @@ ZEND_FUNCTION(fastcommon_gethostaddrs)
     char *if_alias_prefix;
     int if_prefix_len;
 	int count;
+    int uniq_count;
+    int i;
 	int k;
 	int alias_count;
 	char ip_addresses[FAST_MAX_LOCAL_IP_ADDRS][IP_ADDRESS_SIZE];
+	char *uniq_ips[FAST_MAX_LOCAL_IP_ADDRS];
 	char *if_alias_prefixes[1];
 
 	argc = ZEND_NUM_ARGS();
@@ -137,8 +141,7 @@ ZEND_FUNCTION(fastcommon_gethostaddrs)
 	}
 
 
-	if (if_alias_prefix == NULL || if_prefix_len == 0)
-	{
+	if (if_alias_prefix == NULL || if_prefix_len == 0) {
 		alias_count = 0;
         if_alias_prefixes[0] = NULL;
 	}
@@ -148,16 +151,29 @@ ZEND_FUNCTION(fastcommon_gethostaddrs)
         if_alias_prefixes[0] = if_alias_prefix;
 	}
 
-	if (gethostaddrs(if_alias_prefixes, alias_count, ip_addresses, \
+    count = 0;
+	if (gethostaddrs(if_alias_prefixes, alias_count, ip_addresses,
 			FAST_MAX_LOCAL_IP_ADDRS, &count) != 0)
 	{
 		RETURN_BOOL(false);
 	}
 
+    uniq_count = 0;
+	for (k=0; k<count; k++) {
+        for (i=0; i<uniq_count; i++) {
+            if (strcmp(ip_addresses[k], uniq_ips[i]) == 0) {
+                break;
+            }
+        }
+
+        if (i == uniq_count) {  //not found
+            uniq_ips[uniq_count++] = ip_addresses[k];
+        }
+	}
+
 	array_init(return_value);
-	for (k=0; k<count; k++)
-	{
-        add_index_string(return_value, k, ip_addresses[k], 1);
+	for (k=0; k<uniq_count; k++) {
+        add_index_string(return_value, k, uniq_ips[k], 1);
 	}
 }
 
diff --git a/php-ext/fastcommon.h b/php-ext/fastcommon.h
index 990039f..970b11c 100644
--- a/php-ext/fastcommon.h
+++ b/php-ext/fastcommon.h
@@ -18,6 +18,7 @@ PHP_RSHUTDOWN_FUNCTION(fastcommon);
 PHP_MINFO_FUNCTION(fastcommon);
 
 ZEND_FUNCTION(fastcommon_version);
+ZEND_FUNCTION(fastcommon_gethostaddrs);
 
 #ifdef __cplusplus
 }
diff --git a/php-ext/fastcommon.spec.in b/php-ext/fastcommon.spec.in
index 1bb77ea..e83a4c4 100644
--- a/php-ext/fastcommon.spec.in
+++ b/php-ext/fastcommon.spec.in
@@ -29,7 +29,7 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/lib64/php/modules
 mkdir -p %{buildroot}/etc/php.d
 cp -f .libs/fastcommon.so  %{buildroot}/usr/lib64/php/modules/
-cp -f fastcommon.ini %{buildroot}/etc/php.d/fastcommon.ini.sample
+cp -f fastcommon.ini %{buildroot}/etc/php.d/fastcommon.ini
 
 %post
 
diff --git a/php-ext/test.php b/php-ext/test.php
new file mode 100644
index 0000000..8bd5af8
--- /dev/null
+++ b/php-ext/test.php
@@ -0,0 +1,5 @@
+<?php
+
+echo 'version: ' . fastcommon_version() . "\n";
+var_dump(fastcommon_gethostaddrs());
+