quic: address feedback

PR-URL: #223
Reviewed-By: Anna Henningsen <[email protected]>

Author: jasnell

src/js_udp_wrap.cc

@@ -182,7 +182,7 @@ void JSUDPWrap::EmitReceived(const FunctionCallbackInfo<Value>& args) {
     data += avail;
     len -= avail;
     wrap->listener()->OnRecv(
-        nullptr, avail, buf, reinterpret_cast<sockaddr*>(&addr), flags);
+        avail, buf, reinterpret_cast<sockaddr*>(&addr), flags);
   }
 }
 

src/node_quic_socket.cc

@@ -317,7 +317,6 @@ uv_buf_t QuicSocket::OnAlloc(size_t suggested_size) {
 }
 
 void QuicSocket::OnRecv(
-    uv_udp_t* handle,
     ssize_t nread,
     const uv_buf_t& buf_,
     const struct sockaddr* addr,
@@ -334,8 +333,7 @@ void QuicSocket::OnRecv(
   }
 
   SocketAddress local_address;
-  if (handle != nullptr)
-    SocketAddress::FromSockName(handle, &local_address);
+  udp_->GetSockName(&local_address);
 
   Receive(nread, std::move(buf), local_address, addr, flags);
 }

src/node_quic_socket.h

@@ -164,8 +164,7 @@ class QuicSocket : public AsyncWrap,
 
   // Implementation for UDPWrapListener
   uv_buf_t OnAlloc(size_t suggested_size) override;
-  void OnRecv(uv_udp_t* handle,
-              ssize_t nread,
+  void OnRecv(ssize_t nread,
               const uv_buf_t& buf,
               const sockaddr* addr,
               unsigned int flags) override;

src/node_sockaddr-inl.h

@@ -196,12 +196,6 @@ SocketAddress* SocketAddress::FromUVHandle(
   return addr;
 }
 
-SocketAddress* SocketAddress::FromSockName(
-    uv_tcp_t* handle,
-    SocketAddress* addr) {
-  return FromUVHandle<uv_tcp_t>(uv_tcp_getsockname, handle, addr);
-}
-
 SocketAddress* SocketAddress::FromSockName(
     const uv_tcp_t* handle,
     SocketAddress* addr) {
@@ -214,12 +208,6 @@ SocketAddress* SocketAddress::FromSockName(
   return FromUVHandle<uv_tcp_t>(uv_tcp_getsockname, &handle, addr);
 }
 
-SocketAddress* SocketAddress::FromSockName(
-    uv_udp_t* handle,
-    SocketAddress* addr) {
-  return FromUVHandle<uv_udp_t>(uv_udp_getsockname, handle, addr);
-}
-
 SocketAddress* SocketAddress::FromSockName(
     const uv_udp_t* handle,
     SocketAddress* addr) {
@@ -232,12 +220,6 @@ SocketAddress* SocketAddress::FromSockName(
   return FromUVHandle<uv_udp_t>(uv_udp_getsockname, &handle, addr);
 }
 
-SocketAddress* SocketAddress::FromPeerName(
-    uv_tcp_t* handle,
-    SocketAddress* addr) {
-  return FromUVHandle<uv_tcp_t>(uv_tcp_getpeername, handle, addr);
-}
-
 SocketAddress* SocketAddress::FromPeerName(
     const uv_tcp_t* handle,
     SocketAddress* addr) {
@@ -250,12 +232,6 @@ SocketAddress* SocketAddress::FromPeerName(
   return FromUVHandle<uv_tcp_t>(uv_tcp_getpeername, &handle, addr);
 }
 
-SocketAddress* SocketAddress::FromPeerName(
-    uv_udp_t* handle,
-    SocketAddress* addr) {
-  return FromUVHandle<uv_udp_t>(uv_udp_getpeername, handle, addr);
-}
-
 SocketAddress* SocketAddress::FromPeerName(
     const uv_udp_t* handle,
     SocketAddress* addr) {

src/node_sockaddr.h

@@ -68,10 +68,6 @@ class SocketAddress {
 
   inline void Update(uint8_t* data, size_t len);
 
-  inline static SocketAddress* FromSockName(
-      uv_tcp_t* handle,
-      SocketAddress* addr = nullptr);
-
   inline static SocketAddress* FromSockName(
       const uv_tcp_t* handle,
       SocketAddress* addr = nullptr);
@@ -80,10 +76,6 @@ class SocketAddress {
       const uv_tcp_t& handle,
       SocketAddress* addr = nullptr);
 
-  inline static SocketAddress* FromSockName(
-      uv_udp_t* handle,
-      SocketAddress* addr = nullptr);
-
   inline static SocketAddress* FromSockName(
       const uv_udp_t* handle,
       SocketAddress* addr = nullptr);
@@ -92,10 +84,6 @@ class SocketAddress {
       const uv_udp_t& handle,
       SocketAddress* addr = nullptr);
 
-  inline static SocketAddress* FromPeerName(
-      uv_tcp_t* handle,
-      SocketAddress* addr = nullptr);
-
   inline static SocketAddress* FromPeerName(
       const uv_tcp_t* handle,
       SocketAddress* addr = nullptr);
@@ -104,10 +92,6 @@ class SocketAddress {
       const uv_tcp_t& handle,
       SocketAddress* addr = nullptr);
 
-  inline static SocketAddress* FromPeerName(
-      uv_udp_t* handle,
-      SocketAddress* addr = nullptr);
-
   inline static SocketAddress* FromPeerName(
       const uv_udp_t* handle,
       SocketAddress* addr = nullptr);

src/udp_wrap.cc

@@ -702,11 +702,10 @@ void UDPWrap::OnRecv(uv_udp_t* handle,
                      const sockaddr* addr,
                      unsigned int flags) {
   UDPWrap* wrap = ContainerOf(&UDPWrap::handle_, handle);
-  wrap->listener()->OnRecv(handle, nread, *buf, addr, flags);
+  wrap->listener()->OnRecv(nread, *buf, addr, flags);
 }
 
-void UDPWrap::OnRecv(uv_udp_t* handle,
-                     ssize_t nread,
+void UDPWrap::OnRecv(ssize_t nread,
                      const uv_buf_t& buf_,
                      const sockaddr* addr,
                      unsigned int flags) {

src/udp_wrap.h

@@ -46,8 +46,7 @@ class UDPListener {
   // Called right after data is received from the socket, and includes
   // information about the source address. If `nread` is negative, an error
   // has occurred, and it represents a libuv error code.
-  virtual void OnRecv(uv_udp_t* handle,
-                      ssize_t nread,
+  virtual void OnRecv(ssize_t nread,
                       const uv_buf_t& buf,
                       const sockaddr* addr,
                       unsigned int flags) = 0;
@@ -156,8 +155,7 @@ class UDPWrap final : public HandleWrap,
 
   // UDPListener implementation
   uv_buf_t OnAlloc(size_t suggested_size) override;
-  void OnRecv(uv_udp_t* handle,
-              ssize_t nread,
+  void OnRecv(ssize_t nread,
               const uv_buf_t& buf,
               const sockaddr* addr,
               unsigned int flags) override;