tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- For writing sin_port, htons() must be used. 

- 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
This commit is contained in:
lpleahy 2013-02-08 21:34:26 +00:00
parent b8a86b2229
commit 9d0e28d4cf
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
AppPkg/Applications/Sockets/DataSink/DataSink.c
View File

@ -340,7 +340,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ), ntohs ( pPortIpAddress4->sin_port ),
errno )); errno ));
} }
else { else {
@ -362,7 +362,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ), ntohs ( pPortIpAddress6->sin6_port ),
errno )); errno ));
} }
@ -380,7 +380,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ))); ntohs ( pPortIpAddress4->sin_port )));
} }
else { else {
DEBUG (( DEBUG_INFO, DEBUG (( DEBUG_INFO,
@ -402,7 +402,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ))); ntohs ( pPortIpAddress6->sin6_port )));
} }
} }
else { else {
@ -414,7 +414,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ), ntohs ( pPortIpAddress4->sin_port ),
errno )); errno ));
} }
else { else {
@ -437,7 +437,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ), ntohs ( pPortIpAddress6->sin6_port ),
errno )); errno ));
} }
} }
@ -484,7 +484,7 @@ SocketPoll (
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pRemoteAddress4->sin_port )); ntohs ( pRemoteAddress4->sin_port ));
} }
else { else {
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", 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",
@ -504,7 +504,7 @@ SocketPoll (
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pRemoteAddress6->sin6_port )); ntohs ( pRemoteAddress6->sin6_port ));
} }
// //
@ -522,7 +522,7 @@ SocketPoll (
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pRemoteAddress4->sin_port ))); ntohs ( pRemoteAddress4->sin_port )));
} }
else { else {
DEBUG (( DEBUG_INFO, DEBUG (( DEBUG_INFO,
@ -544,7 +544,7 @@ SocketPoll (
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pRemoteAddress6->sin6_port ))); ntohs ( pRemoteAddress6->sin6_port )));
} }
} }
else { else {
@ -570,7 +570,7 @@ SocketPoll (
( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pRemoteAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pRemoteAddress4->sin_port )); ntohs ( pRemoteAddress4->sin_port ));
} }
else { else {
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", 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",
@ -590,7 +590,7 @@ SocketPoll (
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pRemoteAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pRemoteAddress6->sin6_port )); ntohs ( pRemoteAddress6->sin6_port ));
} }
// //
@ -625,7 +625,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ))); ntohs ( pPortIpAddress4->sin_port )));
} }
else { else {
DEBUG (( DEBUG_INFO, DEBUG (( DEBUG_INFO,
@ -648,7 +648,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ))); ntohs ( pPortIpAddress6->sin6_port )));
} }
// //
@ -677,7 +677,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ), ntohs ( pPortIpAddress4->sin_port ),
errno )); errno ));
} }
else { else {
@ -699,7 +699,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ), ntohs ( pPortIpAddress6->sin6_port ),
errno )); errno ));
} }
CloseStatus = close ( PollFd[ Index ].fd ); CloseStatus = close ( PollFd[ Index ].fd );
@ -713,7 +713,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ))); ntohs ( pPortIpAddress4->sin_port )));
} }
else { else {
DEBUG (( DEBUG_INFO, DEBUG (( DEBUG_INFO,
@ -735,7 +735,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ))); ntohs ( pPortIpAddress6->sin6_port )));
} }
} }
else { else {
@ -747,7 +747,7 @@ SocketPoll (
( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 8 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 16 ) & 0xff,
( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff, ( pPortIpAddress4->sin_addr.s_addr >> 24 ) & 0xff,
htons ( pPortIpAddress4->sin_port ), ntohs ( pPortIpAddress4->sin_port ),
errno )); errno ));
} }
else { else {
@ -770,7 +770,7 @@ SocketPoll (
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 13 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 14 ],
pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ], pPortIpAddress6->sin6_addr.__u6_addr.__u6_addr8[ 15 ],
htons ( pPortIpAddress6->sin6_port ), ntohs ( pPortIpAddress6->sin6_port ),
errno )); errno ));
} }
} }