X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-ares;a=blobdiff_plain;f=php_ares.c;h=c60ce4f8d4ccd234a54a632f790d6dc93f56b17c;hp=34e278ce029ef6251e687e0dd6092f26199f3afd;hb=7c7f2a0c5aa15419325556444184ad24d62ba870;hpb=5e2935ef0d8608d7c810fca70b78a492fb7042d9

diff --git a/php_ares.c b/php_ares.c
index 34e278c..c60ce4f 100644
--- a/php_ares.c
+++ b/php_ares.c
@@ -68,10 +68,23 @@ static int le_ares_query;
 static const char *php_ares_C_names[] = {
 	"INVALID",
 	"IN",
+	"C2"
 	"CHAOS",
-	"HS",
-	"NONE",
-	"ANY",
+	"HS",		/* 4 */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
+	"","","","","","","","","",										/*  9x */
+	"NONE",		/* 254 */
+	"ANY",		/* 255 */
 };
 
 static const char *php_ares_T_names[] = {
@@ -128,8 +141,6 @@ static const char *php_ares_T_names[] = {
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
-	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
-	"","","","","","","","","","","","","","","","","","","","",	/* 20x */
 	"","","","","","",												/*  6x */
 	"TKEY",	/* 249 */
 	"TSIG",
@@ -490,9 +501,26 @@ local void php_ares_query_free(php_ares_query **query) /* {{{ */
 }
 /* }}} */
 
+local zend_bool is_numeric(zval **p, long *lval) { /* {{{ */
+	zval *tmp = *p;
+	switch (Z_TYPE_PP(p)) {
+	case IS_STRING:
+		convert_to_long_ex(&tmp);
+		/* no break */
+	case IS_LONG:
+		*lval = Z_LVAL_P(tmp);
+		if (tmp != *p) {
+			zval_ptr_dtor(&tmp);
+		}
+		return !!*lval;
+	}
+	return 0;
+} /* }}} */
+
 local php_ares_options *php_ares_options_ctor(php_ares_options *options, HashTable *ht) /* {{{ */
 {
 	int i;
+	long lval;
 	zval **opt, **entry;
 	
 	if (!options) {
@@ -501,29 +529,35 @@ local php_ares_options *php_ares_options_ctor(php_ares_options *options, HashTab
 	memset(options, 0, sizeof(php_ares_options));
 	
 	if (ht && zend_hash_num_elements(ht)) {
-		if ((SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+		if ((SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_FLAGS;
-			options->strct.flags = Z_LVAL_PP(opt);
+			options->strct.flags = lval;
 		}
-		if ((SUCCESS == zend_hash_find(ht, "timeout", sizeof("timeout"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+#ifdef ARES_OPT_TIMEOUTMS
+		if ((SUCCESS == zend_hash_find(ht, "timeoutms", sizeof("timeoutms"), (void *) &opt)) && is_numeric(opt, &lval)) {
+			options->flags |= ARES_OPT_TIMEOUTMS;
+			options->strct.timeout = lval;
+		} else
+#endif
+		if ((SUCCESS == zend_hash_find(ht, "timeout", sizeof("timeout"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_TIMEOUT;
-			options->strct.timeout = Z_LVAL_PP(opt);
+			options->strct.timeout = lval;
 		}
-		if ((SUCCESS == zend_hash_find(ht, "tries", sizeof("tries"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+		if ((SUCCESS == zend_hash_find(ht, "tries", sizeof("tries"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_TRIES;
-			options->strct.tries = Z_LVAL_PP(opt);
+			options->strct.tries = lval;
 		}
-		if ((SUCCESS == zend_hash_find(ht, "ndots", sizeof("ndots"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+		if ((SUCCESS == zend_hash_find(ht, "ndots", sizeof("ndots"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_NDOTS;
-			options->strct.ndots = Z_LVAL_PP(opt);
+			options->strct.ndots = lval;
 		}
-		if ((SUCCESS == zend_hash_find(ht, "udp_port", sizeof("udp_port"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+		if ((SUCCESS == zend_hash_find(ht, "udp_port", sizeof("udp_port"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_UDP_PORT;
-			options->strct.udp_port = htons((unsigned short) Z_LVAL_PP(opt));
+			options->strct.udp_port = htons((unsigned short) lval);
 		}
-		if ((SUCCESS == zend_hash_find(ht, "tcp_port", sizeof("tcp_port"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_LONG)) {
+		if ((SUCCESS == zend_hash_find(ht, "tcp_port", sizeof("tcp_port"), (void *) &opt)) && is_numeric(opt, &lval)) {
 			options->flags |= ARES_OPT_TCP_PORT;
-			options->strct.tcp_port = htons((unsigned short) Z_LVAL_PP(opt));
+			options->strct.tcp_port = htons((unsigned short) lval);
 		}
 		if ((SUCCESS == zend_hash_find(ht, "servers", sizeof("servers"), (void *) &opt)) && (Z_TYPE_PP(opt) == IS_ARRAY) && (i = zend_hash_num_elements(Z_ARRVAL_PP(opt)))) {
 			options->strct.servers = ecalloc(i, sizeof(struct in_addr));
@@ -555,6 +589,17 @@ local php_ares_options *php_ares_options_ctor(php_ares_options *options, HashTab
 			options->flags |= ARES_OPT_LOOKUPS;
 			options->strct.lookups = estrdup(Z_STRVAL_PP(opt));
 		}
+#ifdef ARES_OPT_ROTATE
+		if ((SUCCESS == zend_hash_find(ht, "rotate", sizeof("rotate"), (void *) &opt)) && i_zend_is_true(*opt)) {
+			options->flags |= ARES_OPT_ROTATE;
+		}
+#endif
+#ifdef ARES_OPT_EDNSPSZ
+		if ((SUCCESS == zend_hash_find(ht, "ednspsz", sizeof("ednspsz"), (void *) &opt)) && is_numeric(opt, &lval)) {
+			options->flags |= ARES_OPT_EDNSPSZ;
+			options->strct.ednspsz = lval;
+		}
+#endif
 	}
 	
 	return options;
@@ -1048,7 +1093,7 @@ static PHP_FUNCTION(ares_init)
 	php_ares *ares = NULL;
 	int err;
 	
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &opt_array)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opt_array)) {
 		RETURN_FALSE;
 	}