diff options
| author | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2010-07-20 17:49:09 -0400 |
|---|---|---|
| committer | Youness Alaoui <youness.alaoui@collabora.co.uk> | 2010-07-20 17:49:09 -0400 |
| commit | 4ee70c869f162e125488dd80d1c58580524a5a22 (patch) | |
| tree | c39f454ca40082c911f81bd0eddf798fc7f933ff /socket/tcp-bsd.c | |
| parent | 358a999fd2a1f0fa283156e088f26a69b3efa8cc (diff) | |
| parent | 3b16d8b065a0c53116511ca59bd1965a44327c73 (diff) | |
| download | libnice-4ee70c869f162e125488dd80d1c58580524a5a22.tar.gz | |
Merge remote branch 'tester/misc-fixes' into nice-kakaroto
Conflicts:
agent/agent.c
Diffstat (limited to 'socket/tcp-bsd.c')
| -rw-r--r-- | socket/tcp-bsd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c index 681f1b7..8163753 100644 --- a/socket/tcp-bsd.c +++ b/socket/tcp-bsd.c @@ -91,7 +91,7 @@ nice_tcp_bsd_socket_new (NiceAgent *agent, GMainContext *ctx, NiceAddress *addr) int ret; struct sockaddr_storage name; guint name_len = sizeof (name); - NiceSocket *sock = g_slice_new0 (NiceSocket); + NiceSocket *sock; TcpPriv *priv; if (addr == NULL) { @@ -99,6 +99,8 @@ nice_tcp_bsd_socket_new (NiceAgent *agent, GMainContext *ctx, NiceAddress *addr) return NULL; } + sock = g_slice_new0 (NiceSocket); + nice_address_copy_to_sockaddr(addr, (struct sockaddr *)&name); if (sockfd == -1) { |