fix(eppp): Per C++ issues and PPP disabled

Author: david-cermak

components/eppp_link/eppp_link.c

@@ -163,6 +163,7 @@ static int get_netif_num(esp_netif_t *netif)
     return  netif_cnt;
 }
 
+#ifdef CONFIG_LWIP_PPP_SUPPORT
 static void on_ppp_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
     esp_netif_t **netif = data;
@@ -172,6 +173,7 @@ static void on_ppp_event(void *arg, esp_event_base_t base, int32_t event_id, voi
         h->netif_stop = true;
     }
 }
+#endif
 
 static void on_ip_event(void *arg, esp_event_base_t base, int32_t event_id, void *data)
 {
@@ -222,7 +224,9 @@ static void remove_handlers(void)
         vEventGroupDelete(s_event_group);
         s_event_group = NULL;
         esp_event_handler_unregister(IP_EVENT, ESP_EVENT_ANY_ID, on_ip_event);
+#ifdef CONFIG_LWIP_PPP_SUPPORT
         esp_event_handler_unregister(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, on_ppp_event);
+#endif
     }
 }
 
@@ -296,11 +300,13 @@ esp_netif_t *eppp_open(eppp_type_t role, eppp_config_t *config, int connect_time
             remove_handlers();
             return NULL;
         }
+#ifdef CONFIG_LWIP_PPP_SUPPORT
         if (esp_event_handler_register(NETIF_PPP_STATUS, ESP_EVENT_ANY_ID, on_ppp_event, NULL) !=  ESP_OK) {
             ESP_LOGE(TAG, "Failed to register PPP status handler");
             remove_handlers();
             return NULL;
         }
+#endif // CONFIG_LWIP_PPP_SUPPORT
     }
     esp_netif_t *netif = eppp_init(role, config);
     if (!netif) {

components/eppp_link/include/eppp_link.h

@@ -5,6 +5,10 @@
  */
 #pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define EPPP_DEFAULT_SERVER_IP() ESP_IP4TOADDR(192, 168, 11, 1)
 #define EPPP_DEFAULT_CLIENT_IP() ESP_IP4TOADDR(192, 168, 11, 2)
 
@@ -110,49 +114,49 @@ typedef enum eppp_transport {
 
 typedef struct eppp_config_t {
     eppp_transport_t transport;
-    union {
-        struct eppp_config_spi_s {
-            int host;
-            bool is_master;
-            int mosi;
-            int miso;
-            int sclk;
-            int cs;
-            int intr;
-            int freq;
-            int input_delay_ns;
-            int cs_ena_pretrans;
-            int cs_ena_posttrans;
-        } spi;
-
-        struct eppp_config_uart_s {
-            int port;
-            int baud;
-            int tx_io;
-            int rx_io;
-            int queue_size;
-            int rx_buffer_size;
-        } uart;
-
-        struct eppp_config_sdio_s {
-            bool is_host;
-            int width;
-            int clk;
-            int cmd;
-            int d0;
-            int d1;
-            int d2;
-            int d3;
-        } sdio;
-
-        struct eppp_config_ethernet_s {
-            int mdc_io;
-            int mdio_io;
-            int phy_addr;
-            int rst_io;
-        } ethernet;
-
-    };
+//    union {
+    struct eppp_config_spi_s {
+        int host;
+        bool is_master;
+        int mosi;
+        int miso;
+        int sclk;
+        int cs;
+        int intr;
+        int freq;
+        int input_delay_ns;
+        int cs_ena_pretrans;
+        int cs_ena_posttrans;
+    } spi;
+
+    struct eppp_config_uart_s {
+        int port;
+        int baud;
+        int tx_io;
+        int rx_io;
+        int queue_size;
+        int rx_buffer_size;
+    } uart;
+
+    struct eppp_config_sdio_s {
+        bool is_host;
+        int width;
+        int clk;
+        int cmd;
+        int d0;
+        int d1;
+        int d2;
+        int d3;
+    } sdio;
+
+    struct eppp_config_ethernet_s {
+        int mdc_io;
+        int mdio_io;
+        int phy_addr;
+        int rst_io;
+    } ethernet;
+
+//    };
     struct eppp_config_task_s {
         bool run_task;
         int stack_size;
@@ -201,3 +205,7 @@ esp_err_t eppp_perform(esp_netif_t *netif);
 typedef esp_err_t (*eppp_channel_fn_t)(esp_netif_t *netif, int nr, void *buffer, size_t len);
 
 esp_err_t eppp_add_channels(esp_netif_t *netif, int nr, eppp_channel_fn_t *tx, const eppp_channel_fn_t rx);
+
+#ifdef __cplusplus
+}
+#endif