From: Ferry Huberts <f.huberts@mindef.nl>
Date: Tue, 6 Dec 2011 12:02:32 +0000 (+0100)
Subject: p2pd: fix setting the 'multicast' MAC address for IPv4
X-Git-Tag: OLSRD_0_6_3~167
X-Git-Url: http://olsr.org/git/?p=olsrd.git;a=commitdiff_plain;h=0ef6e79f8d5917fbe169453c126e583f7c5aacdb

p2pd: fix setting the 'multicast' MAC address for IPv4

Signed-off-by: Ferry Huberts <f.huberts@mindef.nl>
---

diff --git a/lib/p2pd/src/p2pd.c b/lib/p2pd/src/p2pd.c
index f8bf11b9..00a119f4 100644
--- a/lib/p2pd/src/p2pd.c
+++ b/lib/p2pd/src/p2pd.c
@@ -173,13 +173,16 @@ PacketReceivedFromOLSR(unsigned char *encapsulationUdpData, int len)
          */
 
         if (IsMulticastv4(ipHeader)) {
+          in_addr_t addr = ntohl(ipHeader->ip_dst.s_addr);
+
           dest.sll_addr[0] = 0x01;
           dest.sll_addr[1] = 0x00;
           dest.sll_addr[2] = 0x5E;
-          dest.sll_addr[3] = (ipHeader->ip_dst.s_addr >> 16) & 0x7F;
-          dest.sll_addr[4] = (ipHeader->ip_dst.s_addr >> 8) & 0xFF;
-          dest.sll_addr[5] = ipHeader->ip_dst.s_addr & 0xFF;
-        } else /* if (IsBroadcast(ipHeader)) */ {
+          dest.sll_addr[3] = (addr >> 16) & 0x7F;
+          dest.sll_addr[4] = (addr >>  8) & 0xFF;
+          dest.sll_addr[5] = addr & 0xFF;
+        } else {
+          /* broadcast or whatever */
           memset(dest.sll_addr, 0xFF, IFHWADDRLEN);
         }
       } else /*(olsr_cnf->ip_version == AF_INET6) */ {