Convert to getaddrinfo

diff --git a/etc/afpd/fce_api.c b/etc/afpd/fce_api.c
index 601f02e215262e1bda24b93d09307636f2e903f2..8df502b6e7b77351f8d778fd5358c5b016f2203e 100755 (executable)
--- a/etc/afpd/fce_api.c
+++ b/etc/afpd/fce_api.c
@@ -81,48 +81,50 @@ static const char *skip_files[] =
  * */\r
 void fce_init_udp()\r
 {\r
+    int rv;\r
+    struct addrinfo hints, *servinfo, *p;\r
+\r
     if (udp_initialized == FCE_TRUE)\r
         return;\r
 \r
+    memset(&hints, 0, sizeof hints);\r
+    hints.ai_family = AF_UNSPEC;\r
+    hints.ai_socktype = SOCK_DGRAM;\r
 \r
-    for (int i = 0; i < udp_sockets; i++)\r
-    {\r
+    for (int i = 0; i < udp_sockets; i++) {\r
         struct udp_entry *udp_entry = udp_socket_list + i;\r
 \r
         /* Close any pending sockets */\r
         if (udp_entry->sock != -1)\r
-        {\r
-            close( udp_entry->sock );\r
+            close(udp_entry->sock);\r
+\r
+        if ((rv = getaddrinfo(udp_entry->addr, udp_entry->port, &hints, &servinfo)) != 0) {\r
+            LOG(log_error, logtype_afpd, "fce_init_udp: getaddrinfo(%s:%s): %s",\r
+                udp_entry->addr, udp_entry->port, gai_strerror(rv));\r
+            continue;\r
         }\r
 \r
-        /* resolve IP to network address */\r
-        if (inet_aton( udp_entry->ip, &udp_entry->addr.sin_addr ) ==0 )\r
-        {\r
-            /* Hmm, failed try to resolve host */\r
-            struct hostent *hp = gethostbyname( udp_entry->ip );\r
-            if (hp == NULL)\r
-            {\r
-                LOG(log_error, logtype_afpd, "Cannot resolve host name for fce UDP connection: %s (errno %d)", udp_entry->ip, errno  );\r
+        /* loop through all the results and make a socket */\r
+        for (p = servinfo; p != NULL; p = p->ai_next) {\r
+            if ((udp_entry->sock = socket(p->ai_family, p->ai_socktype, p->ai_protocol)) == -1) {\r
+                LOG(log_error, logtype_afpd, "fce_init_udp: socket(%s:%s): %s",\r
+                    udp_entry->addr, udp_entry->port, strerror(errno));\r
                 continue;\r
             }\r
-            memcpy( &udp_entry->addr.sin_addr, &hp->h_addr, sizeof(udp_entry->addr.sin_addr) );\r
+            break;\r
         }\r
 \r
-        /* Create UDP socket */\r
-        udp_entry->sock = socket( AF_INET, SOCK_DGRAM, 0 );\r
-        if (udp_entry->sock == -1)\r
-        {\r
-            LOG(log_error, logtype_afpd, "Cannot create socket for fce UDP connection: errno %d", errno  );\r
-            continue;\r
+        if (p == NULL) {\r
+            LOG(log_error, logtype_afpd, "fce_init_udp: no socket for %s:%s",\r
+                udp_entry->addr, udp_entry->port);\r
         }\r
-\r
-        /* Set socket address params */\r
-        udp_entry->addr.sin_family = AF_INET;\r
-        udp_entry->addr.sin_port = htons(udp_entry->port);\r
+        memcpy(&udp_entry->addrinfo, p, sizeof(struct addrinfo));\r
+        freeaddrinfo(servinfo);\r
     }\r
-    udp_initialized = FCE_TRUE;\r
 \r
+    udp_initialized = FCE_TRUE;\r
 }\r
+\r
 void fce_cleanup()\r
 {\r
     if (udp_initialized == FCE_FALSE )\r
@@ -218,13 +220,23 @@ static void send_fce_event( char *path, int mode )
             /* Okay, we have a running socket again, send server that we had a problem on our side*/\r
             data_len = build_fce_packet( &packet, "", FCE_CONN_BROKEN, 0 );\r
 \r
-            sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+            sendto(udp_entry->sock,\r
+                   data,\r
+                   data_len,\r
+                   0,\r
+                   udp_entry->addrinfo.ai_addr,\r
+                   udp_entry->addrinfo.ai_addrlen);\r
 \r
             /* Rebuild our original data packet */\r
             data_len = build_fce_packet( &packet, path, mode, event_id );\r
         }\r
 \r
-        sent_data =  sendto( udp_entry->sock, data, data_len, 0, &udp_entry->addr, sizeof(udp_entry->addr) );\r
+        sent_data = sendto(udp_entry->sock,\r
+                           data,\r
+                           data_len,\r
+                           0,\r
+                           udp_entry->addrinfo.ai_addr,\r
+                           udp_entry->addrinfo.ai_addrlen);\r
 \r
         /* Problems ? */\r
         if (sent_data != data_len)\r
@@ -240,21 +252,20 @@ static void send_fce_event( char *path, int mode )
     }\r
 }\r
 \r
-static int add_udp_socket( char *target_ip, int target_port )\r
+static int add_udp_socket(const char *target_ip, const char *target_port )\r
 {\r
-    if (target_port == 0)\r
-        target_port = FCE_DEFAULT_PORT;\r
+    if (target_port == NULL)\r
+        target_port = FCE_DEFAULT_PORT_STRING;\r
 \r
-    if (udp_sockets >= FCE_MAX_UDP_SOCKS)\r
-    {\r
+    if (udp_sockets >= FCE_MAX_UDP_SOCKS) {\r
         LOG(log_error, logtype_afpd, "Too many file change api UDP connections (max %d allowed)", FCE_MAX_UDP_SOCKS );\r
         return AFPERR_PARAM;\r
     }\r
 \r
-    strncpy( udp_socket_list[udp_sockets].ip, target_ip, FCE_MAX_IP_LEN - 1);\r
-    udp_socket_list[udp_sockets].port = target_port;\r
+    udp_socket_list[udp_sockets].addr = strdup(target_ip);\r
+    udp_socket_list[udp_sockets].port = strdup(target_port);\r
     udp_socket_list[udp_sockets].sock = -1;\r
-    memset( &udp_socket_list[udp_sockets].addr, 0, sizeof(struct sockaddr_in) );\r
+    memset( &udp_socket_list[udp_sockets].addrinfo, 0, sizeof(struct sockaddr_in) );\r
     udp_socket_list[udp_sockets].next_try_on_error = 0;\r
 \r
     udp_sockets++;\r
@@ -431,19 +442,19 @@ int fce_register_file_modification( struct ofork *ofork )
  * Extern connect to afpd parameter, can be called multiple times for multiple listeners (up to MAX_UDP_SOCKS times)\r
  *\r
  * */\r
-int fce_add_udp_socket( char *target )\r
+int fce_add_udp_socket(const char *target)\r
 {\r
-       int port = FCE_DEFAULT_PORT;\r
+       const char *port = FCE_DEFAULT_PORT_STRING;\r
        char target_ip[256] = {""};\r
 \r
-       strncpy( target_ip, target, sizeof(target_ip) -1);\r
+       strncpy(target_ip, target, sizeof(target_ip) -1);\r
+\r
        char *port_delim = strchr( target_ip, ':' );\r
-       if (port_delim)\r
-       {\r
+       if (port_delim) {\r
                *port_delim = 0;\r
-               port = atoi( port_delim + 1);\r
+               port = port_delim + 1;\r
        }\r
-       return add_udp_socket( target_ip, port );\r
+       return add_udp_socket(target_ip, port);\r
 }\r
 \r
 \r

diff --git a/etc/afpd/fce_api_internal.h b/etc/afpd/fce_api_internal.h
index bf6cea3e83be0223661e7d8a6a0a95fb880ca2ce..9f2049fd1e0eeff5fe68a25e4050ce2974eab1a2 100755 (executable)
--- a/etc/afpd/fce_api_internal.h
+++ b/etc/afpd/fce_api_internal.h
@@ -22,7 +22,6 @@
 \r
 #define FCE_MAX_PATH_LEN 1024\r
 #define FCE_MAX_UDP_SOCKS 5     /* Allow a maximum of udp listeners for file change events */\r
-#define FCE_MAX_IP_LEN 255      /* Man len of listener name */\r
 #define FCE_SOCKET_RETRY_DELAY_S 600 /* Pause this time in s after socket was broken */\r
 #define FCE_PACKET_VERSION  1\r
 #define FCE_HISTORY_LEN 10  /* This is used to coalesce events */\r
@@ -31,9 +30,9 @@
 struct udp_entry\r
 {\r
     int sock;\r
-    char ip[FCE_MAX_IP_LEN];\r
-    int port;\r
-    struct sockaddr_in addr;\r
+    char *addr;\r
+    char *port;\r
+    struct addrinfo addrinfo;\r
     time_t next_try_on_error;      /* In case of error set next timestamp to retry */\r
 };\r
 \r

diff --git a/include/atalk/fce_api.h b/include/atalk/fce_api.h
index a4609332ef18d71868b7d7165e07822977b8b3e1..0e2f572dd299e5afdaf9a9c32c3c57adac5b700d 100755 (executable)
--- a/include/atalk/fce_api.h
+++ b/include/atalk/fce_api.h
@@ -18,7 +18,7 @@ int fce_register_new_dir( struct path *path );
 int fce_register_new_file( struct path *path );
 int fce_register_file_modification( struct ofork *ofork );
 
-int fce_add_udp_socket( char *target );  // IP or IP:Port
+int fce_add_udp_socket(const char *target );  // IP or IP:Port
 int fce_set_coalesce( char *coalesce_opt ); // all|delete|create
 
 #define FCE_DEFAULT_PORT 12250