abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 21:44:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor cleaup in (eth)arp

Browse Source
This commit is contained in:
goldsimon 2016-08-19 12:49:02 +02:00
parent 55d05092ef
commit ed566cceaa
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/ipv4/etharp.c
View File

@ -72,8 +72,6 @@
*/ */
#define ARP_MAXPENDING 5 #define ARP_MAXPENDING 5
#define HWTYPE_ETHERNET 1
enum etharp_state { enum etharp_state {
ETHARP_STATE_EMPTY = 0, ETHARP_STATE_EMPTY = 0,
ETHARP_STATE_PENDING, ETHARP_STATE_PENDING,
@ -1246,10 +1244,7 @@ etharp_query(struct netif *netif, const ip4_addr_t *ipaddr, struct pbuf *q)
* ERR_MEM if the ARP packet couldn't be allocated * ERR_MEM if the ARP packet couldn't be allocated
* any other err_t on failure * any other err_t on failure
*/ */
#if !LWIP_AUTOIP static err_t
static
#endif /* LWIP_AUTOIP */
err_t
etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr, etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
const struct eth_addr *ethdst_addr, const struct eth_addr *ethdst_addr,
const struct eth_addr *hwsrc_addr, const ip4_addr_t *ipsrc_addr, const struct eth_addr *hwsrc_addr, const ip4_addr_t *ipsrc_addr,

12
src/include/lwip/etharp.h
View File

@ -70,10 +70,6 @@ extern "C" {
/** 1 seconds period */ /** 1 seconds period */
#define ARP_TMR_INTERVAL 1000 #define ARP_TMR_INTERVAL 1000
/** ARP message types (opcodes) */
#define ARP_REQUEST 1
#define ARP_REPLY 2
#if ARP_QUEUEING #if ARP_QUEUEING
/** struct for queueing outgoing packets for unknown address /** struct for queueing outgoing packets for unknown address
* defined here to be accessed by memp.h * defined here to be accessed by memp.h
@ -105,14 +101,6 @@ err_t etharp_add_static_entry(const ip4_addr_t *ipaddr, struct eth_addr *ethaddr
err_t etharp_remove_static_entry(const ip4_addr_t *ipaddr); err_t etharp_remove_static_entry(const ip4_addr_t *ipaddr);
#endif /* ETHARP_SUPPORT_STATIC_ENTRIES */ #endif /* ETHARP_SUPPORT_STATIC_ENTRIES */
#if LWIP_AUTOIP
err_t etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
const struct eth_addr *ethdst_addr,
const struct eth_addr *hwsrc_addr, const ip4_addr_t *ipsrc_addr,
const struct eth_addr *hwdst_addr, const ip4_addr_t *ipdst_addr,
const u16_t opcode);
#endif /* LWIP_AUTOIP */
#endif /* LWIP_IPV4 && LWIP_ARP */ #endif /* LWIP_IPV4 && LWIP_ARP */
void etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p); void etharp_arp_input(struct netif *netif, struct eth_addr *ethaddr, struct pbuf *p);

13
src/include/lwip/prot/arp.h
View File

@ -72,6 +72,19 @@ PACK_STRUCT_END
#define SIZEOF_ETHARP_HDR 28 #define SIZEOF_ETHARP_HDR 28
/* ARP hwtype values */
enum etharp_hwtype {
HWTYPE_ETHERNET = 1
/* others not used */
};
/* ARP message types (opcodes) */
enum etharp_opcode {
ARP_REQUEST = 1,
ARP_REPLY = 2
};
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif