A simple but substantial change: uIP used the htons()/HTONS() macro

functions for converting between host and network byte order. These
names are the de facto standard names for this functionality because
of the original BSD TCP/IP implementation. But they cause problems for
uIP/Contiki: some platforms define these names themselves (Mac OS,
most notably), causing compilation problems for Contiki on those
platforms.

This commit changes all htons to uip_htons instead. Same goes for
htonl, ntohs, and ntohl. All-caps versions as well.
This commit is contained in:
adamdunkels 2010-10-19 18:29:03 +00:00
parent 5a46c629de
commit 5585d72c86
115 changed files with 675 additions and 675 deletions

View file

@ -30,7 +30,7 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
* $Id: shell-netstat.c,v 1.1 2009/05/10 21:02:24 adamdunkels Exp $
* $Id: shell-netstat.c,v 1.2 2010/10/19 18:29:03 adamdunkels Exp $
*/
#include <string.h>
@ -119,12 +119,12 @@ PROCESS_THREAD(shell_netstat_process, ev, data)
conn = &uip_conns[i];
snprintf(buf, BUFLEN,
"%d, %u.%u.%u.%u:%u, %s, %u, %u, %c %c",
htons(conn->lport),
uip_htons(conn->lport),
conn->ripaddr.u8[0],
conn->ripaddr.u8[1],
conn->ripaddr.u8[2],
conn->ripaddr.u8[3],
htons(conn->rport),
uip_htons(conn->rport),
states[conn->tcpstateflags & UIP_TS_MASK],
conn->nrtx,
conn->timer,