From 96e9689dbd41c1674df972b471f68b40c931c7cb Mon Sep 17 00:00:00 2001 From: goldsimon Date: Sun, 14 Feb 2010 12:42:49 +0000 Subject: [PATCH] Use new macro ip_addr_copy where applicable --- src/core/dhcp.c | 14 +++++++------- src/core/ipv4/icmp.c | 6 +++--- src/core/ipv4/igmp.c | 8 ++++---- src/core/ipv4/ip.c | 8 +++++--- src/core/snmp/msg_out.c | 4 ++-- src/core/tcp.c | 6 +++--- src/core/tcp_in.c | 4 ++-- src/core/tcp_out.c | 2 +- src/netif/etharp.c | 2 +- 9 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/core/dhcp.c b/src/core/dhcp.c index 086649fe..b4e0f5fd 100644 --- a/src/core/dhcp.c +++ b/src/core/dhcp.c @@ -246,7 +246,7 @@ dhcp_handle_offer(struct netif *netif) LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): server 0x%08"X32_F"\n", ip4_addr_get_u32(&dhcp->server_ip_addr))); /* remember offered address */ - ip_addr_set(&dhcp->offered_ip_addr, &dhcp->msg_in->yiaddr); + ip_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr); LWIP_DEBUGF(DHCP_DEBUG | LWIP_DBG_STATE, ("dhcp_handle_offer(): offer for 0x%08"X32_F"\n", ip4_addr_get_u32(&dhcp->offered_ip_addr))); @@ -535,12 +535,12 @@ dhcp_handle_ack(struct netif *netif) } /* (y)our internet address */ - ip_addr_set(&dhcp->offered_ip_addr, &dhcp->msg_in->yiaddr); + ip_addr_copy(dhcp->offered_ip_addr, dhcp->msg_in->yiaddr); #if LWIP_DHCP_BOOTP_FILE /* copy boot server address, boot file name copied in dhcp_parse_reply if not overloaded */ - ip_addr_set(&dhcp->offered_si_addr, &dhcp->msg_in->siaddr); + ip_addr_copy(dhcp->offered_si_addr, dhcp->msg_in->siaddr); #endif /* LWIP_DHCP_BOOTP_FILE */ /* subnet mask given? */ @@ -942,10 +942,10 @@ dhcp_bind(struct netif *netif) if (dhcp->subnet_mask_given) { /* copy offered network mask */ - ip_addr_set(&sn_mask, &dhcp->offered_sn_mask); + ip_addr_copy(sn_mask, dhcp->offered_sn_mask); } else { /* subnet mask not given, choose a safe subnet mask given the network class */ - u8_t first_octet = (u8_t)ip4_addr1_16(&dhcp->offered_ip_addr); + u8_t first_octet = ip4_addr1(&dhcp->offered_ip_addr); if (first_octet <= 127) { ip4_addr_set_u32(&sn_mask, htonl(0xff000000)); } else if (first_octet >= 192) { @@ -955,7 +955,7 @@ dhcp_bind(struct netif *netif) } } - ip_addr_set(&gw_addr, &dhcp->offered_gw_addr); + ip_addr_copy(gw_addr, dhcp->offered_gw_addr); /* gateway address not given? */ if (ip_addr_isany(&gw_addr)) { /* copy network address */ @@ -1665,7 +1665,7 @@ dhcp_create_request(struct netif *netif, struct dhcp *dhcp) dhcp->msg_out->flags = 0; ip_addr_set_zero(&dhcp->msg_out->ciaddr); if (dhcp->state==DHCP_BOUND || dhcp->state==DHCP_RENEWING || dhcp->state==DHCP_REBINDING) { - ip_addr_set(&dhcp->msg_out->ciaddr, &netif->ip_addr); + ip_addr_copy(dhcp->msg_out->ciaddr, netif->ip_addr); } ip_addr_set_zero(&dhcp->msg_out->yiaddr); ip_addr_set_zero(&dhcp->msg_out->siaddr); diff --git a/src/core/ipv4/icmp.c b/src/core/ipv4/icmp.c index 125b6bac..bc649c56 100644 --- a/src/core/ipv4/icmp.c +++ b/src/core/ipv4/icmp.c @@ -184,9 +184,9 @@ icmp_input(struct pbuf *p, struct netif *inp) /* We generate an answer by switching the dest and src ip addresses, * setting the icmp type to ECHO_RESPONSE and updating the checksum. */ iecho = (struct icmp_echo_hdr *)p->payload; - ip_addr_set(&tmpaddr, &iphdr->src); - ip_addr_set(&iphdr->src, &iphdr->dest); - ip_addr_set(&iphdr->dest, &tmpaddr); + ip_addr_copy(tmpaddr, iphdr->src); + ip_addr_copy(iphdr->src, iphdr->dest); + ip_addr_copy(iphdr->dest, tmpaddr); ICMPH_TYPE_SET(iecho, ICMP_ER); /* adjust the checksum */ if (iecho->chksum >= htons(0xffff - (ICMP_ECHO << 8))) { diff --git a/src/core/ipv4/igmp.c b/src/core/ipv4/igmp.c index 4909b5bd..4fadf5ce 100644 --- a/src/core/ipv4/igmp.c +++ b/src/core/ipv4/igmp.c @@ -776,7 +776,7 @@ igmp_send(struct igmp_group *group, u8_t type) { struct pbuf* p = NULL; struct igmp_msg* igmp = NULL; - ip_addr_t src = {0}; + ip_addr_t src = *IP_ADDR_ANY; ip_addr_t* dest = NULL; /* IP header + "router alert" option + IGMP header */ @@ -786,16 +786,16 @@ igmp_send(struct igmp_group *group, u8_t type) igmp = p->payload; LWIP_ASSERT("igmp_send: check that first pbuf can hold struct igmp_msg", (p->len >= sizeof(struct igmp_msg))); - ip_addr_set(&src, &((group->netif)->ip_addr)); + ip_addr_copy(src, group->netif->ip_addr); if (type == IGMP_V2_MEMB_REPORT) { dest = &(group->group_address); - ip_addr_set(&(igmp->igmp_group_address), &(group->group_address)); + ip_addr_copy(igmp->igmp_group_address, group->group_address); group->last_reporter_flag = 1; /* Remember we were the last to report */ } else { if (type == IGMP_LEAVE_GROUP) { dest = &allrouters; - ip_addr_set(&(igmp->igmp_group_address), &(group->group_address)); + ip_addr_copy(igmp->igmp_group_address, group->group_address); } } diff --git a/src/core/ipv4/ip.c b/src/core/ipv4/ip.c index f7ca868d..a8ce0a81 100644 --- a/src/core/ipv4/ip.c +++ b/src/core/ipv4/ip.c @@ -558,7 +558,8 @@ err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, IPH_TTL_SET(iphdr, ttl); IPH_PROTO_SET(iphdr, proto); - ip_addr_set(&(iphdr->dest), dest); + /* dest cannot be NULL here */ + ip_addr_copy(iphdr->dest, *dest); IPH_VHLTOS_SET(iphdr, 4, ip_hlen / 4, tos); IPH_LEN_SET(iphdr, htons(p->tot_len)); @@ -567,9 +568,10 @@ err_t ip_output_if_opt(struct pbuf *p, ip_addr_t *src, ip_addr_t *dest, ++ip_id; if (ip_addr_isany(src)) { - ip_addr_set(&(iphdr->src), &(netif->ip_addr)); + ip_addr_copy(iphdr->src, netif->ip_addr); } else { - ip_addr_set(&(iphdr->src), src); + /* src cannot be NULL here */ + ip_addr_copy(iphdr->src, *src); } IPH_CHKSUM_SET(iphdr, 0); diff --git a/src/core/snmp/msg_out.c b/src/core/snmp/msg_out.c index 87a73b20..1d930349 100644 --- a/src/core/snmp/msg_out.c +++ b/src/core/snmp/msg_out.c @@ -230,10 +230,10 @@ snmp_send_trap(s8_t generic_trap, struct snmp_obj_id *eoid, s32_t specific_trap) if ((td->enable != 0) && !ip_addr_isany(&td->dip)) { /* network order trap destination */ - ip_addr_set(&trap_msg.dip, &td->dip); + ip_addr_copy(trap_msg.dip, td->dip); /* lookup current source address for this dst */ dst_if = ip_route(&td->dip); - ip_addr_set(&dst_ip, &dst_if->ip_addr); + ip_addr_copy(dst_ip, dst_if->ip_addr); /* @todo: what about IPv6? */ trap_msg.sip_raw[0] = ip4_addr1(&dst_ip); trap_msg.sip_raw[1] = ip4_addr2(&dst_ip); diff --git a/src/core/tcp.c b/src/core/tcp.c index ffaff044..925c0b13 100644 --- a/src/core/tcp.c +++ b/src/core/tcp.c @@ -232,8 +232,8 @@ tcp_abandon(struct tcp_pcb *pcb, int reset) } else { seqno = pcb->snd_nxt; ackno = pcb->rcv_nxt; - ip_addr_set(&local_ip, &(pcb->local_ip)); - ip_addr_set(&remote_ip, &(pcb->remote_ip)); + ip_addr_copy(local_ip, pcb->local_ip); + ip_addr_copy(remote_ip, pcb->remote_ip); local_port = pcb->local_port; remote_port = pcb->remote_port; #if LWIP_CALLBACK_API @@ -391,7 +391,7 @@ tcp_listen_with_backlog(struct tcp_pcb *pcb, u8_t backlog) lpcb->so_options |= SOF_ACCEPTCONN; lpcb->ttl = pcb->ttl; lpcb->tos = pcb->tos; - ip_addr_set(&lpcb->local_ip, &pcb->local_ip); + ip_addr_copy(lpcb->local_ip, pcb->local_ip); TCP_RMV(&tcp_bound_pcbs, pcb); memp_free(MEMP_TCP_PCB, pcb); #if LWIP_CALLBACK_API diff --git a/src/core/tcp_in.c b/src/core/tcp_in.c index ec434432..8b48e213 100644 --- a/src/core/tcp_in.c +++ b/src/core/tcp_in.c @@ -433,9 +433,9 @@ tcp_listen_input(struct tcp_pcb_listen *pcb) pcb->accepts_pending++; #endif /* TCP_LISTEN_BACKLOG */ /* Set up the new PCB. */ - ip_addr_set(&(npcb->local_ip), &(iphdr->dest)); + ip_addr_copy(npcb->local_ip, iphdr->dest); npcb->local_port = pcb->local_port; - ip_addr_set(&(npcb->remote_ip), &(iphdr->src)); + ip_addr_copy(npcb->remote_ip, iphdr->src); npcb->remote_port = tcphdr->src; npcb->state = SYN_RCVD; npcb->rcv_nxt = seqno + 1; diff --git a/src/core/tcp_out.c b/src/core/tcp_out.c index 6ec9bb37..9a010f45 100644 --- a/src/core/tcp_out.c +++ b/src/core/tcp_out.c @@ -703,7 +703,7 @@ tcp_output_segment(struct tcp_seg *seg, struct tcp_pcb *pcb) if (netif == NULL) { return; } - ip_addr_set(&(pcb->local_ip), &(netif->ip_addr)); + ip_addr_copy(pcb->local_ip, netif->ip_addr); } /* Set retransmission timer running if it is not currently enabled */ diff --git a/src/netif/etharp.c b/src/netif/etharp.c index 1a9d0ded..d23f8f30 100644 --- a/src/netif/etharp.c +++ b/src/netif/etharp.c @@ -407,7 +407,7 @@ find_entry(ip_addr_t *ipaddr, u8_t flags) /* IP address given? */ if (ipaddr != NULL) { /* set IP address */ - ip_addr_set(&arp_table[i].ipaddr, ipaddr); + ip_addr_copy(arp_table[i].ipaddr, *ipaddr); } arp_table[i].ctime = 0; #if LWIP_NETIF_HWADDRHINT