* netsync module no longer IPv4-specific

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 5e98977a00e2097eac05129f2e1841f34c186045..233556a322c4d521f8ce7ac7d6de468cb3eb22cc 100644 (file)
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -147,31 +147,28 @@ static void Run( intf_thread_t *p_intf )
 #define MAX_MSG_LENGTH (2 * sizeof(int64_t))\r
 \r
     vlc_bool_t b_master = config_GetInt( p_intf, "netsync-master" );\r
-    char *psz_master = config_GetPsz( p_intf, "netsync-master-ip" );\r
-    struct sockaddr_in master_addr;\r
+    char *psz_master;\r
     char p_data[MAX_MSG_LENGTH];\r
     int i_socket;\r
 \r
-    if( !psz_master || inet_addr( psz_master ) == INADDR_NONE )\r
+    if( !b_master )\r
     {\r
-        if( !b_master )\r
+        psz_master = config_GetPsz( p_intf, "netsync-master-ip" );\r
+        if( psz_master == NULL )\r
         {\r
-            if( psz_master ) free( psz_master );\r
-            msg_Err( p_intf, "invalid master address." );\r
+            msg_Err( p_intf, "master address not specified" );\r
             return;\r
         }\r
-\r
-        if( !psz_master ) psz_master = strdup("");\r
     }\r
 \r
-    memset( &master_addr, 0, sizeof( struct sockaddr_in ) );\r
-    master_addr.sin_family = AF_INET;\r
-    master_addr.sin_port = htons( (uint16_t)NETSYNC_PORT_MASTER );\r
-    master_addr.sin_addr.s_addr = inet_addr( psz_master );\r
-    free( psz_master );\r
+    i_socket = net_OpenUDP( p_intf, NULL,\r
+                            b_master ? NETSYNC_PORT_MASTER : NETSYNC_PORT_SLAVE,\r
+                            b_master ? NULL : psz_master,\r
+                            b_master ? 0 : NETSYNC_PORT_MASTER );\r
 \r
-    i_socket = net_OpenUDP( p_intf, NULL, b_master ? NETSYNC_PORT_MASTER :\r
-                            NETSYNC_PORT_SLAVE, NULL, 0 );\r
+    if( !b_master )\r
+        free( psz_master );\r
+    \r
     if( i_socket < 0 )\r
     {\r
         msg_Err( p_intf, "failed opening UDP socket." );\r
@@ -218,7 +215,7 @@ static void Run( intf_thread_t *p_intf )
 \r
         if( b_master )\r
         {\r
-            struct sockaddr_in from;\r
+            struct sockaddr_storage from;\r
             mtime_t i_date, i_clockref, i_master_clockref;\r
             int i_struct_size, i_read, i_ret;\r
 \r
@@ -233,12 +230,10 @@ static void Run( intf_thread_t *p_intf )
             }\r
 \r
             /* We received something */\r
-            i_struct_size = sizeof(struct sockaddr_in);\r
+            i_struct_size = sizeof( from );\r
             i_read = recvfrom( i_socket, p_data, MAX_MSG_LENGTH, 0,\r
                                (struct sockaddr*)&from, &i_struct_size );\r
 \r
-            from.sin_port = htons( (uint16_t)NETSYNC_PORT_SLAVE );\r
-\r
             i_clockref = ntoh64(*(int64_t *)p_data);\r
 \r
             i_date = mdate();\r
@@ -249,11 +244,13 @@ static void Run( intf_thread_t *p_intf )
 \r
             /* Reply to the sender */\r
             sendto( i_socket, p_data, 2 * sizeof(int64_t), 0,\r
-                    (struct sockaddr *)&from, sizeof(struct sockaddr_in) );\r
+                    (struct sockaddr *)&from, i_struct_size );\r
 \r
             msg_Dbg( p_intf, "Master clockref: "I64Fd" -> "I64Fd", from %s "\r
-                     "(date: "I64Fd")", i_clockref, i_master_clockref, \r
-                     inet_ntoa(from.sin_addr), i_date );\r
+                     "(date: "I64Fd")", i_clockref, i_master_clockref,\r
+                     from.ss_family == AF_INET\r
+                     ? inet_ntoa(((struct sockaddr_in *)&from)->sin_addr)\r
+                     : "non-IPv4", i_date );\r
         }\r
         else\r
         {\r
@@ -266,9 +263,7 @@ static void Run( intf_thread_t *p_intf )
             *(int64_t *)p_data = hton64( i_clockref );\r
             i_send_date = mdate();\r
 \r
-            i_sent = sendto( i_socket, p_data, sizeof(int64_t), 0,\r
-                             (struct sockaddr *)&master_addr,\r
-                             sizeof(struct sockaddr_in) );\r
+            i_sent = send( i_socket, p_data, sizeof(int64_t), 0 );\r
             if( i_sent <= 0 )\r
             {\r
                 /* Wait a bit */\r