Merge pull request #88 from martinayotte/master

rogerclarkmelbourne · rogerclarkmelbourne · commit 84fdcc8a625d · 2015-07-05T08:56:32.000+10:00
PR to fix F4 DNS Bug fix
diff --git a/STM32F4/libraries/arduino_uip/Dns.cpp b/STM32F4/libraries/arduino_uip/Dns.cpp
@@ -58,8 +58,7 @@ int DNSClient::inet_aton(const char* aIPAddrString, IPAddress& aResult)
 {
     // See if we've been given a valid IP address
     const char* p =aIPAddrString;
-    while (*p &&
-           ( (*p == '.') || (*p >= '0') || (*p <= '9') ))
+    while (*p && ( (*p == '.') || ((*p >= '0') && (*p <= '9')) ))
     {
         p++;
     }
diff --git a/STM32F4/libraries/arduino_uip/utility/util.h b/STM32F4/libraries/arduino_uip/utility/util.h
@@ -1,7 +1,7 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#define htons(x) ( ((x)<<8) | (((x)>>8)&0xFF) )
+#define htons(x) ( ((x)<< 8 & 0xFF00) | ((x)>> 8 & 0x00FF) )
 #define ntohs(x) htons(x)
 
 #define htonl(x) ( ((x)<<24 & 0xFF000000UL) | \

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,7 @@ int DNSClient::inet_aton(const char* aIPAddrString, IPAddress& aResult)`
`58`	`58`	`{`
`59`	`59`	`// See if we've been given a valid IP address`
`60`	`60`	`const char* p =aIPAddrString;`
`61`		`- while (*p &&`
`62`		`- ( (p == '.') \|\| (p >= '0') \|\| (*p <= '9') ))`
	`61`	`+ while (p && ( (p == '.') \|\| ((p >= '0') && (p <= '9')) ))`
`63`	`62`	`{`
`64`	`63`	`p++;`
`65`	`64`	`}`