- For reading sin_port, ntohs() must be used.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: lpleahy
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@14127
6f19259b-4bc3-4df7-8a09-
765794883524
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port ),\r
+ ntohs ( pPortIpAddress4->sin_port ),\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port ),\r
+ ntohs ( pPortIpAddress6->sin6_port ),\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port )));\r
+ ntohs ( pPortIpAddress4->sin_port )));\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port )));\r
+ ntohs ( pPortIpAddress6->sin6_port )));\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port ),\r
+ ntohs ( pPortIpAddress4->sin_port ),\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port ),\r
+ ntohs ( pPortIpAddress6->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"Rejecting connection to remote system [%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x]:%d\r\n",\r
}\r
else {\r
Print ( L"Rejecting connection to remote system [%02x%02x:%02x%02x:%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
DEBUG (( DEBUG_INFO,\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\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:%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:%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
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port )));\r
+ ntohs ( pPortIpAddress4->sin_port )));\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port )));\r
+ ntohs ( pPortIpAddress6->sin6_port )));\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port ),\r
+ ntohs ( pPortIpAddress4->sin_port ),\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port ),\r
+ ntohs ( pPortIpAddress6->sin6_port ),\r
errno ));\r
}\r
CloseStatus = close ( PollFd[ Index ].fd );\r
errno ));\r
}\r
CloseStatus = close ( PollFd[ Index ].fd );\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port )));\r
+ ntohs ( pPortIpAddress4->sin_port )));\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
}\r
else {\r
DEBUG (( DEBUG_INFO,\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port )));\r
+ ntohs ( pPortIpAddress6->sin6_port )));\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,\r
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,\r
- htons ( pPortIpAddress4->sin_port ),\r
+ ntohs ( pPortIpAddress4->sin_port ),\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],\r
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],\r
- htons ( pPortIpAddress6->sin6_port ),\r
+ ntohs ( pPortIpAddress6->sin6_port ),\r