Cacheable FD/Test Improvements (#2)

* Cache selectable file descriptor
* UDP/DNS test improvement

Author: cdosoftei

pcap.c

@@ -247,12 +247,20 @@ static int php_pcap_stream_cast(php_stream *stream, int castas, void **ret)
     case PHP_STREAM_AS_FD_FOR_SELECT:
     case PHP_STREAM_AS_FD:
     case PHP_STREAM_AS_SOCKETD:
+      if (sess->fd && ret) {
+        *(int *) ret = sess->fd;
+
+        return SUCCESS;
+      }
+
       fd = pcap_get_selectable_fd(sess->pcap);
 
       if (fd < 0) {
         return FAILURE;
       }
 
+      sess->fd = fd;
+
       if (ret) {
         *(int *) ret = fd;
       }
@@ -369,6 +377,7 @@ static php_stream *php_pcap_fopen(php_stream_wrapper *wrapper, const char *path,
   sess->timeout = 1000;
   sess->filter = NULL;
   sess->context = context;
+  sess->fd = 0;
 
   php_url_free(parsed_url);
 

php_pcap.h

@@ -40,6 +40,7 @@ typedef struct pcap_capture_session {
   long timeout;
   char *filter;
   php_stream_context *context;
+  int fd;
 } pcap_capture_session_t;
 
 #endif	/* PHP_PCAP_H */

tests/008.phpt

@@ -38,8 +38,10 @@ $localMac = '';
 $remoteMac = '';
 $ipv4Request = false;
 $ipv4Response = false;
+$ipv4Addr = '';
 $ipv6Request = false;
 $ipv6Response = false;
+$ipv6Addr = '';
 $replies = 0;
 
 $startedAt = time();
@@ -81,9 +83,11 @@ while (!$ipv4Request || !$ipv4Response || !$ipv6Request || !$ipv6Response) {
               } else { // Answer
                 if ($dns['answers'][0]['type'] === 1) { // A
                   $ipv4Response = true;
+                  $ipv4Addr = $dns['answers'][0]['address'];
                   echo "A DNS reply for {$dns['queries'][0]['name']}: {$dns['answers'][0]['address']} TTL={$dns['answers'][0]['ttl']}\n";
                 } elseif ($dns['answers'][0]['type'] === 28) { // AAAA
                   $ipv6Response = true;
+                  $ipv6Addr = $dns['answers'][0]['address'];
                   echo "AAAA DNS reply for {$dns['queries'][0]['name']}: {$dns['answers'][0]['address']} TTL={$dns['answers'][0]['ttl']}\n";
                 }
               }
@@ -95,6 +99,9 @@ while (!$ipv4Request || !$ipv4Response || !$ipv6Request || !$ipv6Response) {
   }
 }
 
+var_dump($ipv4Addr === filter_var($ipv4Addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4));
+var_dump($ipv6Addr === filter_var($ipv6Addr, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6));
+
 var_dump($localMac);
 var_dump($remoteMac);
 
@@ -107,6 +114,8 @@ A DNS query for example.com.
 A DNS reply for example.com.: %d.%d.%d.%d TTL=%d
 AAAA DNS query for example.com.
 AAAA DNS reply for example.com.: %x:%x:%x:%x:%x:%x:%x:%x TTL=%d
+bool(true)
+bool(true)
 string(17) "%x:%x:%x:%x:%x:%x"
 string(17) "%x:%x:%x:%x:%x:%x"
 done!