]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: use htobe{32,16}() instead of hton{l,s}()
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 19 Jun 2019 21:34:05 +0000 (06:34 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 19 Jun 2019 21:34:05 +0000 (06:34 +0900)
src/network/networkd-address.c
src/shared/firewall-util.c

index e75a49f6149a5d16df900e1209db12565f4b2aeb..a207bb07901df5dc01be861690ac35efcbd8baaf 100644 (file)
@@ -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;
 
index cba52fb41914c90d1018c0ac21014cc3a7a57521..87bc3f76fedd29b31feb58b1d28f11fd255f942d 100644 (file)
@@ -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);