summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7d5c23a)
- For reading sin_port, ntohs() must be used.
- EFI_TCP4_ACCESS_POINT.RemotePort is in host byte order (see
StdLib/EfiSocketLib/Tcp4.c for example).
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: lpleahy
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14126
6f19259b-4bc3-4df7-8a09-
765794883524
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pRemoteAddress4->sin_port ));\r
+ ntohs ( pRemoteAddress4->sin_port ));\r
}\r
else {\r
Print ( L"Connecting to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",\r
}\r
else {\r
Print ( L"Connecting to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pRemoteAddress6->sin6_port ));\r
+ ntohs ( pRemoteAddress6->sin6_port ));\r
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pRemoteAddress4->sin_port ));\r
+ ntohs ( pRemoteAddress4->sin_port ));\r
}\r
else {\r
Print ( L"Connected to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",\r
}\r
else {\r
Print ( L"Connected to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pRemoteAddress6->sin6_port ));\r
+ ntohs ( pRemoteAddress6->sin6_port ));\r
+Print ( L"ConnectStatus: %d, Status: %r\r\n", ConnectStatus, Status );\r
//\r
// Return the operation status\r
//\r
//\r
// Return the operation status\r
//\r
+Print ( L"SocketConnect returning Status: %r\r\n", Status );\r
DEBUG (( DEBUG_INFO,\r
"ERROR: send failed, errno: %d\r\n",\r
errno ));\r
DEBUG (( DEBUG_INFO,\r
"ERROR: send failed, errno: %d\r\n",\r
errno ));\r
+Print ( L"ERROR: send failed, errno: %d\r\n", errno );\r
// Wait for the remote network application to start\r
//\r
Status = SocketConnect ( );\r
// Wait for the remote network application to start\r
//\r
Status = SocketConnect ( );\r
+Print ( L"Status: %r\r\n", Status );\r
if ( EFI_NOT_STARTED == Status ) {\r
Status = SocketClose ( );\r
continue;\r
if ( EFI_NOT_STARTED == Status ) {\r
Status = SocketClose ( );\r
continue;\r
//\r
// Return the operation status\r
//\r
//\r
// Return the operation status\r
//\r
+Print ( L"Returning Status: %r\r\n", Status );\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
- htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
+ ntohs ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
- htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
+ ntohs ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
bTcp4Connecting = FALSE;\r
}\r
\r
bTcp4Connecting = FALSE;\r
}\r
\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[1] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 8 );\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[2] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 16 );\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[3] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 24 );\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[1] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 8 );\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[2] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 16 );\r
Tcp4ConfigData.AccessPoint.RemoteAddress.Addr[3] = (UINT8)( ((struct sockaddr_in *)&RemoteHostAddress)->sin_addr.s_addr >> 24 );\r
- Tcp4ConfigData.AccessPoint.RemotePort = ((struct sockaddr_in *)&RemoteHostAddress)->sin_port;\r
+ Tcp4ConfigData.AccessPoint.RemotePort = ntohs (((struct sockaddr_in *)&RemoteHostAddress)->sin_port);\r
Tcp4ConfigData.AccessPoint.UseDefaultAddress = TRUE;\r
Tcp4ConfigData.AccessPoint.SubnetMask.Addr[0] = 0;\r
Tcp4ConfigData.AccessPoint.SubnetMask.Addr[1] = 0;\r
Tcp4ConfigData.AccessPoint.UseDefaultAddress = TRUE;\r
Tcp4ConfigData.AccessPoint.SubnetMask.Addr[0] = 0;\r
Tcp4ConfigData.AccessPoint.SubnetMask.Addr[1] = 0;\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
pIpAddress[1],\r
pIpAddress[2],\r
pIpAddress[3],\r
- htons ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
+ ntohs ( ((struct sockaddr_in *)&RemoteHostAddress)->sin_port ));\r
} while ( 0 );\r
\r
if ( EFI_ERROR ( Status )) {\r
} while ( 0 );\r
\r
if ( EFI_ERROR ( Status )) {\r