DNS, DHCP, TCP & UDP functions under LwIP flags to give clean errors during compilation

Signed-off-by: fpr <[email protected]>

Author: fpr

Diff for: libraries/NativeEthernet/src/utility/stm32_eth.c

@@ -116,8 +116,10 @@ static void Netif_Config(void)
     netif_set_down(&gnetif);
   }
 
+#if LWIP_NETIF_LINK_CALLBACK
   /* Set the link callback function, this function is called on change of link status */
   netif_set_link_callback(&gnetif, ethernetif_update_config);
+#endif /* LWIP_NETIF_LINK_CALLBACK */
 }
 
 void stm32_eth_init(const uint8_t *mac, const uint8_t *ip, const uint8_t *gw, const uint8_t *netmask)
@@ -132,7 +134,7 @@ void stm32_eth_init(const uint8_t *mac, const uint8_t *ip, const uint8_t *gw, co
   if(ip != NULL) {
     IP_ADDR4(&(gconfig.ipaddr),ip[0],ip[1],ip[2],ip[3]);
   } else {
-    #ifdef LWIP_DHCP
+    #if LWIP_DHCP
       ip_addr_set_zero_ip4(&(gconfig.ipaddr));
     #else
       IP_ADDR4(&(gconfig.ipaddr),IP_ADDR0,IP_ADDR1,IP_ADDR2,IP_ADDR3);
@@ -142,7 +144,7 @@ void stm32_eth_init(const uint8_t *mac, const uint8_t *ip, const uint8_t *gw, co
   if(gw != NULL) {
     IP_ADDR4(&(gconfig.gw),gw[0],gw[1],gw[2],gw[3]);
   } else {
-    #ifdef LWIP_DHCP
+    #if LWIP_DHCP
       ip_addr_set_zero_ip4(&(gconfig.gw));
     #else
       IP_ADDR4(&(gconfig.gw),GW_ADDR0,GW_ADDR1,GW_ADDR2,GW_ADDR3);
@@ -152,7 +154,7 @@ void stm32_eth_init(const uint8_t *mac, const uint8_t *ip, const uint8_t *gw, co
   if(netmask != NULL) {
     IP_ADDR4(&(gconfig.netmask),netmask[0],netmask[1],netmask[2],netmask[3]);
   } else {
-    #ifdef LWIP_DHCP
+    #if LWIP_DHCP
       ip_addr_set_zero_ip4(&(gconfig.netmask));
     #else
       IP_ADDR4(&(gconfig.netmask),NETMASK_ADDR0,NETMASK_ADDR1,NETMASK_ADDR2,NETMASK_ADDR3);
@@ -189,9 +191,13 @@ void stm32_eth_scheduler(void) {
   /* Handle LwIP timeouts */
   sys_check_timeouts();
 
+#if LWIP_DHCP
   stm32_DHCP_Periodic_Handle(&gnetif);
+#endif /* LWIP_DHCP */
 }
 
+#if LWIP_DHCP
+
 /**
   * @brief  Returns DHCP activation state
   * @param  None
@@ -337,6 +343,8 @@ uint8_t stm32_get_DHCP_state(void) {
   return DHCP_state;
 }
 
+#endif /* LWIP_DHCP */
+
 /**
   * @brief  Converts IP address in readable format for user.
   * @param  None
@@ -384,6 +392,8 @@ uint32_t stm32_eth_get_dhcpaddr(void) {
   return ip4_addr_get_u32(&(dhcp->server_ip_addr));
 }
 
+#if LWIP_NETIF_LINK_CALLBACK
+
 /**
   * @brief  This function notify user about link status changement.
   * @param  netif: the network interface
@@ -417,6 +427,8 @@ void ethernetif_notify_conn_changed(struct netif *netif)
   }
 }
 
+#endif /* LWIP_NETIF_LINK_CALLBACK */
+
 /**
   * @brief  Notify the User about the nework interface config status
   * @param  netif: the network interface
@@ -437,6 +449,8 @@ void User_notification(struct netif *netif)
   }
 }
 
+#if LWIP_DNS
+
 /**
   * @brief  Initializes DNS
   * @param  dnsaddr: DNS address
@@ -526,6 +540,8 @@ int8_t stm32_dns_gethostbyname(const char *hostname, uint32_t *ipaddr)
   return ret;
 }
 
+#endif /* LWIP_DNS */
+
 /**
   * @brief  Converts a uint8_t IP address to a ip_addr_t address
   * @param  ipu8: pointer to an address to convert
@@ -665,6 +681,8 @@ uint16_t stm32_get_data(struct pbuf_data *data, uint8_t *buffer, size_t size)
   return nb;
 }
 
+#if LWIP_UDP
+
 /**
   * @brief This function is called when an UDP datagram has been received on
   * the port UDP_PORT.
@@ -697,6 +715,10 @@ void udp_receive_callback(void *arg, struct udp_pcb *pcb, struct pbuf *p,
   }
 }
 
+#endif /* LWIP_UDP */
+
+#if LWIP_TCP
+
 /**
   * @brief Function called when TCP connection established
   * @param arg: user supplied argument
@@ -946,6 +968,8 @@ static void tcp_connection_close(struct tcp_pcb *tpcb, struct tcp_struct *tcp)
   tcp->state = TCP_CLOSING;
 }
 
+#endif /* LWIP_TCP */
+
 #ifdef __cplusplus
 }
 #endif

Diff for: libraries/NativeEthernet/src/utility/stm32_eth.h

@@ -48,6 +48,7 @@
 #include "lwip/dhcp.h"
 #include "lwip/udp.h"
 #include "lwip/tcp.h"
+#include "lwip/opt.h"
 
 /* Exported types ------------------------------------------------------------*/
 /* TCP connection state */
@@ -124,19 +125,31 @@ void stm32_eth_scheduler(void);
 
 void User_notification(struct netif *netif);
 
+#if LWIP_DHCP
 void stm32_DHCP_Process(struct netif *netif);
 void stm32_DHCP_Periodic_Handle(struct netif *netif);
 void stm32_DHCP_manual_config(void);
 uint8_t stm32_get_DHCP_lease_state(void);
 void stm32_set_DHCP_state(uint8_t state);
 uint8_t stm32_get_DHCP_state(void);
 uint8_t stm32_dhcp_started(void);
+#else
+#error "LWIP_DHCP must be enabled in lwipopts.h"
+#endif
 
+#if LWIP_DNS
 void stm32_dns_init(const uint8_t *dnsaddr);
 int8_t stm32_dns_gethostbyname(const char *hostname, uint32_t *ipaddr);
+#else
+#error "LWIP_DNS must be enabled in lwipopts.h"
+#endif
 
+#if LWIP_UDP
 void udp_receive_callback(void *arg, struct udp_pcb *pcb, struct pbuf *p,
                           const ip_addr_t *addr, u16_t port);
+#else
+#error "LWIP_UDP must be enabled in lwipopts.h"
+#endif
 
 uint32_t stm32_eth_get_ipaddr(void);
 uint32_t stm32_eth_get_gwaddr(void);
@@ -151,8 +164,12 @@ uint16_t stm32_get_data(struct pbuf_data *data, uint8_t *buffer, size_t size);
 ip_addr_t *u8_to_ip_addr(uint8_t *ipu8, ip_addr_t *ipaddr);
 uint32_t ip_addr_to_u32(ip_addr_t *ipaddr);
 
+#if LWIP_TCP
 err_t tcp_connected_callback(void *arg, struct tcp_pcb *tpcb, err_t err);
 err_t tcp_accept_callback(void *arg, struct tcp_pcb *newpcb, err_t err);
+#else
+#error "LWIP_TCP must be enabled in lwipopts.h"
+#endif
 
 #ifdef __cplusplus
 }