Don't cache the MAC address; it can be changed from shell.

b0213b1d · Wesley W. Terpstra · 3a22075c · b0213b1d · b0213b1d · b0213b1d
Commit b0213b1d authored Jul 04, 2012 by Wesley W. Terpstra
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

arp.c lib/arp.c +1 -1

icmp.c lib/icmp.c +1 -1

ipv4.c lib/ipv4.c +0 -2

No files found.
--- a/lib/arp.c
+++ b/lib/arp.c
@@ -58,7 +58,7 @@ static int process_arp(uint8_t* buf, int len) {
  buf[ARP_OPER+0] = 0;
  buf[ARP_OPER+1] = 2;
  // my MAC+IP
-  memcpy(buf+ARP_SHA, myMAC, 6);
+  get_mac_addr(buf+ARP_SHA);
  memcpy(buf+ARP_SPA, myIP,  4);
  // his MAC+IP
  memcpy(buf+ARP_THA, hisMAC, 6);

--- a/lib/icmp.c
+++ b/lib/icmp.c
@@ -28,7 +28,7 @@ void icmp_init(const char* if_name) {
  /* Configure socket filter */
  memset(&saddr, 0, sizeof(saddr));
  strcpy(saddr.if_name, if_name);
-  memcpy(&saddr.mac, myMAC, 6); /* Unicast */
+  get_mac_addr(&saddr.mac); /* Unicast */
  saddr.ethertype = htons(0x0800); /* IPv4 */
  saddr.family = PTPD_SOCK_RAW_ETHERNET;
  

--- a/lib/ipv4.c
+++ b/lib/ipv4.c
@@ -3,7 +3,6 @@
 #include "endpoint.h"
 #include "ipv4.h"

-uint8_t myMAC[6];
 uint8_t myIP[4];

 unsigned int ipv4_checksum(unsigned short* buf, int shorts) {
@@ -25,7 +24,6 @@ void ipv4_init(const char* if_name, uint32_t ip) {
  
  ip_bigendian = htonl(ip);
  memcpy(myIP, &ip_bigendian, 4);
-  get_mac_addr(myMAC);
  
  arp_init(if_name);
  icmp_init(if_name);