ubuntu: Move networking bits to the ethernet library

Author: rojer

src/mgos_eth.h renamed to include/mgos_eth.h

@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-#ifndef CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_
-#define CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_
+#pragma once
 
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "lwip/ip_addr.h"
+#include "mgos_net.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,10 +55,10 @@ const char *mgos_eth_speed_str(enum mgos_eth_speed speed);
 const char *mgos_eth_duplex_str(enum mgos_eth_duplex duplex);
 bool mgos_eth_phy_opts_from_str(const char *str,
                                 struct mgos_eth_phy_opts *opts);
-bool mgos_eth_get_static_ip_config(ip4_addr_t *ip, ip4_addr_t *netmask,
-                                   ip4_addr_t *gw);
+bool mgos_eth_get_static_ip_config(struct sockaddr_in *ip,
+                                   struct sockaddr_in *netmask,
+                                   struct sockaddr_in *gw);
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* CS_MOS_LIBS_ETHERNET_SRC_MGOS_ETH_H_ */

src/stm32/stm32_eth_netif.h renamed to include/stm32/stm32_eth_netif.h

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include "mgos_net.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool ubuntu_get_default_gateway(char *dev, size_t devlen,
+                                struct sockaddr_in *gw);
+
+#ifdef __cplusplus
+}
+#endif

src/stm32/stm32_eth_phy.h renamed to include/stm32/stm32_eth_phy.h

@@ -3,14 +3,15 @@ description: Ethernet support
 type: lib
 version: 1.0
 
-platforms: [ esp32, stm32 ]
-
-libs:
-  - origin: https://github.com/mongoose-os-libs/core
-  - origin: https://github.com/mongoose-os-libs/lwip
+platforms: [ esp32, stm32, ubuntu ]
 
 sources:
   - src
+  - src/${mos.platform}
+
+includes:
+  - include
+  - include/${mos.platform}
 
 config_schema:
   - ["eth", "o", {title: "Ethernet settings"}]
@@ -20,9 +21,44 @@ config_schema:
   - ["eth.netmask", "s", {title: "Static Netmask"}]
   - ["eth.gw", "s", {title: "Static Default Gateway"}]
 
+conds:
+  - when: mos.platform == "esp32"
+    apply:
+      libs:
+        - location: https://github.com/mongoose-os-libs/lwip
+      config_schema:
+        - ["eth.dhcp_hostname", "s", {title: "Host name to include in DHCP requests"}]
+        - ["eth.clk_mode", "i", 0, {title: "50 MHz clock source: 0 in <- GPIO0, 1 out -> GPIO0, 2 out -> GPIO16, 3 out -> GPIO17 (inverted)"}]
+        - ["eth.mdc_gpio", "i", 23, {title: "GPIO to use for RMII MDC signal"}]
+        - ["eth.mdio_gpio", "i", 18, {title: "GPIO to use for RMII MDIO signal"}]
+        - ["eth.phy_pwr_gpio", "i", -1, {title: "GPIO to use for PHY PWR control signal"}]
+      build_vars:
+        ESP_IDF_EXTRA_COMPONENTS: >
+          ${build_vars.ESP_IDF_EXTRA_COMPONENTS}
+          esp_eth
+      cdefs:
+        # Select the PHY model. Only one at a time.
+        MGOS_ETH_PHY_IP101: 0
+        MGOS_ETH_PHY_RTL8201: 0
+        MGOS_ETH_PHY_LAN87x0: 1
+        MGOS_ETH_PHY_DP83848: 0
+
+  - when: mos.platform == "stm32"
+    apply:
+      libs:
+        - location: https://github.com/mongoose-os-libs/lwip
+      config_schema:
+        # OUI = 12:34:56 happens to be a valid Locally Administered Address prefix. Win!
+        - ["eth.mac", "s", "12:34:56:??:??:??", {title: "MAC address. ?? are replaced with bits from chip's unique ID."}]
+        - ["eth.speed", "s", "auto", {title: "Speed and duplex selection: auto, 10HD, 10FD, 100HD, 100FD."}]
+        - ["eth.mtu", "i", 1460, {title: "Interface MTU"}]
+      build_vars:
+        MGOS_ENABLE_LWIP: 1
+
 tags:
   - c
   - net
   - docs:net:Ethernet
 
-manifest_version: 2017-09-29
+no_implicit_init_deps: true
+manifest_version: 2018-06-20

include/ubuntu/ubuntu_eth.h

@@ -142,12 +142,15 @@ bool mgos_ethernet_init(void) {
   uint8_t mac_addr[6];
   mac->get_addr(mac, mac_addr);
 
-  esp_netif_ip_info_t static_ip = {0};
-  if (!mgos_eth_get_static_ip_config((ip4_addr_t *) &static_ip.ip,
-                                     (ip4_addr_t *) &static_ip.netmask,
-                                     (ip4_addr_t *) &static_ip.gw)) {
+  struct sockaddr_in ip = {0}, netmask = {0}, gw = {0};
+  if (!mgos_eth_get_static_ip_config(&ip, &netmask, &gw)) {
     goto out;
   }
+  esp_netif_ip_info_t static_ip = {
+      .ip.addr = ip.sin_addr.s_addr,
+      .netmask.addr = netmask.sin_addr.s_addr,
+      .gw.addr = gw.sin_addr.s_addr,
+  };
 
   bool is_dhcp =
       (static_ip.ip.addr == IPADDR_ANY || static_ip.netmask.addr == IPADDR_ANY);

mos.yml

@@ -20,10 +20,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lwip/ip_addr.h"
-
 #include "common/cs_dbg.h"
 
+#include "mgos_net.h"
 #include "mgos_sys_config.h"
 
 const char *mgos_eth_speed_str(enum mgos_eth_speed speed) {
@@ -88,8 +87,9 @@ bool mgos_eth_phy_opts_from_str(const char *str,
   return true;
 }
 
-bool mgos_eth_get_static_ip_config(ip4_addr_t *ip, ip4_addr_t *netmask,
-                                   ip4_addr_t *gw) {
+bool mgos_eth_get_static_ip_config(struct sockaddr_in *ip,
+                                   struct sockaddr_in *netmask,
+                                   struct sockaddr_in *gw) {
   bool res = false;
   memset(ip, 0, sizeof(*ip));
   memset(netmask, 0, sizeof(*netmask));
@@ -100,17 +100,17 @@ bool mgos_eth_get_static_ip_config(ip4_addr_t *ip, ip4_addr_t *netmask,
     goto clean;
   }
 
-  if (!ip4addr_aton(mgos_sys_config_get_eth_ip(), ip)) {
+  if (!mgos_net_str_to_ip(mgos_sys_config_get_eth_ip(), ip)) {
     LOG(LL_ERROR, ("Invalid eth.ip!"));
     goto clean;
   }
   if (mgos_sys_config_get_eth_netmask() == NULL ||
-      !ip4addr_aton(mgos_sys_config_get_eth_netmask(), netmask)) {
+      !mgos_net_str_to_ip(mgos_sys_config_get_eth_netmask(), netmask)) {
     LOG(LL_ERROR, ("Invalid eth.netmask!"));
     goto clean;
   }
   if (mgos_sys_config_get_eth_gw() != NULL &&
-      !ip4addr_aton(mgos_sys_config_get_eth_gw(), gw)) {
+      !mgos_net_str_to_ip(mgos_sys_config_get_eth_gw(), gw)) {
     LOG(LL_ERROR, ("Invalid eth.gw!"));
     goto clean;
   }

mos_esp32.yml

@@ -89,11 +89,15 @@ bool mgos_ethernet_init(void) {
   opts.phy_addr = mgos_sys_config_get_eth_phy_addr();
   opts.mtu = mgos_sys_config_get_eth_mtu();
 
-  ip4_addr_t ip, netmask, gw;
-  if (!mgos_eth_get_static_ip_config(&ip, &netmask, &gw)) {
+  struct sockaddr_in sip, snetmask, sgw;
+  if (!mgos_eth_get_static_ip_config(&sip, &snetmask, &sgw)) {
     goto clean;
   }
 
+  ip4_addr_t ip = {.addr = sip.sin_addr.s_addr};
+  ip4_addr_t netmask = {.addr = snetmask.sin_addr.s_addr};
+  ip4_addr_t gw = {.addr = sgw.sin_addr.s_addr};
+
   struct netif *netif = (struct netif *) calloc(1, sizeof(*netif));
   if (netif_add(netif, &ip, &netmask, &gw, &opts, stm32_eth_netif_init,
                 ethernet_input) == NULL) {

mos_stm32.yml

@@ -0,0 +1,138 @@
+/*
+ * Copyright 2019 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <ifaddrs.h>
+#include <netdb.h>
+
+#include "ubuntu_eth.h"
+
+#include "mgos_hal.h"
+#include "mgos_mongoose.h"
+#include "mgos_net_hal.h"
+#include "ubuntu.h"
+#include "ubuntu_ipc.h"
+
+bool ubuntu_get_default_gateway(char *dev, size_t devlen,
+                                struct sockaddr_in *gw) {
+  int fd;
+  FILE *f = NULL;
+  char line[100], *p, *c, *g, *saveptr;
+  bool ret = false;
+
+  if (!dev || !gw) {
+    return false;
+  }
+
+  fd = ubuntu_ipc_open("/proc/net/route", O_RDONLY);
+  if (fd < 0) {
+    LOG(LL_ERROR, ("Could not open /proc/net/route"));
+    return false;
+  }
+  f = fdopen(fd, "r");
+  if (!f) {
+    return false;
+  }
+
+  while (fgets(line, 100, f)) {
+    p = strtok_r(line, " \t", &saveptr);
+    c = strtok_r(NULL, " \t", &saveptr);
+    g = strtok_r(NULL, " \t", &saveptr);
+
+    if (p != NULL && c != NULL) {
+      if (strcmp(c, "00000000") == 0) {
+        strncpy(dev, p, devlen - 1);
+        dev[devlen - 1] = 0;
+        if (g) {
+          char *pEnd;
+          int ng = strtol(g, &pEnd, 16);
+          gw->sin_addr.s_addr = ng;
+          gw->sin_port = 0;
+          gw->sin_family = AF_INET;
+          ret = true;
+        }
+        break;
+      }
+    }
+  }
+
+  fclose(f);
+  close(fd);
+  return ret;
+}
+
+// Will always return the IP address which has a default gateway attached,
+// regardless of 'if_instance'.
+bool mgos_eth_dev_get_ip_info(int if_instance,
+                              struct mgos_net_ip_info *ip_info) {
+  struct ifaddrs *ifaddr, *ifa;
+  char gw_dev[64];
+  struct sockaddr_in gw;
+
+  if (ip_info == NULL) return false;
+
+  memset(ip_info, 0, sizeof(*ip_info));
+
+  if (!ubuntu_get_default_gateway(gw_dev, sizeof(gw_dev), &gw)) {
+    memcpy(gw_dev, "lo", 3);
+  }
+
+  LOG(LL_INFO, ("External interface: %s", gw_dev));
+
+  if (getifaddrs(&ifaddr) == -1) {
+    LOG(LL_ERROR, ("Cannot get interfaces"));
+    return false;
+  }
+
+  bool found = false;
+  for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
+    char host[NI_MAXHOST], netmask[NI_MAXHOST], gateway[NI_MAXHOST];
+    if (ifa->ifa_addr == NULL || strcmp(gw_dev, ifa->ifa_name) != 0) {
+      continue;
+    }
+    if (0 != getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host,
+                         NI_MAXHOST, NULL, 0, NI_NUMERICHOST)) {
+      continue;
+    }
+    if (0 != getnameinfo(ifa->ifa_netmask, sizeof(struct sockaddr_in), netmask,
+                         NI_MAXHOST, NULL, 0, NI_NUMERICHOST)) {
+      continue;
+    }
+    memcpy((void *) &ip_info->ip, (void *) ifa->ifa_addr,
+           sizeof(struct sockaddr_in));
+    memcpy((void *) &ip_info->netmask, (void *) ifa->ifa_netmask,
+           sizeof(struct sockaddr_in));
+    if (getnameinfo((const struct sockaddr *) &gw, sizeof(gw), gateway,
+                    NI_MAXHOST, NULL, 0, NI_NUMERICHOST) == 0) {
+      memcpy((void *) &ip_info->gw, (void *) &gw, sizeof(gw));
+    }
+    found = true;
+    break;
+  }
+
+  freeifaddrs(ifaddr);
+
+  if (!found) {
+    LOG(LL_ERROR, ("Failed to get interface configuration"));
+  }
+
+  return found;
+
+  (void) if_instance;
+}
+
+bool mgos_ethernet_init(void) {
+  return true;
+}