mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2025-02-04 21:39:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

iana.h: Prefix #defines with LWIP_

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-08-08 11:21:11 +02:00
parent 79a08c9fee
commit 5193844ac4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ipv4/dhcp.c
View File

@ -1909,7 +1909,7 @@ dhcp_create_msg(struct netif *netif, struct dhcp *dhcp, u8_t message_type, u16_t
msg_out->op = DHCP_BOOTREQUEST; msg_out->op = DHCP_BOOTREQUEST;
/* @todo: make link layer independent */ /* @todo: make link layer independent */
msg_out->htype = IANA_HWTYPE_ETHERNET; msg_out->htype = LWIP_IANA_HWTYPE_ETHERNET;
msg_out->hlen = netif->hwaddr_len; msg_out->hlen = netif->hwaddr_len;
msg_out->xid = lwip_htonl(dhcp->xid); msg_out->xid = lwip_htonl(dhcp->xid);
/* we don't need the broadcast flag since we can receive unicast traffic /* we don't need the broadcast flag since we can receive unicast traffic

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

@ -651,7 +651,7 @@ etharp_input(struct pbuf *p, struct netif *netif)
hdr = (struct etharp_hdr *)p->payload; hdr = (struct etharp_hdr *)p->payload;
/* RFC 826 "Packet Reception": */ /* RFC 826 "Packet Reception": */
if ((hdr->hwtype != PP_HTONS(IANA_HWTYPE_ETHERNET)) || if ((hdr->hwtype != PP_HTONS(LWIP_IANA_HWTYPE_ETHERNET)) ||
(hdr->hwlen != ETH_HWADDR_LEN) || (hdr->hwlen != ETH_HWADDR_LEN) ||
(hdr->protolen != sizeof(ip4_addr_t)) || (hdr->protolen != sizeof(ip4_addr_t)) ||
(hdr->proto != PP_HTONS(ETHTYPE_IP))) { (hdr->proto != PP_HTONS(ETHTYPE_IP))) {
@ -1140,7 +1140,7 @@ etharp_raw(struct netif *netif, const struct eth_addr *ethsrc_addr,
IPADDR_WORDALIGNED_COPY_FROM_IP4_ADDR_T(&hdr->sipaddr, ipsrc_addr); IPADDR_WORDALIGNED_COPY_FROM_IP4_ADDR_T(&hdr->sipaddr, ipsrc_addr);
IPADDR_WORDALIGNED_COPY_FROM_IP4_ADDR_T(&hdr->dipaddr, ipdst_addr); IPADDR_WORDALIGNED_COPY_FROM_IP4_ADDR_T(&hdr->dipaddr, ipdst_addr);
hdr->hwtype = PP_HTONS(IANA_HWTYPE_ETHERNET); hdr->hwtype = PP_HTONS(LWIP_IANA_HWTYPE_ETHERNET);
hdr->proto = PP_HTONS(ETHTYPE_IP); hdr->proto = PP_HTONS(ETHTYPE_IP);
/* set hwlen and protolen */ /* set hwlen and protolen */
hdr->hwlen = ETH_HWADDR_LEN; hdr->hwlen = ETH_HWADDR_LEN;

3
src/include/lwip/prot/iana.h
View File

@ -42,7 +42,8 @@
extern "C" { extern "C" {
#endif #endif
#define IANA_HWTYPE_ETHERNET 1 /** Hardware types */
#define LWIP_IANA_HWTYPE_ETHERNET 1
#ifdef __cplusplus #ifdef __cplusplus
} }