Use constant for IPAddress offset

me-no-dev · me-no-dev · commit 41fb1a1215d8 · 2023-12-19T00:50:07.000+02:00
@sgryphon is this better?
diff --git a/libraries/WiFi/src/WiFiClient.cpp b/libraries/WiFi/src/WiFiClient.cpp
@@ -614,7 +614,7 @@ IPAddress WiFiClient::remoteIP(int fd) const
     if (((struct sockaddr*)&addr)->sa_family == AF_INET6) {
         struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)&addr;
         if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {
-            return IPAddress(IPv4, (uint8_t*)saddr6->sin6_addr.s6_addr+12);
+            return IPAddress(IPv4, (uint8_t*)saddr6->sin6_addr.s6_addr+IPADDRESS_V4_BYTES_INDEX);
         } else {
             return IPAddress(IPv6, (uint8_t*)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);
         }

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ IPAddress WiFiClient::remoteIP(int fd) const`
`614`	`614`	`if (((struct sockaddr*)&addr)->sa_family == AF_INET6) {`
`615`	`615`	`struct sockaddr_in6 saddr6 = (struct sockaddr_in6 )&addr;`
`616`	`616`	`if (IN6_IS_ADDR_V4MAPPED(saddr6->sin6_addr.un.u32_addr)) {`
`617`		`- return IPAddress(IPv4, (uint8_t*)saddr6->sin6_addr.s6_addr+12);`
	`617`	`+ return IPAddress(IPv4, (uint8_t*)saddr6->sin6_addr.s6_addr+IPADDRESS_V4_BYTES_INDEX);`
`618`	`618`	`} else {`
`619`	`619`	`return IPAddress(IPv6, (uint8_t*)(saddr6->sin6_addr.s6_addr), saddr6->sin6_scope_id);`
`620`	`620`	`}`