From 3cdb0a5420fea0bd47459b0a4d8c4b428ba9bf79 Mon Sep 17 00:00:00 2001
From: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date: Fri, 25 Apr 2014 04:32:09 -0400
Subject: [PATCH] Change argument names for tcp-bsd

---
 agent/agent.c    | 8 ++++----
 socket/tcp-bsd.c | 4 ++--
 socket/tcp-bsd.h | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/agent/agent.c b/agent/agent.c
index b1add43..497467e 100644
--- a/agent/agent.c
+++ b/agent/agent.c
@@ -2017,8 +2017,8 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agent,
         agent->proxy_ip != NULL &&
         nice_address_set_from_string (&proxy_server, agent->proxy_ip)) {
       nice_address_set_port (&proxy_server, agent->proxy_port);
-      nicesock = nice_tcp_bsd_socket_new (agent->main_context, &proxy_server,
-          &local_address, reliable_tcp);
+      nicesock = nice_tcp_bsd_socket_new (agent->main_context, &local_address,
+          &proxy_server, reliable_tcp);
 
       if (nicesock) {
         _priv_set_socket_tos (agent, nicesock, stream->tos);
@@ -2036,8 +2036,8 @@ priv_add_new_candidate_discovery_turn (NiceAgent *agent,
 
     }
     if (nicesock == NULL) {
-      nicesock = nice_tcp_bsd_socket_new (agent->main_context, &turn->server,
-          &local_address, reliable_tcp);
+      nicesock = nice_tcp_bsd_socket_new (agent->main_context, &local_address,
+          &turn->server, reliable_tcp);
 
       if (nicesock)
         _priv_set_socket_tos (agent, nicesock, stream->tos);
diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c
index 45ba714..56f7ca4 100644
--- a/socket/tcp-bsd.c
+++ b/socket/tcp-bsd.c
@@ -109,8 +109,8 @@ nice_tcp_bsd_socket_new_from_gsock (GMainContext *ctx, GSocket *gsock,
 }
 
 NiceSocket *
-nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *remote_addr,
-    NiceAddress *local_addr, gboolean reliable)
+nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *local_addr,
+    NiceAddress *remote_addr, gboolean reliable)
 {
   union {
     struct sockaddr_storage storage;
diff --git a/socket/tcp-bsd.h b/socket/tcp-bsd.h
index 6b1bb53..89566d6 100644
--- a/socket/tcp-bsd.h
+++ b/socket/tcp-bsd.h
@@ -48,7 +48,7 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *remote_addr,
 
 NiceSocket *
 nice_tcp_bsd_socket_new_from_gsock (GMainContext *ctx, GSocket *gsock,
-    NiceAddress *local_addr, NiceAddress *remote_addr, gboolean reliable);
+    NiceAddress *remote_addr, NiceAddress *local_addr, gboolean reliable);
 
 G_END_DECLS
 
-- 
2.7.4