From 241088e2736e8b5f29d2703a6f1e846f6f437867 Mon Sep 17 00:00:00 2001
From: Boog900 <boog900@tutanota.com>
Date: Sun, 17 Nov 2024 20:32:41 +0000
Subject: [PATCH] Wire: fix IPv4 Endianness (#342)

* fix IPv4 Endianness

* fix import order
---
 net/wire/src/network_address.rs              |  6 ++++--
 net/wire/src/network_address/epee_builder.rs | 12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/net/wire/src/network_address.rs b/net/wire/src/network_address.rs
index ad599b7..3e15c46 100644
--- a/net/wire/src/network_address.rs
+++ b/net/wire/src/network_address.rs
@@ -17,10 +17,12 @@
 //! Monero network. Core Monero has 4 main addresses: IPv4, IPv6, Tor,
 //! I2p. Currently this module only has IPv(4/6).
 //!
-use bytes::BufMut;
-use cuprate_epee_encoding::EpeeObject;
 use std::{hash::Hash, net, net::SocketAddr};
 
+use bytes::BufMut;
+
+use cuprate_epee_encoding::EpeeObject;
+
 mod epee_builder;
 use epee_builder::*;
 
diff --git a/net/wire/src/network_address/epee_builder.rs b/net/wire/src/network_address/epee_builder.rs
index c1d1742..bd481a5 100644
--- a/net/wire/src/network_address/epee_builder.rs
+++ b/net/wire/src/network_address/epee_builder.rs
@@ -1,9 +1,10 @@
-use bytes::Buf;
 use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
 
-use cuprate_epee_encoding::{epee_object, EpeeObjectBuilder};
+use bytes::Buf;
 use thiserror::Error;
 
+use cuprate_epee_encoding::{epee_object, EpeeObjectBuilder};
+
 use crate::NetworkAddress;
 
 #[derive(Default)]
@@ -77,7 +78,7 @@ impl From<NetworkAddress> for TaggedNetworkAddress {
                 SocketAddr::V4(addr) => Self {
                     ty: Some(1),
                     addr: Some(AllFieldsNetworkAddress {
-                        m_ip: Some(u32::from_be_bytes(addr.ip().octets())),
+                        m_ip: Some(u32::from_le_bytes(addr.ip().octets())),
                         m_port: Some(addr.port()),
                         addr: None,
                     }),
@@ -112,7 +113,10 @@ epee_object!(
 impl AllFieldsNetworkAddress {
     fn try_into_network_address(self, ty: u8) -> Option<NetworkAddress> {
         Some(match ty {
-            1 => NetworkAddress::from(SocketAddrV4::new(Ipv4Addr::from(self.m_ip?), self.m_port?)),
+            1 => NetworkAddress::from(SocketAddrV4::new(
+                Ipv4Addr::from(self.m_ip?.to_le_bytes()),
+                self.m_port?,
+            )),
             2 => NetworkAddress::from(SocketAddrV6::new(
                 Ipv6Addr::from(self.addr?),
                 self.m_port?,