Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

esp_netif: rename DHCP flags for client and server

Browse source
This commit is contained in:
David Cermak 2019-10-30 20:29:13 +01:00
parent 064bed710e
commit f91d69efb2
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/esp_netif/esp_netif_defaults.c
View file

@ -36,7 +36,7 @@
// Default configuration of common interfaces, such as STA, AP, ETH
//
const esp_netif_inherent_config_t _g_esp_netif_inherent_sta_config = {
.flags = ESP_NETIF_DHCPC | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED,
.flags = ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED,
.lost_ip_event = IP_EVENT_STA_LOST_IP,
.get_ip_event = IP_EVENT_STA_GOT_IP,
.if_key = "WIFI_STA_DEF",
@ -52,7 +52,7 @@ static const esp_netif_ip_info_t soft_ap_ip = {
};
const esp_netif_inherent_config_t _g_esp_netif_inherent_ap_config = {
.flags = ESP_NETIF_DHCPS | ESP_NETIF_FLAG_AUTOUP,
.flags = ESP_NETIF_DHCP_SERVER | ESP_NETIF_FLAG_AUTOUP,
.ip_info = (esp_netif_ip_info_t*)&soft_ap_ip,
.if_key = "WIFI_AP_DEF",
.if_desc = "ap",
@ -62,7 +62,7 @@ const esp_netif_inherent_config_t _g_esp_netif_inherent_ap_config = {
const esp_netif_inherent_config_t _g_esp_netif_inherent_eth_config = {
.get_ip_event = IP_EVENT_ETH_GOT_IP,
.lost_ip_event = 0,
.flags = ESP_NETIF_DHCPC | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED,
.flags = ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED,
.if_key = "ETH_DEF",
.if_desc = "eth",
.route_prio = 50

4
components/esp_netif/include/esp_netif_types.h
View file

@ -123,8 +123,8 @@ typedef struct {
typedef enum esp_netif_flags {
ESP_NETIF_DHCPC = 1 << 0,
ESP_NETIF_DHCPS = 1 << 1,
ESP_NETIF_DHCP_CLIENT = 1 << 0,
ESP_NETIF_DHCP_SERVER = 1 << 1,
ESP_NETIF_FLAG_AUTOUP = 1 << 2,
ESP_NETIF_FLAG_GARP = 1 << 3,
ESP_NETIF_FLAG_EVENT_IP_MODIFIED = 1 << 4

22
components/esp_netif/lwip/esp_netif_lwip.c
View file

@ -574,7 +574,7 @@ static esp_err_t esp_netif_start_api(esp_netif_api_msg_t *msg)
ESP_LOGD(TAG, "%s Setting the lwip netif%p UP", __func__, p_netif);
netif_set_up(p_netif);
}
if (esp_netif->flags&ESP_NETIF_DHCPS) {
if (esp_netif->flags & ESP_NETIF_DHCP_SERVER) {
if (esp_netif->dhcps_status != ESP_NETIF_DHCP_STARTED) {
if (p_netif != NULL && netif_is_up(p_netif)) {
esp_netif_ip_info_t *default_ip = esp_netif->ip_info;
@ -617,12 +617,12 @@ static esp_err_t esp_netif_stop_api(esp_netif_api_msg_t *msg)
return ESP_ERR_ESP_NETIF_IF_NOT_READY;
}
if (esp_netif->flags&ESP_NETIF_DHCPS) {
if (esp_netif->flags & ESP_NETIF_DHCP_SERVER) {
dhcps_stop(lwip_netif); // TODO(IDF-1099): dhcps checks status by its self
if (ESP_NETIF_DHCP_STOPPED != esp_netif->dhcps_status) {
esp_netif->dhcps_status = ESP_NETIF_DHCP_INIT;
}
} else if (esp_netif->flags&ESP_NETIF_DHCPC) {
} else if (esp_netif->flags & ESP_NETIF_DHCP_CLIENT) {
dhcp_release(lwip_netif);
dhcp_stop(lwip_netif);
dhcp_cleanup(lwip_netif);
@ -870,7 +870,7 @@ esp_err_t esp_netif_dhcpc_start(esp_netif_t *esp_netif) _LWIP_TASK_IPC_CALL(esp_
esp_err_t esp_netif_dhcps_get_status(esp_netif_t *esp_netif, esp_netif_dhcp_status_t *status)
{
if (!esp_netif || (esp_netif->flags&ESP_NETIF_DHCPC)) {
if (!esp_netif || (esp_netif->flags & ESP_NETIF_DHCP_CLIENT)) {
return ESP_ERR_INVALID_ARG;
}
@ -880,7 +880,7 @@ esp_err_t esp_netif_dhcps_get_status(esp_netif_t *esp_netif, esp_netif_dhcp_stat
esp_err_t esp_netif_dhcpc_get_status(esp_netif_t *esp_netif, esp_netif_dhcp_status_t *status)
{
if (!esp_netif || (esp_netif->flags&ESP_NETIF_DHCPS)) {
if (!esp_netif || (esp_netif->flags & ESP_NETIF_DHCP_SERVER)) {
return ESP_ERR_INVALID_ARG;
}
@ -1043,7 +1043,7 @@ static esp_err_t esp_netif_down_api(esp_netif_api_msg_t *msg)
struct netif *lwip_netif = esp_netif->lwip_netif;
if (esp_netif->flags&ESP_NETIF_DHCPC && esp_netif->dhcpc_status == ESP_NETIF_DHCP_STARTED) {
if (esp_netif->flags & ESP_NETIF_DHCP_CLIENT && esp_netif->dhcpc_status == ESP_NETIF_DHCP_STARTED) {
dhcp_stop(esp_netif->lwip_netif);
esp_netif->dhcpc_status = ESP_NETIF_DHCP_INIT;
@ -1054,7 +1054,7 @@ static esp_err_t esp_netif_down_api(esp_netif_api_msg_t *msg)
netif_set_addr(lwip_netif, IP4_ADDR_ANY4, IP4_ADDR_ANY4, IP4_ADDR_ANY4);
netif_set_down(lwip_netif);
if (esp_netif->flags&ESP_NETIF_DHCPC) {
if (esp_netif->flags & ESP_NETIF_DHCP_CLIENT) {
esp_netif_start_ip_lost_timer(esp_netif);
}
@ -1148,11 +1148,11 @@ static esp_err_t esp_netif_set_ip_info_api(esp_netif_api_msg_t *msg)
return ESP_ERR_INVALID_STATE;
}
if (esp_netif->flags&ESP_NETIF_DHCPS) {
if (esp_netif->flags & ESP_NETIF_DHCP_SERVER) {
if (esp_netif->dhcps_status != ESP_NETIF_DHCP_STOPPED) {
return ESP_ERR_ESP_NETIF_DHCP_NOT_STOPPED;
}
} else if (esp_netif->flags&ESP_NETIF_DHCPC) {
} else if (esp_netif->flags & ESP_NETIF_DHCP_CLIENT) {
if (esp_netif->dhcpc_status != ESP_NETIF_DHCP_STOPPED) {
return ESP_ERR_ESP_NETIF_DHCP_NOT_STOPPED;
}
@ -1225,7 +1225,7 @@ static esp_err_t esp_netif_set_dns_info_api(esp_netif_api_msg_t *msg)
ip_addr_t *lwip_ip = (ip_addr_t*)&dns->ip;
lwip_ip->type = IPADDR_TYPE_V4;
if (esp_netif->flags&ESP_NETIF_DHCPS) {
if (esp_netif->flags & ESP_NETIF_DHCP_SERVER) {
// if DHCP server configured to set DNS in dhcps API
if (type != ESP_NETIF_DNS_MAIN) {
ESP_LOGD(TAG, "set dns invalid type");
@ -1263,7 +1263,7 @@ static esp_err_t esp_netif_get_dns_info_api(esp_netif_api_msg_t *msg)
return ESP_ERR_ESP_NETIF_INVALID_PARAMS;
}
if (esp_netif->flags&ESP_NETIF_DHCPS) {
if (esp_netif->flags & ESP_NETIF_DHCP_SERVER) {
ip4_addr_t dns_ip = dhcps_dns_getserver();
memcpy(&dns->ip.u_addr.ip4, &dns_ip, sizeof(ip4_addr_t));
} else {

4
components/esp_wifi/src/wifi_default.c
View file

@ -330,7 +330,7 @@ esp_err_t esp_netif_create_default_wifi_mesh_netifs(esp_netif_t **p_netif_sta, e
// Create "almost" default AP, with un-flagged DHCP server
esp_netif_inherent_config_t netif_cfg;
memcpy(&netif_cfg, ESP_NETIF_BASE_DEFAULT_WIFI_AP, sizeof(netif_cfg));
netif_cfg.flags &= ~ESP_NETIF_DHCPS;
netif_cfg.flags &= ~ESP_NETIF_DHCP_SERVER;
esp_netif_config_t cfg_ap = {
.base = &netif_cfg,
.stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_AP,
@ -345,7 +345,7 @@ esp_err_t esp_netif_create_default_wifi_mesh_netifs(esp_netif_t **p_netif_sta, e
// Create "almost" default station, but with un-flagged DHCP client
memcpy(&netif_cfg, ESP_NETIF_BASE_DEFAULT_WIFI_STA, sizeof(netif_cfg));
netif_cfg.flags &= ~ESP_NETIF_DHCPC;
netif_cfg.flags &= ~ESP_NETIF_DHCP_CLIENT;
esp_netif_config_t cfg_sta = {
.base = &netif_cfg,
.stack = ESP_NETIF_NETSTACK_DEFAULT_WIFI_STA,

2
components/lwip/port/esp32/netif/dhcp_state.c
View file

@ -26,7 +26,7 @@
#define DHCP_NAMESPACE "dhcp_state"
// DHCP_Client has to be enabled for this netif
#define VALID_NETIF_ID(netif) (ESP_NETIF_DHCPC&esp_netif_get_flags(netif))
#define VALID_NETIF_ID(netif) (ESP_NETIF_DHCP_CLIENT&esp_netif_get_flags(netif))
bool dhcp_ip_addr_restore(void *netif)
{