[TCPIP] When enumerating sockets, retrieve their state and return it

This fixes netstat not having any state when enumerating connections.
Basically, now, our netstat produces stuff like:
https://twitter.com/HeisSpiter/status/1065871999266955264

diff --git a/drivers/network/tcpip/include/tcp.h b/drivers/network/tcpip/include/tcp.h
index 20147c7..6bb8280 100644 (file)
--- a/drivers/network/tcpip/include/tcp.h
+++ b/drivers/network/tcpip/include/tcp.h
@@ -216,3 +216,5 @@ VOID CompleteBucket(PCONNECTION_ENDPOINT Connection, PTDI_BUCKET Bucket, const B
 
 void
 LibTCPDumpPcb(PVOID SocketContext);
 
 void
 LibTCPDumpPcb(PVOID SocketContext);

+
+NTSTATUS TCPGetSocketStatus(PCONNECTION_ENDPOINT Connection, PULONG State);

diff --git a/drivers/network/tcpip/tcpip/ninfo.c b/drivers/network/tcpip/tcpip/ninfo.c
index 4289476..d45b4bb 100644 (file)
--- a/drivers/network/tcpip/tcpip/ninfo.c
+++ b/drivers/network/tcpip/tcpip/ninfo.c
@@ -188,7 +188,6 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile,
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
 
 
     TI_DbgPrint(DEBUG_INFO, ("Called.\n"));
 

-    TcpRow.State = 0; /* FIXME */

     TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address;
     TcpRow.dwLocalPort = AddrFile->Port;
 
     TcpRow.dwLocalAddr = AddrFile->Address.Address.IPv4Address;
     TcpRow.dwLocalPort = AddrFile->Port;
 


@@ -215,9 +214,13 @@ TDI_STATUS InfoTdiQueryGetConnectionTcpTable(PADDRESS_FILE AddrFile,
             TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr;
             TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port);
         }
             TcpRow.dwRemoteAddr = EndPoint.Address[0].Address[0].in_addr;
             TcpRow.dwRemotePort = ntohs(EndPoint.Address[0].Address[0].sin_port);
         }

+
+        Status = TCPGetSocketStatus(AddrFile->Connection, (PULONG)&TcpRow.State);
+        ASSERT(NT_SUCCESS(Status));

     }
     else
     {
     }
     else
     {

+        TcpRow.State = 0;

         TcpRow.dwRemoteAddr = 0;
         TcpRow.dwRemotePort = 0;
     }
         TcpRow.dwRemoteAddr = 0;
         TcpRow.dwRemotePort = 0;
     }