From: Rémi Denis-Courmont <rem@videolan.org>
Date: Mon, 5 Dec 2005 17:46:22 +0000 (+0000)
Subject: - Use net_ConnectUDP on the slave side
X-Git-Tag: 0.9.0-test0~13042
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=738e1f2690dfdc2f984c349ebb40c6074ede7c50;p=vlc

- Use net_ConnectUDP on the slave side
- Don't force a port on the slave side (that was not needed)
---

diff --git a/modules/control/netsync.c b/modules/control/netsync.c
index 16219cdfc6..f6064fa87b 100644
--- a/modules/control/netsync.c
+++ b/modules/control/netsync.c
@@ -41,8 +41,7 @@
 
 #include "network.h"
 
-#define NETSYNC_PORT_MASTER 9875
-#define NETSYNC_PORT_SLAVE  9876
+#define NETSYNC_PORT 9875
 
 /* Needed for Solaris */
 #ifndef INADDR_NONE
@@ -144,10 +143,10 @@ static void Run( intf_thread_t *p_intf )
         }
     }
 
-    i_socket = net_OpenUDP( p_intf, NULL,
-                   b_master ? NETSYNC_PORT_MASTER : NETSYNC_PORT_SLAVE,
-                   b_master ? NULL : psz_master,
-                   b_master ? 0 : NETSYNC_PORT_MASTER );
+    if( b_master )
+        i_socket = net_OpenUDP( p_intf, NULL, NETSYNC_PORT, NULL, 0 );
+    else
+        i_socket = net_ConnectUDP( p_intf, psz_master, NETSYNC_PORT, 0 );
 
     if( psz_master ) free( psz_master );