- Rework our oskittcp signalling

[reactos.git] / reactos / drivers / network / tcpip / include / titypes.h

diff --git a/reactos/drivers/network/tcpip/include/titypes.h b/reactos/drivers/network/tcpip/include/titypes.h
index 671c21a..eaac15a 100644 (file)
--- a/reactos/drivers/network/tcpip/include/titypes.h
+++ b/reactos/drivers/network/tcpip/include/titypes.h
@@ -8,7 +8,7 @@
 #define __TITYPES_H
 
 
-#ifdef DBG
+#if DBG
 
 #define DEFINE_TAG ULONG Tag;
 #define INIT_TAG(_Object, _Tag) \
@@ -158,6 +158,7 @@ typedef struct _ADDRESS_FILE {
     USHORT Family;                        /* Address family */
     USHORT Protocol;                      /* Protocol number */
     USHORT Port;                          /* Network port (network byte order) */
+    UCHAR TTL;                            /* Time to live stored in packets sent from this address file */
     WORK_QUEUE_ITEM WorkItem;             /* Work queue item handle */
     DATAGRAM_COMPLETION_ROUTINE Complete; /* Completion routine for delete request */
     PVOID Context;                        /* Delete request context */
@@ -176,40 +177,40 @@ typedef struct _ADDRESS_FILE {
     /* Connection indication handler */
     PTDI_IND_CONNECT ConnectHandler;
     PVOID ConnectHandlerContext;
-    BOOL RegisteredConnectHandler;
+    BOOLEAN RegisteredConnectHandler;
     /* Disconnect indication handler */
     PTDI_IND_DISCONNECT DisconnectHandler;
     PVOID DisconnectHandlerContext;
-    BOOL RegisteredDisconnectHandler;
+    BOOLEAN RegisteredDisconnectHandler;
     /* Error indication handler */
     PTDI_IND_ERROR ErrorHandler;
     PVOID ErrorHandlerContext;
     PVOID ErrorHandlerOwner;
-    BOOL RegisteredErrorHandler;
+    BOOLEAN RegisteredErrorHandler;
     /* Receive indication handler */
     PTDI_IND_RECEIVE ReceiveHandler;
     PVOID ReceiveHandlerContext;
-    BOOL RegisteredReceiveHandler;
+    BOOLEAN RegisteredReceiveHandler;
     /* Receive datagram indication handler */
     PTDI_IND_RECEIVE_DATAGRAM ReceiveDatagramHandler;
     PVOID ReceiveDatagramHandlerContext;
-    BOOL RegisteredReceiveDatagramHandler;
+    BOOLEAN RegisteredReceiveDatagramHandler;
     /* Expedited receive indication handler */
     PTDI_IND_RECEIVE_EXPEDITED ExpeditedReceiveHandler;
     PVOID ExpeditedReceiveHandlerContext;
-    BOOL RegisteredExpeditedReceiveHandler;
+    BOOLEAN RegisteredExpeditedReceiveHandler;
     /* Chained receive indication handler */
     PTDI_IND_CHAINED_RECEIVE ChainedReceiveHandler;
     PVOID ChainedReceiveHandlerContext;
-    BOOL RegisteredChainedReceiveHandler;
+    BOOLEAN RegisteredChainedReceiveHandler;
     /* Chained receive datagram indication handler */
     PTDI_IND_CHAINED_RECEIVE_DATAGRAM ChainedReceiveDatagramHandler;
     PVOID ChainedReceiveDatagramHandlerContext;
-    BOOL RegisteredChainedReceiveDatagramHandler;
+    BOOLEAN RegisteredChainedReceiveDatagramHandler;
     /* Chained expedited receive indication handler */
     PTDI_IND_CHAINED_RECEIVE_EXPEDITED ChainedReceiveExpeditedHandler;
     PVOID ChainedReceiveExpeditedHandlerContext;
-    BOOL RegisteredChainedReceiveExpeditedHandler;
+    BOOLEAN RegisteredChainedReceiveExpeditedHandler;
 } ADDRESS_FILE, *PADDRESS_FILE;
 
 /* Address File Flag constants */
@@ -298,8 +299,6 @@ typedef struct _CONNECTION_ENDPOINT {
     PADDRESS_FILE AddressFile;  /* Associated address file object (NULL if none) */
     PVOID SocketContext;        /* Context for lower layer */
 
-    UINT State;                 /* Socket state W.R.T. oskit */
-
     /* Requests */
     LIST_ENTRY ConnectRequest; /* Queued connect rqueusts */
     LIST_ENTRY ListenRequest;  /* Queued listen requests */
@@ -310,7 +309,6 @@ typedef struct _CONNECTION_ENDPOINT {
     LIST_ENTRY SignalList;     /* Entry in the list of sockets waiting for
                                * notification service to the client */
     UINT    SignalState;       /* Active signals from oskit */
-    BOOLEAN Signalled;         /* Are we a member of the signal list */
 } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT;
 
 
@@ -334,7 +332,7 @@ typedef struct _TRANSPORT_CONTEXT {
         CONNECTION_CONTEXT ConnectionContext;
         HANDLE ControlChannel;
     } Handle;
-    BOOL CancelIrps;
+    BOOLEAN CancelIrps;
     KEVENT CleanupEvent;
 } TRANSPORT_CONTEXT, *PTRANSPORT_CONTEXT;