mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-09-13 02:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "netif: ext_callback: make LWIP_NSC_ defines, not an enum; fix mdns accordingly"

Browse Source 
This reverts commit 6934bb4428.
Need to revert commit d6e58d02a6 first, and that one produced merge conflicts.
This commit is contained in:
goldsimon 2018-02-08 12:26:16 +01:00
parent d785561eae
commit 3cf906e073
2 changed files with 50 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/apps/mdns/mdns.c
View File

@ -1905,21 +1905,28 @@ mdns_netif_ext_status_callback(struct netif *netif, netif_nsc_reason_t reason, c
return; return;
} }
if (reason & LWIP_NSC_STATUS_CHANGED) { switch (reason) {
if (args->status_changed.state != 0) { case LWIP_NSC_STATUS_CHANGED:
mdns_resp_restart(netif); if (args->status_changed.state != 0) {
} mdns_resp_restart(netif);
/* TODO: send goodbye message */ }
} /* TODO: send goodbye message */
if (reason & LWIP_NSC_LINK_CHANGED) { break;
if (args->link_changed.state != 0) { case LWIP_NSC_LINK_CHANGED:
mdns_resp_restart(netif); if (args->link_changed.state != 0) {
} mdns_resp_restart(netif);
} }
if (reason & (LWIP_NSC_IPV4_ADDRESS_CHANGED | LWIP_NSC_IPV4_GATEWAY_CHANGED | break;
LWIP_NSC_IPV4_NETMASK_CHANGED | LWIP_NSC_IPV4_SETTINGS_CHANGED | case LWIP_NSC_IPV4_ADDRESS_CHANGED: /* fall through */
LWIP_NSC_IPV6_SET | LWIP_NSC_IPV6_ADDR_STATE_CHANGED)) { case LWIP_NSC_IPV4_GATEWAY_CHANGED: /* fall through */
mdns_resp_announce(netif); case LWIP_NSC_IPV4_NETMASK_CHANGED: /* fall through */
case LWIP_NSC_IPV4_SETTINGS_CHANGED: /* fall through */
case LWIP_NSC_IPV6_SET: /* fall through */
case LWIP_NSC_IPV6_ADDR_STATE_CHANGED:
mdns_resp_announce(netif);
break;
default:
break;
} }
} }
#endif #endif

55
src/include/lwip/netif.h
View File

@ -529,35 +529,36 @@ struct netif* netif_get_by_index(u8_t idx);
/** /**
* @ingroup netif * @ingroup netif
* Extended netif status callback (NSC) reasons flags. * Extended netif status callback (NSC) reasons enumeration.
* May be extended in the future! * May be extended in the future!
*/ */
typedef u16_t netif_nsc_reason_t; typedef enum
{
/* used for initialization only */ /* used for initialization only */
#define LWIP_NSC_NONE 0x0000 LWIP_NSC_NONE = 0,
/** netif was added. arg: NULL. Called AFTER netif was added. */ /** netif was added. arg: NULL. Called AFTER netif was added. */
#define LWIP_NSC_NETIF_ADDED 0x0001 LWIP_NSC_NETIF_ADDED = 0x1,
/** netif was removed. arg: NULL. Called BEFORE netif is removed. */ /** netif was removed. arg: NULL. Called BEFORE netif is removed. */
#define LWIP_NSC_NETIF_REMOVED 0x0002 LWIP_NSC_NETIF_REMOVED = 0x2,
/** link changed */ /** link changed */
#define LWIP_NSC_LINK_CHANGED 0x0004 LWIP_NSC_LINK_CHANGED = 0x4,
/** netif administrative status changed.\n /** netif administrative status changed.\n
* up is called AFTER netif is set up.\n * up is called AFTER netif is set up.\n
* down is called BEFORE the netif is actually set down. */ * down is called BEFORE the netif is actually set down. */
#define LWIP_NSC_STATUS_CHANGED 0x0008 LWIP_NSC_STATUS_CHANGED = 0x8,
/** IPv4 address has changed */ /** IPv4 address has changed */
#define LWIP_NSC_IPV4_ADDRESS_CHANGED 0x0010 LWIP_NSC_IPV4_ADDRESS_CHANGED = 0x10,
/** IPv4 gateway has changed */ /** IPv4 gateway has changed */
#define LWIP_NSC_IPV4_GATEWAY_CHANGED 0x0020 LWIP_NSC_IPV4_GATEWAY_CHANGED = 0x20,
/** IPv4 netmask has changed */ /** IPv4 netmask has changed */
#define LWIP_NSC_IPV4_NETMASK_CHANGED 0x0040 LWIP_NSC_IPV4_NETMASK_CHANGED = 0x40,
/** called AFTER IPv4 address/gateway/netmask changes have been applied */ /** called AFTER IPv4 address/gateway/netmask changes have been applied */
#define LWIP_NSC_IPV4_SETTINGS_CHANGED 0x0080 LWIP_NSC_IPV4_SETTINGS_CHANGED = 0x80,
/** IPv6 address was added */ /** IPv6 address was added */
#define LWIP_NSC_IPV6_SET 0x0100 LWIP_NSC_IPV6_SET = 0x100,
/** IPv6 address state has changed */ /** IPv6 address state has changed */
#define LWIP_NSC_IPV6_ADDR_STATE_CHANGED 0x0200 LWIP_NSC_IPV6_ADDR_STATE_CHANGED = 0x200
} netif_nsc_reason_t;
/** @ingroup netif /** @ingroup netif
* Argument supplied to netif_ext_callback_fn. * Argument supplied to netif_ext_callback_fn.