Merge branch 'espressif:master' into main

Author: Jason2866

libraries/Network/src/NetworkManager.cpp

@@ -14,6 +14,8 @@ NetworkManager::NetworkManager(){
 
 }
 
+NetworkInterface * getNetifByID(Network_Interface_ID id);
+
 bool NetworkManager::begin(){
     static bool initialized = false;
     if(!initialized){
@@ -44,18 +46,11 @@ bool NetworkManager::begin(){
  */
 int NetworkManager::hostByName(const char* aHostname, IPAddress& aResult)
 {
-    err_t err = ERR_OK;
-
-    // This should generally check if we have a global address assigned to one of the interfaces.
-    // If such address is not assigned, there is no point in trying to get V6 from DNS as we will not be able to reach it.
-    // That is of course, if 'preferV6' is not set to true
     static bool hasGlobalV6 = false;
-    bool hasGlobalV6Now = false;//ToDo: implement this!
-    if(hasGlobalV6 != hasGlobalV6Now){
-        hasGlobalV6 = hasGlobalV6Now;
-        dns_clear_cache();
-        log_d("Clearing DNS cache");
-    }
+    static bool hasGlobalV4 = false;
+    err_t err = ERR_OK;
+    const char *servname = "0";
+    struct addrinfo *res;
 
     aResult = static_cast<uint32_t>(0);
 
@@ -64,8 +59,33 @@ int NetworkManager::hostByName(const char* aHostname, IPAddress& aResult)
         return 1;
     }
 
-    const char *servname = "0";
-    struct addrinfo *res;
+    // This should generally check if we have a global address assigned to one of the interfaces.
+    // If such address is not assigned, there is no point in trying to get V6 from DNS as we will not be able to reach it.
+    bool hasGlobalV6Now = false;
+    bool hasGlobalV4Now = false;
+    for (int i = 0; i < ESP_NETIF_ID_MAX; ++i){
+        NetworkInterface * iface = getNetifByID((Network_Interface_ID)i);
+        if(iface != NULL) {
+            if(iface->hasGlobalIPv6()) {
+                hasGlobalV6Now = true;
+            }
+            if(iface->hasIP()) {
+                hasGlobalV4Now = true;
+            }
+        }
+        if (hasGlobalV6Now && hasGlobalV4Now){
+            break;
+        }
+    }
+
+    // If the state of IP addresses has changed, clear the DNS cache
+    if(hasGlobalV6 != hasGlobalV6Now || hasGlobalV4 != hasGlobalV4Now){
+        hasGlobalV6 = hasGlobalV6Now;
+        hasGlobalV4 = hasGlobalV4Now;
+        dns_clear_cache();
+        log_d("Clearing DNS cache");
+    }
+
     struct addrinfo hints;
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
@@ -130,8 +150,6 @@ bool NetworkManager::setHostname(const char * name)
     return true;
 }
 
-NetworkInterface * getNetifByID(Network_Interface_ID id);
-
 bool NetworkManager::setDefaultInterface(NetworkInterface & ifc)
 {
     return ifc.setDefault();

libraries/NetworkClientSecure/src/ssl_client.cpp

@@ -62,21 +62,32 @@ int start_ssl_client(sslclient_context *ssl_client, const IPAddress& ip, uint32_
         return -1;
     }
 
-    log_v("Starting socket");
+    int domain = ip.type() == IPv6 ? AF_INET6 : AF_INET;
+    log_v("Starting socket (domain %d)", domain);
     ssl_client->socket = -1;
 
-    ssl_client->socket = lwip_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    ssl_client->socket = lwip_socket(domain, SOCK_STREAM, IPPROTO_TCP);
     if (ssl_client->socket < 0) {
         log_e("ERROR opening socket");
         return ssl_client->socket;
     }
 
     fcntl( ssl_client->socket, F_SETFL, fcntl( ssl_client->socket, F_GETFL, 0 ) | O_NONBLOCK );
-    struct sockaddr_in serv_addr;
-    memset(&serv_addr, 0, sizeof(serv_addr));
-    serv_addr.sin_family = AF_INET;
-    serv_addr.sin_addr.s_addr = ip;
-    serv_addr.sin_port = htons(port);
+    struct sockaddr_storage serv_addr = {};
+    if (domain == AF_INET6) {
+        struct sockaddr_in6 *tmpaddr = (struct sockaddr_in6 *)&serv_addr;
+        tmpaddr->sin6_family = AF_INET6;
+        for (int index = 0; index < 16; index++) {
+            tmpaddr->sin6_addr.s6_addr[index] = ip[index];
+        }
+        tmpaddr->sin6_port = htons(port);
+        tmpaddr->sin6_scope_id = ip.zone();
+    } else {
+        struct sockaddr_in *tmpaddr = (struct sockaddr_in *)&serv_addr;
+        tmpaddr->sin_family = AF_INET;
+        tmpaddr->sin_addr.s_addr = ip;
+        tmpaddr->sin_port = htons(port);
+    }
 
     if(timeout <= 0){
         timeout = 30000; // Milli seconds.

libraries/USB/src/USBHIDKeyboard.cpp

@@ -222,7 +222,7 @@ size_t USBHIDKeyboard::pressRaw(uint8_t k)
     uint8_t i;
     if (k >= 0xE0 && k < 0xE8) {
         // it's a modifier key
-        _keyReport.modifiers |= (1<<(k-0x80));
+        _keyReport.modifiers |= (1<<(k-0xE0));
     } else if (k && k < 0xA5) {
         // Add k to the key report only if it's not already present
         // and if there is an empty slot.
@@ -253,7 +253,7 @@ size_t USBHIDKeyboard::releaseRaw(uint8_t k)
     uint8_t i;
     if (k >= 0xE0 && k < 0xE8) {
         // it's a modifier key
-        _keyReport.modifiers &= ~(1<<(k-0x80));
+        _keyReport.modifiers &= ~(1<<(k-0xE0));
     } else if (k && k < 0xA5) {
         // Test the key report to see if k is present.  Clear it if it exists.
         // Check all positions in case the key is present more than once (which it shouldn't be)