DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address

Change-Id: I76aa9df717ee5ca32859e21c7e25635b44739c75

1 files changed, 10 insertions, 1 deletions

diff --git a/services/common_time/common_time_server.cpp b/services/common_time/common_time_server.cpp
index faf1b5fc71ab..75df85e9f449 100644
--- a/services/common_time/common_time_server.cpp
+++ b/services/common_time/common_time_server.cpp
@@ -487,7 +487,16 @@ bool CommonTimeServer::setupSocket_l() {
             goto bailout;
         }
     } else
-    if (ntohl(ipv4_addr->sin_addr.s_addr) != 0xFFFFFFFF) {
+    if (ntohl(ipv4_addr->sin_addr.s_addr) == 0xFFFFFFFF) {
+        // If the master election address is the broadcast address, then enable
+        // the broadcast socket option
+        const int one = 1;
+        rc = setsockopt(mSocket, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one));
+        if (rc == -1) {
+            LOGE("Failed to enable broadcast (errno = %d)", errno);
+            goto bailout;
+        }
+    } else {
         // If the master election address is neither broadcast, nor multicast,
         // then we are misconfigured.  The config API layer should prevent this
         // from ever happening.