From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 19 Jun 2019 21:34:05 +0000 (+0900)
Subject: tree-wide: use htobe{32,16}() instead of hton{l,s}()
X-Git-Tag: v243-rc1~261^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe2e4b6961259012908df919b285c371bc0c557f;p=thirdparty%2Fsystemd.git

tree-wide: use htobe{32,16}() instead of hton{l,s}()
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index e75a49f6149..a207bb07901 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -793,7 +793,7 @@ int config_parse_address(const char *unit,
                 n->in_addr_peer = buffer;
 
         if (n->family == AF_INET && n->broadcast.s_addr == 0 && n->prefixlen <= 30)
-                n->broadcast.s_addr = n->in_addr.in.s_addr | htonl(0xfffffffflu >> n->prefixlen);
+                n->broadcast.s_addr = n->in_addr.in.s_addr | htobe32(0xfffffffflu >> n->prefixlen);
 
         n = NULL;
 
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index cba52fb4191..87bc3f76fed 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -266,9 +266,9 @@ int fw_add_local_dnat(
         mr->range[0].flags = NF_NAT_RANGE_PROTO_SPECIFIED|NF_NAT_RANGE_MAP_IPS;
         mr->range[0].min_ip = mr->range[0].max_ip = remote->in.s_addr;
         if (protocol == IPPROTO_TCP)
-                mr->range[0].min.tcp.port = mr->range[0].max.tcp.port = htons(remote_port);
+                mr->range[0].min.tcp.port = mr->range[0].max.tcp.port = htobe16(remote_port);
         else
-                mr->range[0].min.udp.port = mr->range[0].max.udp.port = htons(remote_port);
+                mr->range[0].min.udp.port = mr->range[0].max.udp.port = htobe16(remote_port);
 
         mask = alloca0(sz);
         memset(mask, 0xFF, sz);