diff --git a/repos/os/lib/mk/net.mk b/repos/os/lib/mk/net.mk index 74db51e450..cf4dbbd0e1 100644 --- a/repos/os/lib/mk/net.mk +++ b/repos/os/lib/mk/net.mk @@ -1,6 +1,4 @@ SRC_CC += ethernet.cc ipv4.cc dhcp.cc arp.cc udp.cc tcp.cc SRC_CC += icmp.cc internet_checksum.cc -CC_CXX_WARN_STRICT_CONVERSION = - vpath %.cc $(REP_DIR)/src/lib/net diff --git a/repos/os/src/lib/net/ipv4.cc b/repos/os/src/lib/net/ipv4.cc index e2e0f1bbca..bc02a96b13 100644 --- a/repos/os/src/lib/net/ipv4.cc +++ b/repos/os/src/lib/net/ipv4.cc @@ -68,10 +68,10 @@ uint32_t Ipv4_address::to_uint32_big_endian() const Ipv4_address Ipv4_address::from_uint32_big_endian(uint32_t ip_raw) { Ipv4_address ip; - ip.addr[0] = ip_raw; - ip.addr[1] = ip_raw >> 8; - ip.addr[2] = ip_raw >> 16; - ip.addr[3] = ip_raw >> 24; + ip.addr[0] = (uint8_t)(ip_raw); + ip.addr[1] = (uint8_t)(ip_raw >> 8); + ip.addr[2] = (uint8_t)(ip_raw >> 16); + ip.addr[3] = (uint8_t)(ip_raw >> 24); return ip; } @@ -88,10 +88,10 @@ uint32_t Ipv4_address::to_uint32_little_endian() const Ipv4_address Ipv4_address::from_uint32_little_endian(uint32_t ip_raw) { Ipv4_address ip; - ip.addr[3] = ip_raw; - ip.addr[2] = ip_raw >> 8; - ip.addr[1] = ip_raw >> 16; - ip.addr[0] = ip_raw >> 24; + ip.addr[3] = (uint8_t)(ip_raw); + ip.addr[2] = (uint8_t)(ip_raw >> 8); + ip.addr[1] = (uint8_t)(ip_raw >> 16); + ip.addr[0] = (uint8_t)(ip_raw >> 24); return ip; }