NOMERGE: socket: Add debug for tcp passive socketspassive-close-child

2 files changed, 20 insertions, 1 deletions

diff --git a/socket/tcp-bsd.c b/socket/tcp-bsd.c
index 49f5f25..3c40f34 100644
--- a/socket/tcp-bsd.c
+++ b/socket/tcp-bsd.c
@@ -208,6 +208,8 @@ nice_tcp_bsd_socket_new (GMainContext *ctx, NiceAddress *local_addr,
       reliable);
   g_object_unref (gsock);
 
+  nice_debug ("tcp socket %p created", sock);
+
   return sock;
 }
 
@@ -230,7 +232,11 @@ socket_close (NiceSocket *sock)
   }
 
   if (priv->passive_parent) {
+    nice_debug("tcp socket %p has passive parent connection %p, removing", sock,
+        priv->passive_parent);
     nice_tcp_passive_socket_remove_connection (priv->passive_parent, &priv->remote_addr);
+  } else {
+    nice_debug("tcp socket %p has no passive parent", sock);
   }
 
   nice_socket_free_send_queue (&priv->send_queue);
@@ -366,6 +372,8 @@ socket_send_messages (NiceSocket *sock, const NiceAddress *to,
   /* Make sure socket has not been freed: */
   g_assert (sock->priv != NULL);
 
+  nice_debug ("tcp socket %p sending", sock);
+
   for (i = 0; i < n_messages; i++) {
     const NiceOutputMessage *message = &messages[i];
     gssize len;
@@ -473,5 +481,8 @@ nice_tcp_bsd_socket_set_passive_parent (NiceSocket *sock, NiceSocket *passive_pa
 
   g_assert (priv->passive_parent == NULL);
 
+  nice_debug ("tcp socket %p has passive parent %p set",
+      sock, passive_parent);
+
   priv->passive_parent = passive_parent;
 }
diff --git a/socket/tcp-passive.c b/socket/tcp-passive.c
index d7684ad..a754163 100644
--- a/socket/tcp-passive.c
+++ b/socket/tcp-passive.c
@@ -173,6 +173,8 @@ nice_tcp_passive_socket_new (GMainContext *ctx, NiceAddress *addr)
   sock->set_writable_callback = socket_set_writable_callback;
   sock->close = socket_close;
 
+  nice_debug ("passive tcp socket %p created", sock);
+
   return sock;
 }
 
@@ -207,8 +209,13 @@ static gint socket_send_messages (NiceSocket *sock, const NiceAddress *to,
 
   if (to) {
     NiceSocket *peer_socket = g_hash_table_lookup (priv->connections, to);
-    if (peer_socket)
+    if (peer_socket) {
+      nice_debug ("Sending on passive tcp socket %p using real socket %p",
+          sock, peer_socket);
       return nice_socket_send_messages (peer_socket, to, messages, n_messages);
+    } else {
+      nice_debug ("Not sending on passive tcp socket %p because no active socket", sock);
+    }
   }
   return -1;
 }
@@ -311,6 +318,7 @@ nice_tcp_passive_socket_accept (NiceSocket *sock)
     NiceAddress *key = nice_address_dup (&remote_addr);
 
     nice_tcp_bsd_socket_set_passive_parent (new_socket, sock);
+    nice_debug("tcp socket %p parent set to %p", sock, new_socket);
 
     nice_socket_set_writable_callback (new_socket, _child_writable_cb, sock);
     g_hash_table_insert (priv->connections, key, new_socket);