From d0da0f7767f560a17975de52ac42d2225f3ce562 Mon Sep 17 00:00:00 2001
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
Date: Tue, 1 Mar 2016 12:06:12 -0600
Subject: [PATCH] Bug 1037618 - Part 1: Add some logging to highlight TCP
 connection failures. r=drno

MozReview-Commit-ID: 4q84yGspvyX
---
 .../nICEr/src/net/nr_socket_multi_tcp.c       | 22 +++++++++++++------
 .../nICEr/src/stun/nr_socket_buffered_stun.c  |  5 +++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c b/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c
index 7bc5757a8f3..12bbea79503 100644
--- a/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c
+++ b/media/mtransport/third_party/nICEr/src/net/nr_socket_multi_tcp.c
@@ -563,27 +563,35 @@ static void nr_tcp_multi_lsocket_readable_cb(NR_SOCKET s, int how, void *arg)
     nr_socket *newsock;
     nr_transport_addr remote_addr;
     nr_tcp_socket_ctx *tcp_sock_ctx;
-    int r;
+    int r, _status;
 
     // rearm
     NR_ASYNC_WAIT(s, NR_ASYNC_WAIT_READ, nr_tcp_multi_lsocket_readable_cb, arg);
 
     /* accept */
-    if (nr_socket_accept(sock->listen_socket, &remote_addr, &newsock))
-      return;
+    if ((r=nr_socket_accept(sock->listen_socket, &remote_addr, &newsock)))
+      ABORT(r);
 
     /* This takes ownership of newsock whether it fails or not. */
     if ((r=nr_tcp_socket_ctx_create(newsock, 1, sock->max_pending, &tcp_sock_ctx)))
-      return;
+      ABORT(r);
 
     nr_socket_buffered_set_connected_to(tcp_sock_ctx->inner, &remote_addr);
 
-    if (nr_tcp_socket_ctx_initialize(tcp_sock_ctx, &remote_addr, sock)) {
+    if ((r=nr_tcp_socket_ctx_initialize(tcp_sock_ctx, &remote_addr, sock))) {
       nr_tcp_socket_ctx_destroy(&tcp_sock_ctx);
-      return;
+      ABORT(r);
     }
 
     TAILQ_INSERT_HEAD(&sock->sockets, tcp_sock_ctx, entry);
+
+    _status=0;
+abort:
+    if (_status) {
+      r_log(LOG_ICE,LOG_WARNING,"%s:%d %s failed to accept new TCP connection: %d",__FILE__,__LINE__,__FUNCTION__,_status);
+    } else {
+      r_log(LOG_ICE,LOG_INFO,"%s:%d %s accepted new TCP connection from %s",__FILE__,__LINE__,__FUNCTION__,remote_addr.as_string);
+    }
   }
 
 static int nr_socket_multi_tcp_listen(void *obj, int backlog)
@@ -606,7 +614,7 @@ static int nr_socket_multi_tcp_listen(void *obj, int backlog)
     _status=0;
   abort:
     if (_status)
-      r_log(LOG_ICE,LOG_DEBUG,"%s:%d function %s failed with error %d",__FILE__,__LINE__,__FUNCTION__,_status);
+      r_log(LOG_ICE,LOG_WARNING,"%s:%d function %s failed with error %d",__FILE__,__LINE__,__FUNCTION__,_status);
 
     return(_status);
   }
diff --git a/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c b/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c
index 926460d02e1..15351d67814 100644
--- a/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c
+++ b/media/mtransport/third_party/nICEr/src/stun/nr_socket_buffered_stun.c
@@ -514,9 +514,10 @@ static int nr_socket_buffered_stun_write(void *obj,const void *msg, size_t len,
       if ((r=nr_socket_buffered_stun_arm_writable_cb(sock)))
         ABORT(r);
     }
-    r_log(LOG_GENERIC, LOG_INFO, "Write buffer not empty for %s  %u - %s armed (@%p)",
+    r_log(LOG_GENERIC, LOG_INFO, "Write buffer not empty for %s  %u - %s armed (@%p),%s connected",
           sock->remote_addr.as_string, (uint32_t)sock->pending,
-          already_armed ? "already" : "", &sock->pending);
+          already_armed ? "already" : "", &sock->pending,
+          sock->connected ? "" : " not");
   }
 
   *written = original_len;