diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-16 16:12:16 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-07-16 16:12:16 +0000 |
| commit | 96c7e2683bd59830d2aaebfd2956afa3bce9323d (patch) | |
| tree | 9890f5cc1f5ae73015b15463ae9e638007de9361 /sys/lib/libsa | |
| parent | 76e68cee595bb0e514f24534e339a911d8f08032 (diff) | |
Expand ancient NTOHL/NTOHS/HTONS/HTONL macros.
ok guenther@, henning@
Diffstat (limited to 'sys/lib/libsa')
| -rw-r--r-- | sys/lib/libsa/net.c | 4 | ||||
| -rw-r--r-- | sys/lib/libsa/netudp.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sys/lib/libsa/net.c b/sys/lib/libsa/net.c index 068a28a9768..cd9f671c2b5 100644 --- a/sys/lib/libsa/net.c +++ b/sys/lib/libsa/net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net.c,v 1.17 2014/11/19 20:28:56 miod Exp $ */ +/* $OpenBSD: net.c,v 1.18 2015/07/16 16:12:15 mpi Exp $ */ /* $NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $ */ /* @@ -208,7 +208,7 @@ intoa(u_int32_t addr) int n; static char buf[sizeof(".255.255.255.255")]; - NTOHL(addr); + addr = ntohl(addr); cp = &buf[sizeof buf]; *--cp = '\0'; diff --git a/sys/lib/libsa/netudp.c b/sys/lib/libsa/netudp.c index 7e9b8563f0b..0199caaede5 100644 --- a/sys/lib/libsa/netudp.c +++ b/sys/lib/libsa/netudp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netudp.c,v 1.2 2014/11/20 14:51:42 krw Exp $ */ +/* $OpenBSD: netudp.c,v 1.3 2015/07/16 16:12:15 mpi Exp $ */ /* $NetBSD: net.c,v 1.14 1996/10/13 02:29:02 christos Exp $ */ /* @@ -183,7 +183,7 @@ readudp(struct iodesc *d, void *pkt, size_t len, time_t tleft) #endif return -1; } - NTOHS(ip->ip_len); + ip->ip_len = ntohs(ip->ip_len); if (n < ip->ip_len) { #ifdef NET_DEBUG if (debug) @@ -238,9 +238,9 @@ readudp(struct iodesc *d, void *pkt, size_t len, time_t tleft) } *ip = tip; } - NTOHS(uh->uh_dport); - NTOHS(uh->uh_sport); - NTOHS(uh->uh_ulen); + uh->uh_dport = ntohs(uh->uh_dport); + uh->uh_sport = ntohs(uh->uh_sport); + uh->uh_ulen = ntohs(uh->uh_ulen); if (uh->uh_ulen < sizeof(*uh)) { #ifdef NET_DEBUG if (debug) |