ban4jp -
/
uIP-1-0_webserver
uIP 1.0 based webserver for LPC1114 + ENC28J60
Diff: uip/uip-neighbor.c
- Revision:
- 3:a2715e9c7737
- Parent:
- 0:685224d2f66d
--- a/uip/uip-neighbor.c Sat Jun 21 11:54:24 2014 +0000 +++ b/uip/uip-neighbor.c Mon Jun 30 16:00:08 2014 +0000 @@ -26,9 +26,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * This file is part of the uIP TCP/IP stack + * This file is part of the Contiki operating system. * - * $Id: uip-neighbor.c,v 1.2 2006/06/12 08:00:30 adam Exp $ */ /** @@ -54,7 +53,7 @@ struct neighbor_entry { uip_ipaddr_t ipaddr; struct uip_neighbor_addr addr; - u8_t time; + uint8_t time; }; static struct neighbor_entry entries[ENTRIES]; @@ -82,14 +81,14 @@ } /*---------------------------------------------------------------------------*/ void -uip_neighbor_add(uip_ipaddr_t ipaddr, struct uip_neighbor_addr *addr) +uip_neighbor_add(uip_ipaddr_t *ipaddr, struct uip_neighbor_addr *addr) { int i, oldest; - u8_t oldest_time; + uint8_t oldest_time; - printf("Adding neighbor with link address %02x:%02x:%02x:%02x:%02x:%02x\n", + /* printf("Adding neighbor with link address %02x:%02x:%02x:%02x:%02x:%02x\n", addr->addr.addr[0], addr->addr.addr[1], addr->addr.addr[2], addr->addr.addr[3], - addr->addr.addr[4], addr->addr.addr[5]); + addr->addr.addr[4], addr->addr.addr[5]);*/ /* Find the first unused entry or the oldest used entry. */ oldest_time = 0; @@ -99,7 +98,7 @@ oldest = i; break; } - if(uip_ipaddr_cmp(entries[i].ipaddr, addr)) { + if(uip_ipaddr_cmp(&entries[i].ipaddr, ipaddr)) { oldest = i; break; } @@ -112,17 +111,17 @@ /* Use the oldest or first free entry (either pointed to by the "oldest" variable). */ entries[oldest].time = 0; - uip_ipaddr_copy(entries[oldest].ipaddr, ipaddr); + uip_ipaddr_copy(&entries[oldest].ipaddr, ipaddr); memcpy(&entries[oldest].addr, addr, sizeof(struct uip_neighbor_addr)); } /*---------------------------------------------------------------------------*/ static struct neighbor_entry * -find_entry(uip_ipaddr_t ipaddr) +find_entry(uip_ipaddr_t *ipaddr) { int i; for(i = 0; i < ENTRIES; ++i) { - if(uip_ipaddr_cmp(entries[i].ipaddr, ipaddr)) { + if(uip_ipaddr_cmp(&entries[i].ipaddr, ipaddr)) { return &entries[i]; } } @@ -130,7 +129,7 @@ } /*---------------------------------------------------------------------------*/ void -uip_neighbor_update(uip_ipaddr_t ipaddr) +uip_neighbor_update(uip_ipaddr_t *ipaddr) { struct neighbor_entry *e; @@ -141,7 +140,7 @@ } /*---------------------------------------------------------------------------*/ struct uip_neighbor_addr * -uip_neighbor_lookup(uip_ipaddr_t ipaddr) +uip_neighbor_lookup(uip_ipaddr_t *ipaddr) { struct neighbor_entry *e;