abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2026-08-11 18:13:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Continued chrysn's work: changed nearly all functions taking 'ip(X)_addr_t' pointer to take const pointers (changed user callbacks: raw_recv_fn, udp_recv_fn; changed port callbacks: netif_output_fn, netif_igmp_mac_filter_fn)

Browse Source
This commit is contained in:
sg
2015-02-22 21:46:35 +01:00
parent 9f065c0ea5
commit ec5cf8593e
24 changed files with 100 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/dhcp.c
View File

@@ -179,7 +179,7 @@ static err_t dhcp_reboot(struct netif *netif);
static void dhcp_set_state(struct dhcp *dhcp, u8_t new_state);
/* receive, unfold, parse and free incoming messages */
static void dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
static void dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
/* set the DHCP timers */
static void dhcp_timeout(struct netif *netif);
@@ -1581,7 +1581,7 @@ decode_next:
* If an incoming DHCP message is in response to us, then trigger the state machine
*/
static void
dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
dhcp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
{
struct netif *netif = (struct netif *)arg;
struct dhcp *dhcp = netif->dhcp;

4
src/core/dns.c
View File

@@ -277,7 +277,7 @@ static void dns_init_local();
/* forward declarations */
static void dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
static void dns_recv(void *s, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
static void dns_check_entries(void);
/*-----------------------------------------------------------------------------
@@ -979,7 +979,7 @@ dns_check_entries(void)
* @params see udp.h
*/
static void
dns_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
dns_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
{
u8_t i, entry_idx = DNS_TABLE_SIZE;
u16_t txid;

4
src/core/inet_chksum.c
View File

@@ -340,7 +340,7 @@ inet_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
*/
u16_t
ip6_chksum_pseudo(struct pbuf *p, u8_t proto, u16_t proto_len,
ip6_addr_t *src, ip6_addr_t *dest)
const ip6_addr_t *src, const ip6_addr_t *dest)
{
u32_t acc = 0;
u32_t addr;
@@ -455,7 +455,7 @@ inet_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
*/
u16_t
ip6_chksum_pseudo_partial(struct pbuf *p, u8_t proto, u16_t proto_len,
u16_t chksum_len, ip6_addr_t *src, ip6_addr_t *dest)
u16_t chksum_len, const ip6_addr_t *src, const ip6_addr_t *dest)
{
u32_t acc = 0;
u32_t addr;

12
src/core/ipv4/igmp.c
View File

@@ -135,7 +135,7 @@ PACK_STRUCT_END
#endif
static struct igmp_group *igmp_lookup_group(struct netif *ifp, ip_addr_t *addr);
static struct igmp_group *igmp_lookup_group(struct netif *ifp, const ip_addr_t *addr);
static err_t igmp_remove_group(struct igmp_group *group);
static void igmp_timeout( struct igmp_group *group);
static void igmp_start_timer(struct igmp_group *group, u8_t max_time);
@@ -287,7 +287,7 @@ igmp_report_groups(struct netif *netif)
* NULL if the group wasn't found.
*/
struct igmp_group *
igmp_lookfor_group(struct netif *ifp, ip_addr_t *addr)
igmp_lookfor_group(struct netif *ifp, const ip_addr_t *addr)
{
struct igmp_group *group = igmp_group_list;
@@ -313,7 +313,7 @@ igmp_lookfor_group(struct netif *ifp, ip_addr_t *addr)
* NULL on memory error.
*/
struct igmp_group *
igmp_lookup_group(struct netif *ifp, ip_addr_t *addr)
igmp_lookup_group(struct netif *ifp, const ip_addr_t *addr)
{
struct igmp_group *group = igmp_group_list;
@@ -386,7 +386,7 @@ igmp_remove_group(struct igmp_group *group)
* @param dest destination ip address of the igmp packet
*/
void
igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest)
igmp_input(struct pbuf *p, struct netif *inp, const ip_addr_t *dest)
{
struct igmp_msg* igmp;
struct igmp_group* group;
@@ -510,7 +510,7 @@ igmp_input(struct pbuf *p, struct netif *inp, ip_addr_t *dest)
* @return ERR_OK if group was joined on the netif(s), an err_t otherwise
*/
err_t
igmp_joingroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)
igmp_joingroup(const ip_addr_t *ifaddr, const ip_addr_t *groupaddr)
{
err_t err = ERR_VAL; /* no matching interface */
struct igmp_group *group;
@@ -580,7 +580,7 @@ igmp_joingroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)
* @return ERR_OK if group was left on the netif(s), an err_t otherwise
*/
err_t
igmp_leavegroup(ip_addr_t *ifaddr, ip_addr_t *groupaddr)
igmp_leavegroup(const ip_addr_t *ifaddr, const ip_addr_t *groupaddr)
{
err_t err = ERR_VAL; /* no matching interface */
struct igmp_group *group;

2
src/core/ipv6/ethip6.c
View File

@@ -133,7 +133,7 @@ ethip6_send(struct netif *netif, struct pbuf *p, struct eth_addr *src, struct et
* or the return type of either etharp_query() or etharp_send_ip().
*/
err_t
ethip6_output(struct netif *netif, struct pbuf *q, ip6_addr_t *ip6addr)
ethip6_output(struct netif *netif, struct pbuf *q, const ip6_addr_t *ip6addr)
{
struct eth_addr dest;
s8_t i;

10
src/core/ipv6/ip6.c
View File

@@ -78,7 +78,7 @@
* @return the netif on which to send to reach dest
*/
struct netif *
ip6_route(struct ip6_addr *src, struct ip6_addr *dest)
ip6_route(const struct ip6_addr *src, const struct ip6_addr *dest)
{
struct netif *netif;
s8_t i;
@@ -156,7 +156,7 @@ ip6_route(struct ip6_addr *src, struct ip6_addr *dest)
* source address is found
*/
ip6_addr_t *
ip6_select_source_address(struct netif *netif, ip6_addr_t * dest)
ip6_select_source_address(struct netif *netif, const ip6_addr_t * dest)
{
ip6_addr_t * src = NULL;
u8_t i;
@@ -744,11 +744,11 @@ ip6_input_cleanup:
* returns errors returned by netif->output
*/
err_t
ip6_output_if(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
ip6_output_if(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
u8_t hl, u8_t tc,
u8_t nexth, struct netif *netif)
{
ip6_addr_t *src_used = src;
const ip6_addr_t *src_used = src;
if (dest != IP_HDRINCL) {
if (src != NULL && ip6_addr_isany(src)) {
src = ip6_select_source_address(netif, dest);
@@ -768,7 +768,7 @@ ip6_output_if(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
* when it is 'any'.
*/
err_t
ip6_output_if_src(struct pbuf *p, ip6_addr_t *src, ip6_addr_t *dest,
ip6_output_if_src(struct pbuf *p, const ip6_addr_t *src, const ip6_addr_t *dest,
u8_t hl, u8_t tc,
u8_t nexth, struct netif *netif)
{

10
src/core/ipv6/mld6.c
View File

@@ -76,7 +76,7 @@ static struct mld_group* mld_group_list;
/* Forward declarations. */
static struct mld_group * mld6_new_group(struct netif *ifp, ip6_addr_t *addr);
static struct mld_group * mld6_new_group(struct netif *ifp, const ip6_addr_t *addr);
static err_t mld6_free_group(struct mld_group *group);
static void mld6_delayed_report(struct mld_group *group, u16_t maxresp);
static void mld6_send(struct mld_group *group, u8_t type);
@@ -150,7 +150,7 @@ mld6_report_groups(struct netif *netif)
* NULL if the group wasn't found.
*/
struct mld_group *
mld6_lookfor_group(struct netif *ifp, ip6_addr_t *addr)
mld6_lookfor_group(struct netif *ifp, const ip6_addr_t *addr)
{
struct mld_group *group = mld_group_list;
@@ -174,7 +174,7 @@ mld6_lookfor_group(struct netif *ifp, ip6_addr_t *addr)
* NULL on memory error.
*/
static struct mld_group *
mld6_new_group(struct netif *ifp, ip6_addr_t *addr)
mld6_new_group(struct netif *ifp, const ip6_addr_t *addr)
{
struct mld_group *group;
@@ -324,7 +324,7 @@ mld6_input(struct pbuf *p, struct netif *inp)
* @return ERR_OK if group was joined on the netif(s), an err_t otherwise
*/
err_t
mld6_joingroup(ip6_addr_t *srcaddr, ip6_addr_t *groupaddr)
mld6_joingroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr)
{
err_t err = ERR_VAL; /* no matching interface */
struct mld_group *group;
@@ -391,7 +391,7 @@ mld6_joingroup(ip6_addr_t *srcaddr, ip6_addr_t *groupaddr)
* @return ERR_OK if group was left on the netif(s), an err_t otherwise
*/
err_t
mld6_leavegroup(ip6_addr_t *srcaddr, ip6_addr_t *groupaddr)
mld6_leavegroup(const ip6_addr_t *srcaddr, const ip6_addr_t *groupaddr)
{
err_t err = ERR_VAL; /* no matching interface */
struct mld_group *group;

40
src/core/ipv6/nd6.c
View File

@@ -82,21 +82,21 @@ static ip6_addr_t multicast_address;
static u8_t nd6_ra_buffer[sizeof(struct prefix_option)];
/* Forward declarations. */
static s8_t nd6_find_neighbor_cache_entry(ip6_addr_t * ip6addr);
static s8_t nd6_find_neighbor_cache_entry(const ip6_addr_t * ip6addr);
static s8_t nd6_new_neighbor_cache_entry(void);
static void nd6_free_neighbor_cache_entry(s8_t i);
static s8_t nd6_find_destination_cache_entry(ip6_addr_t * ip6addr);
static s8_t nd6_find_destination_cache_entry(const ip6_addr_t * ip6addr);
static s8_t nd6_new_destination_cache_entry(void);
static s8_t nd6_is_prefix_in_netif(ip6_addr_t * ip6addr, struct netif * netif);
static s8_t nd6_get_router(ip6_addr_t * router_addr, struct netif * netif);
static s8_t nd6_new_router(ip6_addr_t * router_addr, struct netif * netif);
static s8_t nd6_is_prefix_in_netif(const ip6_addr_t * ip6addr, struct netif * netif);
static s8_t nd6_get_router(const ip6_addr_t * router_addr, struct netif * netif);
static s8_t nd6_new_router(const ip6_addr_t * router_addr, struct netif * netif);
static s8_t nd6_get_onlink_prefix(ip6_addr_t * prefix, struct netif * netif);
static s8_t nd6_new_onlink_prefix(ip6_addr_t * prefix, struct netif * netif);
#define ND6_SEND_FLAG_MULTICAST_DEST 0x01
#define ND6_SEND_FLAG_ALLNODES_DEST 0x02
static void nd6_send_ns(struct netif * netif, ip6_addr_t * target_addr, u8_t flags);
static void nd6_send_na(struct netif * netif, ip6_addr_t * target_addr, u8_t flags);
static void nd6_send_ns(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags);
static void nd6_send_na(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags);
#if LWIP_IPV6_SEND_ROUTER_SOLICIT
static void nd6_send_rs(struct netif * netif);
#endif /* LWIP_IPV6_SEND_ROUTER_SOLICIT */
@@ -794,7 +794,7 @@ nd6_tmr(void)
* @param flags one of ND6_SEND_FLAG_*
*/
static void
nd6_send_ns(struct netif * netif, ip6_addr_t * target_addr, u8_t flags)
nd6_send_ns(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
{
struct ns_header * ns_hdr;
struct lladdr_option * lladdr_opt;
@@ -859,13 +859,13 @@ nd6_send_ns(struct netif * netif, ip6_addr_t * target_addr, u8_t flags)
* @param flags one of ND6_SEND_FLAG_*
*/
static void
nd6_send_na(struct netif * netif, ip6_addr_t * target_addr, u8_t flags)
nd6_send_na(struct netif * netif, const ip6_addr_t * target_addr, u8_t flags)
{
struct na_header * na_hdr;
struct lladdr_option * lladdr_opt;
struct pbuf * p;
ip6_addr_t * src_addr;
ip6_addr_t * dest_addr;
const ip6_addr_t * src_addr;
const ip6_addr_t * dest_addr;
/* Use link-local address as source address. */
/* src_addr = &(netif->ip6_addr[0]); */
@@ -1003,7 +1003,7 @@ nd6_send_rs(struct netif * netif)
* entry is found
*/
static s8_t
nd6_find_neighbor_cache_entry(ip6_addr_t * ip6addr)
nd6_find_neighbor_cache_entry(const ip6_addr_t * ip6addr)
{
s8_t i;
for (i = 0; i < LWIP_ND6_NUM_NEIGHBORS; i++) {
@@ -1158,7 +1158,7 @@ nd6_free_neighbor_cache_entry(s8_t i)
* entry is found
*/
static s8_t
nd6_find_destination_cache_entry(ip6_addr_t * ip6addr)
nd6_find_destination_cache_entry(const ip6_addr_t * ip6addr)
{
s8_t i;
for (i = 0; i < LWIP_ND6_NUM_DESTINATIONS; i++) {
@@ -1208,7 +1208,7 @@ nd6_new_destination_cache_entry(void)
* @return 1 if the address is on-link, 0 otherwise
*/
static s8_t
nd6_is_prefix_in_netif(ip6_addr_t * ip6addr, struct netif * netif)
nd6_is_prefix_in_netif(const ip6_addr_t * ip6addr, struct netif * netif)
{
s8_t i;
for (i = 0; i < LWIP_ND6_NUM_PREFIXES; i++) {
@@ -1237,7 +1237,7 @@ nd6_is_prefix_in_netif(ip6_addr_t * ip6addr, struct netif * netif)
* router is found
*/
s8_t
nd6_select_router(ip6_addr_t * ip6addr, struct netif * netif)
nd6_select_router(const ip6_addr_t * ip6addr, struct netif * netif)
{
s8_t i;
/* last_router is used for round-robin router selection (as recommended
@@ -1296,7 +1296,7 @@ nd6_select_router(ip6_addr_t * ip6addr, struct netif * netif)
* @return the index of the router entry, or -1 if not found
*/
static s8_t
nd6_get_router(ip6_addr_t * router_addr, struct netif * netif)
nd6_get_router(const ip6_addr_t * router_addr, struct netif * netif)
{
s8_t i;
@@ -1321,7 +1321,7 @@ nd6_get_router(ip6_addr_t * router_addr, struct netif * netif)
* @return the index on the router table, or -1 if could not be created
*/
static s8_t
nd6_new_router(ip6_addr_t * router_addr, struct netif * netif)
nd6_new_router(const ip6_addr_t * router_addr, struct netif * netif)
{
s8_t router_index;
s8_t neighbor_index;
@@ -1427,7 +1427,7 @@ nd6_new_onlink_prefix(ip6_addr_t * prefix, struct netif * netif)
* could be created
*/
s8_t
nd6_get_next_hop_entry(ip6_addr_t * ip6addr, struct netif * netif)
nd6_get_next_hop_entry(const ip6_addr_t * ip6addr, struct netif * netif)
{
s8_t i;
@@ -1726,7 +1726,7 @@ nd6_send_q(s8_t i)
* @return the Path MTU, if known, or the netif default MTU
*/
u16_t
nd6_get_destination_mtu(ip6_addr_t * ip6addr, struct netif * netif)
nd6_get_destination_mtu(const ip6_addr_t * ip6addr, struct netif * netif)
{
s8_t i;
@@ -1756,7 +1756,7 @@ nd6_get_destination_mtu(ip6_addr_t * ip6addr, struct netif * netif)
* by an upper layer protocol (TCP)
*/
void
nd6_reachability_hint(ip6_addr_t * ip6addr)
nd6_reachability_hint(const ip6_addr_t * ip6addr)
{
s8_t i;

8
src/core/netif.c
View File

@@ -85,7 +85,7 @@ struct netif *netif_default;
static u8_t netif_num;
#if LWIP_IPV6
static err_t netif_null_output_ip6(struct netif *netif, struct pbuf *p, ip6_addr_t *ipaddr);
static err_t netif_null_output_ip6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr);
#endif /* LWIP_IPV6 */
#if LWIP_IPV6
@@ -97,7 +97,7 @@ static err_t netif_null_output_ip6(struct netif *netif, struct pbuf *p, ip6_addr
#if LWIP_HAVE_LOOPIF
static err_t netif_loop_output_ipv4(struct netif *netif, struct pbuf *p, const ip_addr_t* addr);
#if LWIP_IPV6
static err_t netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, ip6_addr_t* addr);
static err_t netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, const ip6_addr_t* addr);
#endif
@@ -771,7 +771,7 @@ netif_loop_output_ipv4(struct netif *netif, struct pbuf *p, const ip_addr_t* add
#if LWIP_IPV6
static err_t
netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, ip6_addr_t* addr)
netif_loop_output_ipv6(struct netif *netif, struct pbuf *p, const ip6_addr_t* addr)
{
LWIP_UNUSED_ARG(addr);
return netif_loop_output(netif, p);
@@ -929,7 +929,7 @@ netif_create_ip6_linklocal_address(struct netif * netif, u8_t from_mac_48bit)
}
static err_t
netif_null_output_ip6(struct netif *netif, struct pbuf *p, ip6_addr_t *ipaddr)
netif_null_output_ip6(struct netif *netif, struct pbuf *p, const ip6_addr_t *ipaddr)
{
(void)netif;
(void)p;

4
src/core/snmp/msg_in.c
View File

@@ -64,7 +64,7 @@ struct snmp_msg_pstat msg_input_list[SNMP_CONCURRENT_REQUESTS];
/* UDP Protocol Control Block */
struct udp_pcb *snmp1_pcb;
static void snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port);
static void snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port);
static err_t snmp_pdu_header_check(struct pbuf *p, u16_t ofs, u16_t pdu_len, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat);
static err_t snmp_pdu_dec_varbindlist(struct pbuf *p, u16_t ofs, u16_t *ofs_ret, struct snmp_msg_pstat *m_stat);
@@ -901,7 +901,7 @@ snmp_msg_event(u8_t request_id)
/* lwIP UDP receive callback function */
static void
snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, ip_addr_t *addr, u16_t port)
snmp_recv(void *arg, struct udp_pcb *pcb, struct pbuf *p, const ip_addr_t *addr, u16_t port)
{
struct snmp_msg_pstat *msg_ps;
u8_t req_idx;