Sfoglia il codice sorgente

* Renamed socket_valid_ip() to is_dotted_ip() that returns af_type

svn: 1402
Bryan Drewery 21 anni fa
parent
commit
8eb445d817
2 ha cambiato i file con 6 aggiunte e 4 eliminazioni
  1. 5 3
      src/socket.c
  2. 1 1
      src/socket.h

+ 5 - 3
src/socket.c

@@ -9,14 +9,16 @@
 #include <sys/socket.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <arpa/inet.h>
 
 
-int socket_valid_ip(const char *ip)
+int is_dotted_ip(const char *ip)
 {
 {
         char buf[512];
         char buf[512];
 
 
 #ifdef USE_IPV6
 #ifdef USE_IPV6
-        if (inet_pton(AF_INET6, ip, buf) > 0) return(1);
+        if (inet_pton(AF_INET6, ip, buf) > 0) 
+          return AF_INET6;
 #endif
 #endif
-        if (inet_pton(AF_INET, ip, buf) > 0) return(1);
+        if (inet_pton(AF_INET, ip, buf) > 0)
+          return AF_INET;
         return(0);
         return(0);
 }
 }
 
 

+ 1 - 1
src/socket.h

@@ -16,7 +16,7 @@ int socket_get_name(int sock, char **ip, int *port);
 //int socket_get_peer_name(int sock, char **peer_ip, int *peer_port);
 //int socket_get_peer_name(int sock, char **peer_ip, int *peer_port);
 //int socket_get_error(int sock);
 //int socket_get_error(int sock);
 //int socket_accept(int sock, char **peer_ip, int *peer_port);
 //int socket_accept(int sock, char **peer_ip, int *peer_port);
-int socket_valid_ip(const char *ip);
+int is_dotted_ip(const char *ip);
 int socket_ip_to_uint(const char *ip, unsigned int *longip);
 int socket_ip_to_uint(const char *ip, unsigned int *longip);
 int socket_ipv6_to_dots(const char *ip, char *dots);
 int socket_ipv6_to_dots(const char *ip, char *dots);