Ticket #12319: 0001-updated-ntp-to-use-getaddrinfo.patch

src/preferences/time/ntp.cpp

@@ -6 +6 @@
 
 #include "ntp.h"
 
+#include <sys/types.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+
 #include <errno.h>
 #include <netdb.h>
 #include <string.h>
@@ -80 +84 @@
 };
 
 #define NTP_PORT        123
+
+// To stringify the NTP_PORT macro
+#define _XSTR_(x) _STR_(x)
+#define _STR_(x) #x
+
 #define NTP_VERSION_3   3
 
 enum ntp_leap_warnings {
@@ -114 +123 @@
 ntp_update_time(const char* hostname, const char** errorString,
     int32* errorCode)
 {
-    hostent *server = gethostbyname(hostname);
-
-    if (server == NULL) {
-    
-        *errorString = B_TRANSLATE("Could not contact server");
+    int rt;
+    struct addrinfo hints, *res;
+
+    memset(&hints, 0, sizeof(struct addrinfo));
+    hints.ai_family = AF_UNSPEC;
+    hints.ai_socktype = SOCK_DGRAM;
+    hints.ai_protocol = 0;
+
+    rt = getaddrinfo(hostname, _XSTR_(NTP_PORT), &hints, &res);
+    if (rt!=0) {
+        *errorString = B_TRANSLATE(gai_strerror(rt));
+        freeaddrinfo(res);
         return B_ENTRY_NOT_FOUND;
     }
 
@@ -137 +153 @@
 
     message.transmit_timestamp.SetTo(seconds_since_1900());
 
-    int connection = socket(AF_INET, SOCK_DGRAM, 0);
-    if (connection < 0) {
-        *errorString = B_TRANSLATE("Could not create socket");
-        *errorCode = errno;
-        return B_ERROR;
-    }
+    int connection = 0;
 
-    struct sockaddr_in address;
-    address.sin_family = AF_INET;
-    address.sin_port = htons(NTP_PORT);
-    address.sin_addr.s_addr = *(uint32 *)server->h_addr_list[0];
+    for(;res!=NULL;res=res->ai_next){
+        connection = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+        if(connection == -1) continue;
 
-    if (sendto(connection, (char *)&message, sizeof(ntp_data),
-            0, (struct sockaddr *)&address, sizeof(address)) < 0) {
-        *errorString = B_TRANSLATE("Sending request failed");
-        *errorCode = errno;
-        close(connection);
-        return B_ERROR;
+        if (sendto(connection, (char *)&message, sizeof(ntp_data), 
+            0, res->ai_addr, res->ai_addrlen) != -1) break;
+
+        close(connection);  // socket was created but "sendto" failed, so we close the socket before trying next address
+    }
+
+    if(res==NULL){  // unable to 'connect' or 'sendto' with any of the addresses returned by getaddrinfo
+        freeaddrinfo(res);
+        if(connection == -1){
+            *errorString = B_TRANSLATE("Could not create socket");
+            *errorCode = errno;
+            return B_ERROR;
+        }
+        else{
+            *errorString = B_TRANSLATE("Sending request failed");
+            *errorCode = errno;
+            return B_ERROR;
+        }
     }
 
     fd_set waitForReceived;
@@ -170 +192 @@
         *errorString = B_TRANSLATE("Waiting for answer failed");
         *errorCode = errno;
         close(connection);
+        freeaddrinfo(res);
         return B_ERROR;
     }
 
     message.transmit_timestamp.SetTo(0);
 
-    socklen_t addressSize = sizeof(address);
     if (recvfrom(connection, (char *)&message, sizeof(ntp_data), 0,
-            (sockaddr *)&address, &addressSize) < (ssize_t)sizeof(ntp_data)) {
+            res->ai_addr, &res->ai_addrlen) < (ssize_t)sizeof(ntp_data)){
         *errorString = B_TRANSLATE("Message receiving failed");
         *errorCode = errno;
         close(connection);
+        freeaddrinfo(res);
         return B_ERROR;
     }
 
@@ -188 +211 @@
 
     if (message.transmit_timestamp.Integer() == 0) {
         *errorString = B_TRANSLATE("Received invalid time");
+        freeaddrinfo(res);
         return B_BAD_VALUE;
     }
 
     time_t now = message.transmit_timestamp.Integer() - kSecondsBetween1900And1970;
     set_real_time_clock(now);
+
+    freeaddrinfo(res);
     return B_OK;
 }
+ 
+ No newline at end of file