Merge remote-tracking branch 'origin/bugfix/TW6738' into wifi

components/lwip/include/lwip/apps/dhcpserver.h

@@ -47,221 +47,6 @@ typedef struct dhcps_msg {
         u8_t options[312];
 }dhcps_msg;
 
-struct dhcps_lease {
-	bool enable;
-	ip4_addr_t start_ip;
-	ip4_addr_t end_ip;
-};
-
-enum dhcps_offer_option{
-	OFFER_START = 0x00,
-	OFFER_ROUTER = 0x01,
-	OFFER_END
-};
-
-struct dhcps_pool{
-	ip4_addr_t ip;
-	u8_t mac[6];
-	u32_t lease_timer;
-};
-
-typedef struct _list_node{
-	void *pnode;
-	struct _list_node *pnext;
-}list_node;
-
-extern u32_t dhcps_lease_time;
-#define DHCPS_LEASE_TIMER  dhcps_lease_time  //0x05A0
-
-#define   dhcps_router_enabled(offer)	((offer & OFFER_ROUTER) != 0)
-void dhcps_start(struct netif *netif);
-void dhcps_stop(struct netif *netif);
-
-bool dhcp_search_ip_on_mac(u8_t *mac, ip4_addr_t *ip);
-#else
-#include "lwip/opt.h"
-
-#include "lwip/netif.h"
-#include "lwip/udp.h"
-
-/** DHCP DEBUG INFO **/
-#define DHCPS_DEBUG 1
-#if DHCPS_DEBUG    	
-#define log_info(message, ...)   do { \
-		printf((message), ##__VA_ARGS__);   \
-		printf("\n");		  \
-	  } while(0);
-	
-#else
-#define log_info(message, ...)
-#endif
-
-#if (!defined(unlikely))
-#define unlikely(Expression)	!!(Expression)
-#endif
-
-#define REQUIRE_ASSERT(Expression) do{if (!(Expression)) log_info("%d\n", __LINE__);}while(0)
-
-#define REQUIRE_ACTION(Expression,Label,Action) \
-	do{\
-		if (unlikely(!(Expression))) \
-		{\
-			log_info("%d\n", __LINE__);\
-			{Action;}\
-			goto Label;\
-		}\
-	}while(0)
-
-#define REQUIRE_NOERROR(Expression,Label) \
-	do{\
-		int LocalError;\
-		LocalError = (int)Expression;\
-		if (unlikely(LocalError != 0)) \
-		{\
-			log_info("%d 0x%x\n", __LINE__, LocalError);\
-			goto Label;\
-		}\
-	}while(0)
-
-#define REQUIRE_NOERROR_ACTION(Expression,Label,Action) \
-	do{\
-		int LocalError;\
-		LocalError = (int)Expression;\
-		if (unlikely(LocalError != 0)) \
-		{\
-			log_info("%d\n", __LINE__);\
-			{Action;}\
-			goto Label;\
-		}\
-	}while(0)
-
-#define DHCP_OK	0
-#define DHCP_FAIL -1
-#define DHCP_SERVER_OPENDNS    0xd043dede /* OpenDNS DNS server 208.67.222.222 */
-
-/* DHCP message */
-/*
- * Code ID of DHCP and BOOTP options
- * as defined in RFC 2132
- */
-typedef enum
-{
-	DHCP_NONE	= 0,
-    DHCPS_DISCOVER = 1,
-    DHCPS_OFFER    = 2,
-    DHCPS_REQUEST  = 3,
-    DHCPS_DECLINE  = 4,
-    DHCPS_ACK      = 5,
-    DHCPS_NAK      = 6,
-    DHCPS_RELEASE  = 7,
-    DHCPS_INFORM   = 8,
-    DHCP_FORCE_RENEW = 9,
-    DHCP_LEASE_QUERY = 10,
-    DHCP_LEASE_UNASSIGNED = 11,
-    DHCP_LEASE_UNKNOWN = 12,
-    DHCP_LEASE_ACTIVE =  13,
-} dhcp_msg_type;
-
-typedef enum
-{
-    BOOTPS = 67,
-    BOOTPC = 68
-} ports;
-
-typedef enum
-{
-    BOOTREQUEST = 1,
-    BOOTREPLY   = 2,
-} op_types;
-
-typedef enum
-{
-    ETHERNET     = 0x01,
-    ETHERNET_LAN = 0x06,
-    ETHEFDDI = 0x08,
-    ETHEIEEE1394 = 0x18
-} hardware_types;
-
-typedef enum
-{
-    DHCPS_CHADDR_LEN = 16U,
-    DHCPS_SNAME_LEN = 64U,
-    DHCPS_FILE_LEN = 128U,
-    DHCP_HEADER_SIZE = 236U // without size of options
-} head_size;
-
-typedef struct dhcps
-{
-    /** transaction identifier of last sent request */
-    u32_t xid;
-    /** incoming msg */
-    struct dhcps_msg *msg_in;
-    /** track PCB allocation state */
-    u8_t pcb_allocated;
-    /** current DHCP state machine state */
-    u8_t state;
-    /** retries of current request */
-    u8_t tries;
-#if LWIP_DHCP_AUTOIP_COOP
-    u8_t autoip_coop_state;
-#endif
-    u8_t subnet_mask_given;
-
-    struct pbuf *p_out; /* pbuf of outcoming msg */
-    struct dhcp_msg *msg_out; /* outgoing msg */
-    u16_t options_out_len; /* outgoing msg options length */
-    u16_t request_timeout; /* #ticks with period DHCP_FINE_TIMER_SECS for request timeout */
-    u16_t t1_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for renewal time */
-    u16_t t2_timeout;  /* #ticks with period DHCP_COARSE_TIMER_SECS for rebind time */
-    u16_t t1_renew_time;  /* #ticks with period DHCP_COARSE_TIMER_SECS until next renew try */
-    u16_t t2_rebind_time; /* #ticks with period DHCP_COARSE_TIMER_SECS until next rebind try */
-    u16_t lease_used; /* #ticks with period DHCP_COARSE_TIMER_SECS since last received DHCP ack */
-    u16_t t0_timeout; /* #ticks with period DHCP_COARSE_TIMER_SECS for lease time */
-    ip_addr_t server_ip_addr; /* dhcp server address that offered this lease (ip_addr_t because passed to UDP) */
-    ip4_addr_t offered_ip_addr;
-    ip4_addr_t offered_sn_mask;
-    ip4_addr_t offered_gw_addr;
-
-    u32_t offered_t0_lease; /* lease period (in seconds) */
-    u32_t offered_t1_renew; /* recommended renew time (usually 50% of lease period) */
-    u32_t offered_t2_rebind; /* recommended rebind time (usually 87.5 of lease period)  */
-#if LWIP_DHCP_BOOTP_FILE
-    ip_addr_t offered_si_addr;
-    char boot_file_name[DHCP_FILE_LEN];
-#endif /* LWIP_DHCP_BOOTPFILE */
-
-} dhcps;
-
-typedef struct dhcp_message
-{
-    PACK_STRUCT_FLD_8(u8_t op);
-    PACK_STRUCT_FLD_8(u8_t htype);
-    PACK_STRUCT_FLD_8(u8_t hlen);
-    PACK_STRUCT_FLD_8(u8_t hops);
-    PACK_STRUCT_FIELD(u32_t xid);
-    PACK_STRUCT_FIELD(u16_t secs);
-    PACK_STRUCT_FIELD(u16_t flags);
-    PACK_STRUCT_FLD_S(ip4_addr_p_t ciaddr);
-    PACK_STRUCT_FLD_S(ip4_addr_p_t yiaddr);
-    PACK_STRUCT_FLD_S(ip4_addr_p_t siaddr);
-    PACK_STRUCT_FLD_S(ip4_addr_p_t giaddr);
-    PACK_STRUCT_FLD_8(u8_t chaddr[DHCPS_CHADDR_LEN]);
-    PACK_STRUCT_FLD_8(u8_t sname[DHCPS_SNAME_LEN]);
-    PACK_STRUCT_FLD_8(u8_t file[DHCPS_FILE_LEN]);
-//    PACK_STRUCT_FIELD(u32_t cookie);
-#define DHCPS_MIN_OPTIONS_LEN 312U
-    /** make sure user does not configure this too small */
-#if ((defined(DHCPS_OPTIONS_LEN)) && (DHCPS_OPTIONS_LEN < DHCPS_MIN_OPTIONS_LEN))
-#undef DHCPS_OPTIONS_LEN
-#endif
-    /** allow this to be configured in lwipopts.h, but not too small */
-#if (!defined(DHCPS_OPTIONS_LEN))
-    /** set this to be sufficient for your options in outgoing DHCP msgs */
-#define DHCPS_OPTIONS_LEN DHCPS_MIN_OPTIONS_LEN
-#endif
-    PACK_STRUCT_FLD_8(u8_t options[DHCPS_OPTIONS_LEN]);
-} dhcp_message;
-
 /** DHCP OPTIONS CODE **/
 typedef enum
 {
@@ -379,117 +164,51 @@ typedef enum
     CLASSLESS_ROUTE = 121,
 } dhcp_msg_option;
 
-typedef struct dhcp_option
-{
-    uint8_t id;        // option id
-    uint8_t len;       // option length
-    uint8_t data[256]; // option data
 
-    STAILQ_ENTRY(dhcp_option) pointers; // pointers, see queue(3)
+/*   Defined in esp_misc.h */
-} dhcp_option;
+//struct dhcps_lease {
+//	bool enable;
+//	ip4_addr_t start_ip;
+//	ip4_addr_t end_ip;
+//};
 
-typedef STAILQ_HEAD(dhcp_option_list_, dhcp_option) DHCP_OPTION_LIST;
+enum dhcps_offer_option{
-typedef struct dhcp_option_list_ dhcp_option_list;
+	OFFER_START = 0x00,
-
+	OFFER_ROUTER = 0x01,
-/*
+	OFFER_END
- * Header to manage the database of address bindings.
- */
-
-// static association or dynamic
-enum
-{
-    DYNAMIC = 0,
-    STATIC  = 1,
-    STATIC_OR_DYNAMIC = 2
 };
 
-// binding status
+#define DHCPS_MAX_LEASE 0x64
-enum
+#define DHCPS_LEASE_TIME_DEF	(120)
-{
+
-    EMPTY = 0,
+struct dhcps_pool{
-    ASSOCIATED,
+	ip4_addr_t ip;
-    PENDINGD,
+	u8_t mac[6];
-    EXPIRED,
+	u32_t lease_timer;
-    RELEASED
 };
 
-/*
+typedef struct _list_node{
- * IP address used to delimitate an address pool.
+	void *pnode;
- */
+	struct _list_node *pnext;
-typedef struct pool_indexes
+}list_node;
-{
-    uint32_t first;    // first address of the pool
-    uint32_t last;     // last address of the pool
-    uint32_t current;  // current available address
-}pool_indexes;
 
-/*
+typedef u32_t dhcps_time_t;
- * The bindings are organized as a double linked list
+typedef u8_t dhcps_offer_t;
- * using the standard queue(3) library
+typedef struct dhcps_lease dhcps_lease_t;
- */
-typedef struct address_binding
-{
-    uint32_t address;     // address
-    uint8_t cident_len;   // client identifier len
-    uint8_t cident[256];  // client identifier
 
-    time_t binding_time;  // time of binding
+typedef struct _dhcps_options{
-    time_t lease_time;    // duration of lease
+	dhcps_offer_t dhcps_offer;
+	dhcps_time_t  dhcps_time;
+	dhcps_lease_t dhcps_poll;
+}dhcps_options_t;
 
-    int status;           // binding status
+#define   dhcps_router_enabled(offer)	((offer & OFFER_ROUTER) != 0)
-    int is_static;        // check if it is a static binding
+void dhcps_start(struct netif *netif, struct ip_info *info);
-
-    STAILQ_ENTRY(address_binding) pointers; // list pointers, see queue(3)
-}address_binding;
-
-typedef STAILQ_HEAD(binding_list_, address_binding) BINDING_LIST_HEAD;
-typedef struct binding_list_ binding_list;
-
-/*
- * Global association pool.
- *
- * The (static or dynamic) associations tables of the DHCP server,
- * are maintained in this global structure.
- *
- * Note: all the IP addresses are in host order,
- *       to allow an easy manipulation.
- */
-
-typedef struct address_pool
-{
-    uint32_t server_id; // this server id (IP address)
-    uint32_t netmask;   // network mask
-    uint32_t gateway;   // network gateway
-
-    char device[16];    // network device to use
-
-    pool_indexes indexes;  // used to delimitate a pool of available addresses
-
-    time_t lease_time;   // default lease time
-    time_t pending_time; // duration of a binding in the pending state
-    struct udp_pcb *socket;	   // 
-    bool   flags;
-
-    dhcp_option_list options; // options for this pool, see queue
-
-    binding_list bindings; // associated addresses, see queue(3)
-}address_pool;
-
-/*
- * Internal representation of a DHCP message,
- * with options parsed into a list...
- */
-typedef struct dhcps_msg
-{
-    dhcp_message     hdr;
-    dhcp_option_list opts;
-} dhcps_msg;
-
-bool dhcps_option_set(u8_t opt_id, void* optarg);
-void dhcps_start(struct netif *netif, struct dhcps_lease *lease_pool);
 void dhcps_stop(struct netif *netif);
-bool dhcps_lease_set(struct dhcps_lease *please);
+void *dhcps_option_info(u8_t op_id, u32_t opt_len);
-bool dhcps_lease_get(struct dhcps_lease *please);
+bool dhcp_search_ip_on_mac(u8_t *mac, ip4_addr_t *ip);
 
 #endif
+
 #endif
+

components/tcpip_adapter/include/tcpip_adapter.h

@@ -32,6 +32,15 @@ struct ip_info {
     ip4_addr_t gw;
 };
 
+/*   Defined in esp_misc.h */
+struct dhcps_lease {
+	bool enable;
+	ip4_addr_t start_ip;
+	ip4_addr_t end_ip;
+};
+
+typedef struct dhcps_lease tcpip_adapter_dhcps_lease;
+
 #endif
 
 #if CONFIG_DHCP_STA_LIST 
@@ -65,6 +74,21 @@ typedef enum {
     TCPIP_ADAPTER_DHCP_STATUS_MAX
 } tcpip_adapter_dhcp_status_t;
 
+/*op*/
+typedef enum{
+    TCPIP_ADAPTER_OP_START = 0,
+    TCPIP_ADAPTER_OP_SET,
+    TCPIP_ADAPTER_OP_GET,
+    TCPIP_ADAPTER_OP_MAX
+} tcpip_adapter_option_mode;
+
+typedef enum{
+    TCPIP_ADAPTER_ROUTER_SOLICITATION_ADDRESS = 32,
+    TCPIP_ADAPTER_REQUESTED_IP_ADDRESS = 50,
+    TCPIP_ADAPTER_IP_ADDRESS_LEASE_TIME = 51,
+    TCPIP_ADAPTER_IP_REQUEST_RETRY_TIME = 52,
+} tcpip_adapter_option_id;
+
 void tcpip_adapter_init(void);
 
 esp_err_t tcpip_adapter_start(tcpip_adapter_if_t tcpip_if, uint8_t *mac, struct ip_info *info);
@@ -86,15 +110,13 @@ esp_err_t tcpip_adapter_set_mac(tcpip_adapter_if_t tcpip_if, uint8_t *mac);
 #endif
 
 esp_err_t tcpip_adapter_dhcps_get_status(tcpip_adapter_if_t tcpip_if, tcpip_adapter_dhcp_status_t *status);
-
+esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_option_mode opt_op, tcpip_adapter_option_id opt_id, void *opt_val, uint32_t opt_len);
 esp_err_t tcpip_adapter_dhcps_start(tcpip_adapter_if_t tcpip_if);
-
 esp_err_t tcpip_adapter_dhcps_stop(tcpip_adapter_if_t tcpip_if);
 
 esp_err_t tcpip_adapter_dhcpc_get_status(tcpip_adapter_if_t tcpip_if, tcpip_adapter_dhcp_status_t *status);
-
+esp_err_t tcpip_adapter_dhcpc_option(tcpip_adapter_option_mode opt_op, tcpip_adapter_option_id opt_id, void *opt_val, uint32_t opt_len);
 esp_err_t tcpip_adapter_dhcpc_start(tcpip_adapter_if_t tcpip_if);
-
 esp_err_t tcpip_adapter_dhcpc_stop(tcpip_adapter_if_t tcpip_if);
 
 esp_err_t tcpip_adapter_sta_input(void *buffer, uint16_t len, void* eb);

components/tcpip_adapter/tcpip_adapter_lwip.c

@@ -76,7 +76,7 @@ esp_err_t tcpip_adapter_start(tcpip_adapter_if_t tcpip_if, uint8_t *mac, struct
         netif_set_up(esp_netif[tcpip_if]);
 
         if (dhcps_status == TCPIP_ADAPTER_DHCP_INIT) {
-            dhcps_start(esp_netif[tcpip_if]);
+            dhcps_start(esp_netif[tcpip_if], info);
             printf("dhcp server start:(ip: %s, mask: %s, gw: %s)\n", inet_ntoa(info->ip), inet_ntoa(info->netmask), inet_ntoa(info->gw));
             dhcps_status = TCPIP_ADAPTER_DHCP_STARTED;
         }
@@ -302,6 +302,99 @@ esp_err_t tcpip_adapter_dhcps_get_status(tcpip_adapter_if_t tcpip_if, tcpip_adap
     return ESP_OK;
 }
 
+esp_err_t tcpip_adapter_dhcps_option(tcpip_adapter_option_mode opt_op, tcpip_adapter_option_id opt_id, void *opt_val, uint32_t opt_len)
+{
+    void *opt_info = dhcps_option_info(opt_id, opt_len);
+
+    if (opt_info == NULL || opt_val == NULL) {
+        return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+    }
+
+    if (opt_op == TCPIP_ADAPTER_OP_GET) {
+        if (dhcps_status == TCPIP_ADAPTER_DHCP_STOPED) {
+            return ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STOPED;
+        }
+
+        switch (opt_id) {
+            case IP_ADDRESS_LEASE_TIME:
+            {
+                *(uint32_t*)opt_val = *(uint32_t*)opt_info;
+                break;
+            }
+            case REQUESTED_IP_ADDRESS:
+            {
+                memcpy(opt_val, opt_info, opt_len);
+                break;
+            }
+            case ROUTER_SOLICITATION_ADDRESS:
+            {
+                *(uint8_t *)opt_val = (*(uint8_t *)opt_info) & OFFER_ROUTER;
+                break;
+            }
+            default:
+                break;
+        }
+    } else if (opt_op == TCPIP_ADAPTER_OP_SET) {
+        if (dhcps_status == TCPIP_ADAPTER_DHCP_STARTED) {
+            return ESP_ERR_TCPIP_ADAPTER_DHCP_ALREADY_STARTED;
+        }
+
+        switch (opt_id) {
+            case IP_ADDRESS_LEASE_TIME:
+            {
+                if (*(uint32_t*)opt_val != 0)
+                    *(uint32_t*)opt_info = *(uint32_t*)opt_val;
+                else
+                    *(uint32_t*)opt_info = DHCPS_LEASE_TIME_DEF;    
+                break;
+            }
+            case REQUESTED_IP_ADDRESS:
+            {
+                struct ip_info info;
+                uint32_t softap_ip = 0;
+                uint32_t start_ip = 0;
+                uint32_t end_ip = 0;
+                struct dhcps_lease *poll = opt_val;
+
+                memset(&info, 0x00, sizeof(struct ip_info));
+                tcpip_adapter_get_ip_info(WIFI_IF_AP, &info);
+                softap_ip = htonl(info.ip.addr);
+                start_ip = htonl(poll->start_ip.addr);
+                end_ip = htonl(poll->end_ip.addr);
+
+                /*config ip information can't contain local ip*/
+                if ((start_ip <= softap_ip) && (softap_ip <= end_ip))
+                       return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+
+                /*config ip information must be in the same segment as the local ip*/
+                softap_ip >>= 8;
+                if ((start_ip >> 8 != softap_ip)
+                    || (end_ip >> 8 != softap_ip)) {
+                       return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+                }
+
+                if (end_ip - start_ip > DHCPS_MAX_LEASE) {
+                       return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+                }
+
+                memcpy(opt_info, opt_val, opt_len);
+                break;
+            }
+            case ROUTER_SOLICITATION_ADDRESS:
+            {
+                *(uint8_t *)opt_info = (*(uint8_t *)opt_val) & OFFER_ROUTER;
+                break;
+            }
+            default:
+                break;
+        }
+    } else {
+        return ESP_ERR_TCPIP_ADAPTER_INVALID_PARAMS;
+    }
+
+    return ESP_OK;
+}
+
 esp_err_t tcpip_adapter_dhcps_start(tcpip_adapter_if_t tcpip_if)
 {
     /* only support ap now */
@@ -314,7 +407,9 @@ esp_err_t tcpip_adapter_dhcps_start(tcpip_adapter_if_t tcpip_if)
         struct netif *p_netif = esp_netif[tcpip_if];
 
         if (p_netif != NULL && netif_is_up(p_netif)) {
-            dhcps_start(p_netif);
+            struct ip_info default_ip;
+            tcpip_adapter_get_ip_info(WIFI_IF_AP, &default_ip);
+            dhcps_start(p_netif, &default_ip);
             dhcps_status = TCPIP_ADAPTER_DHCP_STARTED;
             TCPIP_ADAPTER_DEBUG("dhcp server start successfully\n");
             return ESP_OK;
@@ -363,6 +458,12 @@ esp_err_t tcpip_adapter_dhcpc_get_status(tcpip_adapter_if_t tcpip_if, tcpip_adap
     return ESP_OK;
 }
 
+esp_err_t tcpip_adapter_dhcpc_option(tcpip_adapter_option_mode opt_op, tcpip_adapter_option_id opt_id, void *opt_val, uint32_t opt_len)
+{
+    // TODO: when dhcp request timeout,change the retry count
+    return ESP_OK;
+}
+
 esp_err_t tcpip_adapter_dhcpc_start(tcpip_adapter_if_t tcpip_if)
 {
     /* only support sta now, need to support ethernet */