Merge branch 'master' into feature/ppp_modem_support

Author: me-no-dev

libraries/Network/src/NetworkInterface.cpp

@@ -357,6 +357,16 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s
 
     esp_netif_flags_t flags = esp_netif_get_flags(_esp_netif);
     if(flags & ESP_NETIF_DHCP_SERVER){
+
+        // Set DNS Server
+        if(d2.ip.u_addr.ip4.addr != 0){
+            err = esp_netif_set_dns_info(_esp_netif, ESP_NETIF_DNS_MAIN, &d2);
+            if(err){
+                log_e("Netif Set DNS Info Failed! 0x%04x: %s", err, esp_err_to_name(err));
+                return false;
+            }
+        }
+
         // Stop DHCPS
         err = esp_netif_dhcps_stop(_esp_netif);
         if(err && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED){
@@ -371,11 +381,6 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s
             return false;
         }
 
-        // Set DNS Server
-        if(d2.ip.u_addr.ip4.addr != 0){
-            esp_netif_set_dns_info(_esp_netif, ESP_NETIF_DNS_MAIN, &d2);
-        }
-
         dhcps_lease_t lease;
         lease.enable = true;
         uint8_t CIDR = calculateSubnetCIDR(subnet);
@@ -438,6 +443,17 @@ bool NetworkInterface::config(IPAddress local_ip, IPAddress gateway, IPAddress s
             log_e("DHCPS Set Lease Failed! 0x%04x: %s", err, esp_err_to_name(err));
             return false;
         }
+ 
+        // Offer DNS to DHCP clients
+        if(d2.ip.u_addr.ip4.addr != 0){
+            dhcps_offer_t dhcps_dns_value = OFFER_DNS;
+            err = esp_netif_dhcps_option(_esp_netif, ESP_NETIF_OP_SET, ESP_NETIF_DOMAIN_NAME_SERVER, &dhcps_dns_value, sizeof(dhcps_dns_value));
+            if(err){
+                log_e("Netif Set DHCP Option Failed! 0x%04x: %s", err, esp_err_to_name(err));
+                return false;
+            }
+        }
+        
         // Start DHCPS
         err = esp_netif_dhcps_start(_esp_netif);
         if(err){

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/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)

libraries/WiFi/src/AP.cpp

@@ -20,6 +20,7 @@
 #include <esp_event.h>
 #include <lwip/ip_addr.h>
 #include "dhcpserver/dhcpserver_options.h"
+#include "esp_netif.h"
 
 
 esp_netif_t* get_esp_interface_netif(esp_interface_t interface);
@@ -279,6 +280,24 @@ bool APClass::bandwidth(wifi_bandwidth_t bandwidth){
     return true;
 }
 
+bool APClass::enableNAPT(bool enable){
+    if(!started()) {
+        log_e("AP must be first started to enable/disable NAPT");
+        return false;
+    }
+    esp_err_t err = ESP_OK;
+    if(enable){
+        err = esp_netif_napt_enable(_esp_netif);
+    } else {
+        err = esp_netif_napt_disable(_esp_netif);
+    }
+    if(err){
+        log_e("Could not set enable/disable NAPT! 0x%x: %s", err, esp_err_to_name(err));
+        return false;
+    }
+    return true;
+}
+
 String APClass::SSID(void) const{
     if(!started()){
         return String();

libraries/WiFi/src/WiFiAP.cpp

@@ -67,9 +67,9 @@ String WiFiAPClass::softAPSSID() const
  * @param gateway       gateway IP
  * @param subnet        subnet mask
  */
-bool WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start)
+bool WiFiAPClass::softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start, IPAddress dns)
 {
-    return AP.config(local_ip, gateway, subnet, dhcp_lease_start);
+    return AP.begin() && AP.config(local_ip, gateway, subnet, dhcp_lease_start, dns);
 }
 
 /**

libraries/WiFi/src/WiFiAP.h

@@ -48,6 +48,7 @@ class APClass: public NetworkInterface {
         bool clear();
 
         bool bandwidth(wifi_bandwidth_t bandwidth);
+        bool enableNAPT(bool enable=true);
 
         String SSID(void) const;
         uint8_t stationCount();
@@ -77,7 +78,7 @@ class WiFiAPClass
        return softAP(ssid.c_str(), passphrase.c_str(), channel, ssid_hidden, max_connection, ftm_responder, auth_mode, cipher);
     }
 
-    bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start = (uint32_t) 0);
+    bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start = (uint32_t) 0, IPAddress dns = (uint32_t) 0);
     bool softAPdisconnect(bool wifioff = false);
 
     bool softAPbandwidth(wifi_bandwidth_t bandwidth);