Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/TcpDxe/Socket.h

Timestamp:

Apr 14, 2023 3:17:44 PM (22 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• NetworkPkg/TcpDxe/Socket.h (modified) (47 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/NetworkPkg/TcpDxe/Socket.h

@@ -25 +25 @@
 #include <Library/DpcLib.h>
 
-#define SOCK_SND_BUF        0
-#define SOCK_RCV_BUF        1
-
-#define SOCK_BUFF_LOW_WATER (2 * 1024)
-#define SOCK_RCV_BUFF_SIZE  (8 * 1024)
-#define SOCK_SND_BUFF_SIZE  (8 * 1024)
-#define SOCK_BACKLOG        5
+#define SOCK_SND_BUF  0
+#define SOCK_RCV_BUF  1
+
+#define SOCK_BUFF_LOW_WATER  (2 * 1024)
+#define SOCK_RCV_BUFF_SIZE   (8 * 1024)
+#define SOCK_SND_BUFF_SIZE   (8 * 1024)
+#define SOCK_BACKLOG         5
 
 #define PROTO_RESERVED_LEN  20
 
-#define SO_NO_MORE_DATA     0x0001
+#define SO_NO_MORE_DATA  0x0001
 
 //
@@ -62 +62 @@
 /// Socket state
 ///
-#define SO_CLOSED        0
-#define SO_LISTENING     1
-#define SO_CONNECTING    2
-#define SO_CONNECTED     3
-#define SO_DISCONNECTING 4
+#define SO_CLOSED         0
+#define SO_LISTENING      1
+#define SO_CONNECTING     2
+#define SO_CONNECTED      3
+#define SO_DISCONNECTING  4
 
 ///
@@ -101 +101 @@
 
 **/
-#define SOCK_NO_MORE_DATA(Sock)     ((Sock)->Flag |= SO_NO_MORE_DATA)
+#define SOCK_NO_MORE_DATA(Sock)  ((Sock)->Flag |= SO_NO_MORE_DATA)
 
 /**
@@ -136 +136 @@
 
 **/
-#define SOCK_IS_CONFIGURED_ACTIVE(Sock) ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)
+#define SOCK_IS_CONFIGURED_ACTIVE(Sock)  ((Sock)->ConfigureState == SO_CONFIGURED_ACTIVE)
 
 /**
@@ -147 +147 @@
 
 **/
-#define SOCK_IS_CONNECTED_PASSIVE(Sock) ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)
+#define SOCK_IS_CONNECTED_PASSIVE(Sock)  ((Sock)->ConfigureState == SO_CONFIGURED_PASSIVE)
 
 /**
@@ -169 +169 @@
 
 **/
-#define SOCK_IS_CLOSED(Sock)          ((Sock)->State == SO_CLOSED)
+#define SOCK_IS_CLOSED(Sock)  ((Sock)->State == SO_CLOSED)
 
 /**
@@ -180 +180 @@
 
 **/
-#define SOCK_IS_LISTENING(Sock)       ((Sock)->State == SO_LISTENING)
+#define SOCK_IS_LISTENING(Sock)  ((Sock)->State == SO_LISTENING)
 
 /**
@@ -191 +191 @@
 
 **/
-#define SOCK_IS_CONNECTING(Sock)      ((Sock)->State == SO_CONNECTING)
+#define SOCK_IS_CONNECTING(Sock)  ((Sock)->State == SO_CONNECTING)
 
 /**
@@ -202 +202 @@
 
 **/
-#define SOCK_IS_CONNECTED(Sock)       ((Sock)->State == SO_CONNECTED)
+#define SOCK_IS_CONNECTED(Sock)  ((Sock)->State == SO_CONNECTED)
 
 /**
@@ -213 +213 @@
 
 **/
-#define SOCK_IS_DISCONNECTING(Sock)   ((Sock)->State == SO_DISCONNECTING)
+#define SOCK_IS_DISCONNECTING(Sock)  ((Sock)->State == SO_DISCONNECTING)
 
 /**
@@ -224 +224 @@
 
 **/
-#define SOCK_IS_NO_MORE_DATA(Sock)    (0 != ((Sock)->Flag & SO_NO_MORE_DATA))
+#define SOCK_IS_NO_MORE_DATA(Sock)  (0 != ((Sock)->Flag & SO_NO_MORE_DATA))
 
 /**
@@ -243 +243 @@
 
 **/
-#define GET_RCV_BUFFSIZE(Sock)        ((Sock)->RcvBuffer.HighWater)
+#define GET_RCV_BUFFSIZE(Sock)  ((Sock)->RcvBuffer.HighWater)
 
 /**
@@ -253 +253 @@
 
 **/
-#define GET_RCV_DATASIZE(Sock)        (((Sock)->RcvBuffer.DataQueue)->BufSize)
+#define GET_RCV_DATASIZE(Sock)  (((Sock)->RcvBuffer.DataQueue)->BufSize)
 
 /**
@@ -272 +272 @@
 
 **/
-#define GET_SND_BUFFSIZE(Sock)        ((Sock)->SndBuffer.HighWater)
+#define GET_SND_BUFFSIZE(Sock)  ((Sock)->SndBuffer.HighWater)
 
 /**
@@ -282 +282 @@
 
 **/
-#define GET_SND_DATASIZE(Sock)        (((Sock)->SndBuffer.DataQueue)->BufSize)
+#define GET_SND_DATASIZE(Sock)  (((Sock)->SndBuffer.DataQueue)->BufSize)
 
 /**
@@ -291 +291 @@
 
 **/
-#define SET_BACKLOG(Sock, Value)      ((Sock)->BackLog = (Value))
+#define SET_BACKLOG(Sock, Value)  ((Sock)->BackLog = (Value))
 
 /**
@@ -301 +301 @@
 
 **/
-#define GET_BACKLOG(Sock)             ((Sock)->BackLog)
+#define GET_BACKLOG(Sock)  ((Sock)->BackLog)
 
 /**
@@ -310 +310 @@
 
 **/
-#define SOCK_ERROR(Sock, Error)       ((Sock)->SockError = (Error))
-
-#define SOCK_SIGNATURE                SIGNATURE_32 ('S', 'O', 'C', 'K')
-
-#define SOCK_FROM_THIS(a)             CR ((a), SOCKET, NetProtocol, SOCK_SIGNATURE)
-
-#define SOCK_FROM_TOKEN(Token)        (((SOCK_TOKEN *) (Token))->Sock)
+#define SOCK_ERROR(Sock, Error)  ((Sock)->SockError = (Error))
+
+#define SOCK_SIGNATURE  SIGNATURE_32 ('S', 'O', 'C', 'K')
+
+#define SOCK_FROM_THIS(a)  CR ((a), SOCKET, NetProtocol, SOCK_SIGNATURE)
+
+#define SOCK_FROM_TOKEN(Token)  (((SOCK_TOKEN *) (Token))->Sock)
 
 #define PROTO_TOKEN_FORM_SOCK(SockToken, Type)  ((Type *) (((SOCK_TOKEN *) (SockToken))->Token))
@@ -326 +326 @@
 ///
 typedef struct _SOCK_COMPLETION_TOKEN {
-  EFI_EVENT   Event;            ///< The event to be issued
-  EFI_STATUS  Status;           ///< The status to be issued
+  EFI_EVENT     Event;          ///< The event to be issued
+  EFI_STATUS    Status;         ///< The status to be issued
 } SOCK_COMPLETION_TOKEN;
 
 typedef union {
-  VOID  *RxData;
-  VOID  *TxData;
+  VOID    *RxData;
+  VOID    *TxData;
 } SOCK_IO_DATA;
 
@@ -339 +339 @@
 ///
 typedef struct _SOCK_IO_TOKEN {
-  SOCK_COMPLETION_TOKEN Token;
-  SOCK_IO_DATA          Packet;
+  SOCK_COMPLETION_TOKEN    Token;
+  SOCK_IO_DATA             Packet;
 } SOCK_IO_TOKEN;
 
@@ -355 +355 @@
 ///
 typedef struct _SOCK_BUFFER {
-  UINT32        HighWater;  ///< The buffersize upper limit of sock_buffer
-  UINT32        LowWater;   ///< The low water mark of sock_buffer
-  NET_BUF_QUEUE *DataQueue; ///< The queue to buffer data
+  UINT32           HighWater;  ///< The buffersize upper limit of sock_buffer
+  UINT32           LowWater;   ///< The low water mark of sock_buffer
+  NET_BUF_QUEUE    *DataQueue; ///< The queue to buffer data
 } SOCK_BUFFER;
 
@@ -375 +375 @@
 EFI_STATUS
 (*SOCK_PROTO_HANDLER) (
-  IN SOCKET       *Socket,
-  IN UINT8        Request,
-  IN VOID         *RequestData
+  IN SOCKET  *Socket,
+  IN UINT8   Request,
+  IN VOID    *RequestData
   );
 
@@ -415 +415 @@
 ///
 typedef struct _SOCK_INIT_DATA {
-  SOCK_TYPE              Type;
-  UINT8                  State;
-
-  SOCKET                 *Parent;        ///< The parent of this socket
-  UINT32                 BackLog;        ///< The connection limit for listening socket
-  UINT32                 SndBufferSize;  ///< The high water mark of send buffer
-  UINT32                 RcvBufferSize;  ///< The high water mark of receive buffer
-  UINT8                  IpVersion;
-  VOID                   *Protocol;      ///< The pointer to protocol function template
+  SOCK_TYPE                Type;
+  UINT8                    State;
+
+  SOCKET                   *Parent;       ///< The parent of this socket
+  UINT32                   BackLog;       ///< The connection limit for listening socket
+  UINT32                   SndBufferSize; ///< The high water mark of send buffer
+  UINT32                   RcvBufferSize; ///< The high water mark of receive buffer
+  UINT8                    IpVersion;
+  VOID                     *Protocol;    ///< The pointer to protocol function template
                                          ///< wanted to install on socket
 
@@ -429 +429 @@
   // Callbacks after socket is created and before socket is to be destroyed.
   //
-  SOCK_CREATE_CALLBACK   CreateCallback;  ///< Callback after created
-  SOCK_DESTROY_CALLBACK  DestroyCallback; ///< Callback before destroyed
-  VOID                   *Context;        ///< The context of the callback
+  SOCK_CREATE_CALLBACK     CreateCallback;  ///< Callback after created
+  SOCK_DESTROY_CALLBACK    DestroyCallback; ///< Callback before destroyed
+  VOID                     *Context;        ///< The context of the callback
 
   //
   // Opaque protocol data.
   //
-  VOID                   *ProtoData;
-  UINT32                 DataSize;
-
-  SOCK_PROTO_HANDLER     ProtoHandler;    ///< The handler of protocol for socket request
-
-  EFI_HANDLE             DriverBinding;   ///< The driver binding handle
+  VOID                     *ProtoData;
+  UINT32                   DataSize;
+
+  SOCK_PROTO_HANDLER       ProtoHandler;  ///< The handler of protocol for socket request
+
+  EFI_HANDLE               DriverBinding; ///< The driver binding handle
 } SOCK_INIT_DATA;
 
@@ -448 +448 @@
 ///
 typedef union _NET_PROTOCOL {
-  EFI_TCP4_PROTOCOL      Tcp4Protocol;    ///< Tcp4 protocol
-  EFI_TCP6_PROTOCOL      Tcp6Protocol;    ///< Tcp6 protocol
+  EFI_TCP4_PROTOCOL    Tcp4Protocol;      ///< Tcp4 protocol
+  EFI_TCP6_PROTOCOL    Tcp6Protocol;      ///< Tcp6 protocol
 } NET_PROTOCOL;
 ///
@@ -458 +458 @@
   // Socket description information
   //
-  UINT32                    Signature;      ///< Signature of the socket
-  EFI_HANDLE                SockHandle;     ///< The virtual handle of the socket
-  EFI_HANDLE                DriverBinding;  ///< Socket's driver binding protocol
-  EFI_DEVICE_PATH_PROTOCOL  *ParentDevicePath;
-  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  LIST_ENTRY                Link;
-  UINT8                     ConfigureState;
-  SOCK_TYPE                 Type;
-  UINT8                     State;
-  UINT16                    Flag;
-  EFI_LOCK                  Lock;           ///< The lock of socket
-  SOCK_BUFFER               SndBuffer;      ///< Send buffer of application's data
-  SOCK_BUFFER               RcvBuffer;      ///< Receive buffer of received data
-  EFI_STATUS                SockError;      ///< The error returned by low layer protocol
-  BOOLEAN                   InDestroy;
+  UINT32                      Signature;     ///< Signature of the socket
+  EFI_HANDLE                  SockHandle;    ///< The virtual handle of the socket
+  EFI_HANDLE                  DriverBinding; ///< Socket's driver binding protocol
+  EFI_DEVICE_PATH_PROTOCOL    *ParentDevicePath;
+  EFI_DEVICE_PATH_PROTOCOL    *DevicePath;
+  LIST_ENTRY                  Link;
+  UINT8                       ConfigureState;
+  SOCK_TYPE                   Type;
+  UINT8                       State;
+  UINT16                      Flag;
+  EFI_LOCK                    Lock;         ///< The lock of socket
+  SOCK_BUFFER                 SndBuffer;    ///< Send buffer of application's data
+  SOCK_BUFFER                 RcvBuffer;    ///< Receive buffer of received data
+  EFI_STATUS                  SockError;    ///< The error returned by low layer protocol
+  BOOLEAN                     InDestroy;
 
   //
   // Fields used to manage the connection request
   //
-  UINT32                    BackLog;        ///< the limit of connection to this socket
-  UINT32                    ConnCnt;        ///< the current count of connections to it
-  SOCKET                    *Parent;        ///< listening parent that accept the connection
-  LIST_ENTRY                ConnectionList; ///< the connections maintained by this socket
+  UINT32                      BackLog;        ///< the limit of connection to this socket
+  UINT32                      ConnCnt;        ///< the current count of connections to it
+  SOCKET                      *Parent;        ///< listening parent that accept the connection
+  LIST_ENTRY                  ConnectionList; ///< the connections maintained by this socket
   //
   // The queue to buffer application's asynchronous token
   //
-  LIST_ENTRY                ListenTokenList;
-  LIST_ENTRY                RcvTokenList;
-  LIST_ENTRY                SndTokenList;
-  LIST_ENTRY                ProcessingSndTokenList;
-
-  SOCK_COMPLETION_TOKEN     *ConnectionToken; ///< app's token to signal if connected
-  SOCK_COMPLETION_TOKEN     *CloseToken;      ///< app's token to signal if closed
+  LIST_ENTRY                  ListenTokenList;
+  LIST_ENTRY                  RcvTokenList;
+  LIST_ENTRY                  SndTokenList;
+  LIST_ENTRY                  ProcessingSndTokenList;
+
+  SOCK_COMPLETION_TOKEN       *ConnectionToken; ///< app's token to signal if connected
+  SOCK_COMPLETION_TOKEN       *CloseToken;      ///< app's token to signal if closed
   //
   // Interface for low level protocol
   //
-  SOCK_PROTO_HANDLER        ProtoHandler;     ///< The request handler of protocol
-  UINT8                     ProtoReserved[PROTO_RESERVED_LEN];  ///< Data fields reserved for protocol
-  UINT8                     IpVersion;
-  NET_PROTOCOL              NetProtocol;                        ///< TCP4 or TCP6 protocol socket used
+  SOCK_PROTO_HANDLER          ProtoHandler;                      ///< The request handler of protocol
+  UINT8                       ProtoReserved[PROTO_RESERVED_LEN]; ///< Data fields reserved for protocol
+  UINT8                       IpVersion;
+  NET_PROTOCOL                NetProtocol;                      ///< TCP4 or TCP6 protocol socket used
   //
   // Callbacks after socket is created and before socket is to be destroyed.
   //
-  SOCK_CREATE_CALLBACK      CreateCallback;   ///< Callback after created
-  SOCK_DESTROY_CALLBACK     DestroyCallback;  ///< Callback before destroyed
-  VOID                      *Context;         ///< The context of the callback
+  SOCK_CREATE_CALLBACK        CreateCallback;  ///< Callback after created
+  SOCK_DESTROY_CALLBACK       DestroyCallback; ///< Callback before destroyed
+  VOID                        *Context;        ///< The context of the callback
 };
 
@@ -510 +510 @@
 ///
 typedef struct _SOCK_TOKEN {
-  LIST_ENTRY            TokenList;      ///< The entry to add in the token list
-  SOCK_COMPLETION_TOKEN *Token;         ///< The application's token
-  UINT32                RemainDataLen;  ///< Unprocessed data length
-  SOCKET                *Sock;          ///< The pointer to the socket this token
-                                        ///< belongs to
+  LIST_ENTRY               TokenList;     ///< The entry to add in the token list
+  SOCK_COMPLETION_TOKEN    *Token;        ///< The application's token
+  UINT32                   RemainDataLen; ///< Unprocessed data length
+  SOCKET                   *Sock;         ///< The pointer to the socket this token
+                                          ///< belongs to
 } SOCK_TOKEN;
 
@@ -521 +521 @@
 ///
 typedef struct _TCP_RSV_DATA {
-  UINT32 UrgLen;
+  UINT32    UrgLen;
 } TCP_RSV_DATA;
 
@@ -537 +537 @@
 VOID
 SockSetState (
-  IN OUT SOCKET     *Sock,
-  IN     UINT8      State
+  IN OUT SOCKET  *Sock,
+  IN     UINT8   State
   );
 
@@ -551 +551 @@
 SOCKET *
 SockClone (
-  IN SOCKET *Sock
+  IN SOCKET  *Sock
   );
 
@@ -567 +567 @@
 VOID
 SockConnEstablished (
-  IN OUT SOCKET *Sock
+  IN OUT SOCKET  *Sock
   );
 
@@ -582 +582 @@
 VOID
 SockConnClosed (
-  IN OUT SOCKET *Sock
+  IN OUT SOCKET  *Sock
   );
 
@@ -597 +597 @@
 VOID
 SockDataSent (
-  IN OUT SOCKET     *Sock,
-  IN     UINT32     Count
+  IN OUT SOCKET  *Sock,
+  IN     UINT32  Count
   );
 
@@ -616 +616 @@
 UINT32
 SockGetDataToSend (
-  IN  SOCKET      *Sock,
-  IN  UINT32      Offset,
-  IN  UINT32      Len,
-  OUT UINT8       *Dest
+  IN  SOCKET  *Sock,
+  IN  UINT32  Offset,
+  IN  UINT32  Len,
+  OUT UINT8   *Dest
   );
 
@@ -635 +635 @@
 VOID
 SockDataRcvd (
-  IN OUT SOCKET    *Sock,
-  IN OUT NET_BUF   *NetBuffer,
-  IN     UINT32    UrgLen
+  IN OUT SOCKET   *Sock,
+  IN OUT NET_BUF  *NetBuffer,
+  IN     UINT32   UrgLen
   );
 
@@ -668 +668 @@
 VOID
 SockNoMoreData (
-  IN OUT SOCKET *Sock
+  IN OUT SOCKET  *Sock
   );
 
@@ -687 +687 @@
 SOCKET *
 SockCreateChild (
-  IN SOCK_INIT_DATA *SockInitData
+  IN SOCK_INIT_DATA  *SockInitData
   );
 
@@ -701 +701 @@
 EFI_STATUS
 SockDestroyChild (
-  IN OUT SOCKET *Sock
+  IN OUT SOCKET  *Sock
   );
 
@@ -717 +717 @@
 EFI_STATUS
 SockConfigure (
-  IN SOCKET *Sock,
-  IN VOID   *ConfigData
+  IN SOCKET  *Sock,
+  IN VOID    *ConfigData
   );
 
@@ -741 +741 @@
 EFI_STATUS
 SockConnect (
-  IN SOCKET *Sock,
-  IN VOID   *Token
+  IN SOCKET  *Sock,
+  IN VOID    *Token
   );
 
@@ -766 +766 @@
 EFI_STATUS
 SockAccept (
-  IN SOCKET *Sock,
-  IN VOID   *Token
+  IN SOCKET  *Sock,
+  IN VOID    *Token
   );
 
@@ -790 +790 @@
 EFI_STATUS
 SockSend (
-  IN SOCKET *Sock,
-  IN VOID   *Token
+  IN SOCKET  *Sock,
+  IN VOID    *Token
   );
 
@@ -815 +815 @@
 EFI_STATUS
 SockRcv (
-  IN SOCKET *Sock,
-  IN VOID   *Token
+  IN SOCKET  *Sock,
+  IN VOID    *Token
   );
 
@@ -830 +830 @@
 EFI_STATUS
 SockFlush (
-  IN OUT SOCKET *Sock
+  IN OUT SOCKET  *Sock
   );
 
@@ -854 +854 @@
 EFI_STATUS
 SockClose (
-  IN OUT SOCKET  *Sock,
-  IN     VOID    *Token,
-  IN     BOOLEAN OnAbort
+  IN OUT SOCKET   *Sock,
+  IN     VOID     *Token,
+  IN     BOOLEAN  OnAbort
   );
 
@@ -890 +890 @@
 EFI_STATUS
 SockGetMode (
-  IN     SOCKET *Sock,
-  IN OUT VOID   *Mode
+  IN     SOCKET  *Sock,
+  IN OUT VOID    *Mode
   );
 
@@ -911 +911 @@
 EFI_STATUS
 SockRoute (
-  IN SOCKET    *Sock,
-  IN VOID      *RouteInfo
+  IN SOCKET  *Sock,
+  IN VOID    *RouteInfo
   );