From e149992b6487bb41308a1893500e35bbe6d195c0 Mon Sep 17 00:00:00 2001 From: Håkon Nessjøen Date: Sun, 27 Feb 2011 13:38:03 +0100 Subject: Missing two endianness checks/handling. Tested successfully with MIPS Malta 4Kc qemu emulator (big endianed) --- mactelnetd.c | 10 ++++++++++ udp.c | 8 ++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/mactelnetd.c b/mactelnetd.c index 9ea0a61..cb1dfcd 100644 --- a/mactelnetd.c +++ b/mactelnetd.c @@ -765,6 +765,16 @@ void mndp_broadcast() { return; uptime = s_sysinfo.uptime; + /* Seems like ping uptime is transmitted as little endian? */ +#if BYTE_ORDER == BIG_ENDIAN + uptime = ( + ((uptime & 0x000000FF) << 24) + + ((uptime & 0x0000FF00) << 8) + + ((uptime & 0x00FF0000) >> 8) + + ((uptime & 0xFF000000) >> 24) + ); +#endif + for (i = 0; i < sockets_count; ++i) { struct mt_mndp_hdr *header = (struct mt_mndp_hdr *)&(pdata.data); diff --git a/udp.c b/udp.c index d7ffca0..1cd977b 100644 --- a/udp.c +++ b/udp.c @@ -72,7 +72,7 @@ unsigned short udp_sum_calc(unsigned char *src_addr,unsigned char *dst_addr, uns sum = ~sum; - if ((unsigned short)sum == 0) + if (sum == 0) sum = 0xFFFF; return (unsigned short) sum; @@ -109,11 +109,11 @@ int send_custom_udp(const int socket, const int ifindex, const unsigned char *so /* Init ethernet header */ memcpy(eh->h_source, sourcemac, ETH_ALEN); memcpy(eh->h_dest, destmac, ETH_ALEN); - eh->h_proto = 8; + eh->h_proto = htons(ETH_P_IP); /* Init SendTo struct */ - socket_address.sll_family = PF_PACKET; - socket_address.sll_protocol = htons(ETH_P_IP); + socket_address.sll_family = PF_PACKET; + socket_address.sll_protocol = htons(ETH_P_IP); socket_address.sll_ifindex = ifindex; socket_address.sll_hatype = ARPHRD_ETHER; socket_address.sll_pkttype = PACKET_OTHERHOST; -- cgit v1.2.3