From 2ea1d65d69818d097e995572cef9ea38558e1882 Mon Sep 17 00:00:00 2001
From: "Pete (El Supremo)" <peteros@shaw.ca>
Date: Thu, 11 Aug 2016 15:56:59 -0600
Subject: [PATCH] Fixes for 32-bit processors

---
 Dhcp.cpp       |  6 +++++-
 Dhcp.h         | 13 +++++++------
 utility/util.h |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Dhcp.cpp b/Dhcp.cpp
index c15fe83..f193969 100644
--- a/Dhcp.cpp
+++ b/Dhcp.cpp
@@ -289,7 +289,9 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
 
         while (_dhcpUdpSocket.available() > 0) 
         {
-            switch (_dhcpUdpSocket.read()) 
+//PAH save the byte for later
+            unsigned char sread = _dhcpUdpSocket.read();
+            switch (sread) 
             {
                 case endOption :
                     break;
@@ -370,6 +372,8 @@ uint8_t DhcpClass::parseDHCPResponse(unsigned long responseTimeout, uint32_t& tr
                     }
                     break;
             }
+//PAH break from the loop if endOption was read
+            if(sread == endOption)break;
         }
     }
 
diff --git a/Dhcp.h b/Dhcp.h
index cc3cd35..f3c24e7 100644
--- a/Dhcp.h
+++ b/Dhcp.h
@@ -140,12 +140,13 @@ class DhcpClass {
 private:
   uint32_t _dhcpInitialTransactionId;
   uint32_t _dhcpTransactionId;
-  uint8_t  _dhcpMacAddr[6];
-  uint8_t  _dhcpLocalIp[4];
-  uint8_t  _dhcpSubnetMask[4];
-  uint8_t  _dhcpGatewayIp[4];
-  uint8_t  _dhcpDhcpServerIp[4];
-  uint8_t  _dhcpDnsServerIp[4];
+//PAH force alignment to 4 bytes for 32-bit processors
+  uint8_t  _dhcpMacAddr[6] __attribute__ ((aligned (4)));
+  uint8_t  _dhcpLocalIp[4] __attribute__ ((aligned (4)));
+  uint8_t  _dhcpSubnetMask[4] __attribute__ ((aligned (4)));
+  uint8_t  _dhcpGatewayIp[4] __attribute__ ((aligned (4)));
+  uint8_t  _dhcpDhcpServerIp[4] __attribute__ ((aligned (4)));
+  uint8_t  _dhcpDnsServerIp[4] __attribute__ ((aligned (4)));
   uint32_t _dhcpLeaseTime;
   uint32_t _dhcpT1, _dhcpT2;
   signed long _renewInSec;
diff --git a/utility/util.h b/utility/util.h
index 5042e82..a1e5955 100644
--- a/utility/util.h
+++ b/utility/util.h
@@ -1,7 +1,8 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#define htons(x) ( ((x)<<8) | (((x)>>8)&0xFF) )
+//PAH - Add & 0xff00 so that it works on 32-bit processors
+#define htons(x) ( (((x)<<8) & 0xff00) | (((x)>>8)&0xFF) )
 #define ntohs(x) htons(x)
 
 #define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \