diff options
author | Jakub Adam <jakub.adam@ktknet.cz> | 2014-04-24 12:38:56 +0200 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.com> | 2014-05-17 00:22:36 -0400 |
commit | 2f319ad9876287c0ea1c14b4e118e7aa5b206801 (patch) | |
tree | 0f6bfe1a0942500d6e162cf57a8252a7ac69f08c /socket | |
parent | 6344efa8f2e21f29bbe2be1170967643169a0122 (diff) | |
download | libnice-2f319ad9876287c0ea1c14b4e118e7aa5b206801.tar.gz |
nice_tcp_bsd_socket_new: rename addr -> remote_addr
Diffstat (limited to 'socket')
-rw-r--r-- | socket/tcp-bsd.c | 8 | ||||
-rw-r--r-- | socket/tcp-bsd.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c index 83c962f..fac2419 100644 --- a/socket/tcp-bsd.c +++ b/socket/tcp-bsd.c @@ -109,7 +109,7 @@ nice_tcp_bsd_socket_new_from_gsock (GMainContext *ctx, GSocket *gsock, } NiceSocket * -nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr, gboolean reliable) +nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *remote_addr, gboolean reliable) { union { struct sockaddr_storage storage; @@ -122,12 +122,12 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr, gboolean reliable GSocketAddress *gaddr; NiceAddress local_addr; - if (addr == NULL) { + if (remote_addr == NULL) { /* We can't connect a tcp socket with no destination address */ return NULL; } - nice_address_copy_to_sockaddr (addr, &name.addr); + nice_address_copy_to_sockaddr (remote_addr, &name.addr); if (name.storage.ss_family == AF_UNSPEC || name.storage.ss_family == AF_INET) { gsock = g_socket_new (G_SOCKET_FAMILY_IPV4, G_SOCKET_TYPE_STREAM, @@ -183,7 +183,7 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr, gboolean reliable nice_address_set_from_sockaddr (&local_addr, &name.addr); - sock = nice_tcp_bsd_socket_new_from_gsock (ctx, gsock, &local_addr, addr, + sock = nice_tcp_bsd_socket_new_from_gsock (ctx, gsock, &local_addr, remote_addr, reliable); g_object_unref (gsock); diff --git a/socket/tcp-bsd.h b/socket/tcp-bsd.h index 21ffc09..f206c9a 100644 --- a/socket/tcp-bsd.h +++ b/socket/tcp-bsd.h @@ -43,7 +43,7 @@ G_BEGIN_DECLS NiceSocket * -nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *addr, gboolean reliable); +nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *remote_addr, gboolean reliable); NiceSocket * nice_tcp_bsd_socket_new_from_gsock (GMainContext *ctx, GSocket *gsock, |