Clean up ICMP naming

4 files changed, 39 insertions, 34 deletions

diff --git a/nuttx/net/icmp/icmp_input.c b/nuttx/net/icmp/icmp_input.c
index 94087b9ae..55557945b 100644
--- a/nuttx/net/icmp/icmp_input.c
+++ b/nuttx/net/icmp/icmp_input.c
@@ -2,7 +2,7 @@
  * net/icmp/icmp_input.c
  * Handling incoming ICMP/ICMP6 input
  *
- *   Copyright (C) 2007-2009, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007-2009, 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -54,6 +54,7 @@
 #include <nuttx/net/netdev.h>
 
 #include "uip/uip.h"
+#include "icmp/icmp.h"
 
 #ifdef CONFIG_NET_ICMP
 
@@ -61,7 +62,7 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ICMPBUF ((struct uip_icmpip_hdr *)&dev->d_buf[UIP_LLH_LEN])
+#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[UIP_LLH_LEN])
 
 /****************************************************************************
  * Public Variables
@@ -72,7 +73,7 @@
  ****************************************************************************/
 
 #ifdef CONFIG_NET_ICMP_PING
-struct uip_callback_s *g_echocallback = NULL;
+FAR struct uip_callback_s *g_echocallback = NULL;
 #endif
 
 /****************************************************************************
@@ -84,7 +85,7 @@ struct uip_callback_s *g_echocallback = NULL;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: uip_icmpinput
+ * Name: icmp_input
  *
  * Description:
  *   Handle incoming ICMP/ICMP6 input
@@ -101,9 +102,9 @@ struct uip_callback_s *g_echocallback = NULL;
  *
  ****************************************************************************/
 
-void uip_icmpinput(struct uip_driver_s *dev)
+void icmp_input(FAR struct uip_driver_s *dev)
 {
-  struct uip_icmpip_hdr *picmp = ICMPBUF;
+  FAR struct icmp_iphdr_s *picmp = ICMPBUF;
 
 #ifdef CONFIG_NET_STATISTICS
   uip_stat.icmp.recv++;
@@ -146,7 +147,7 @@ void uip_icmpinput(struct uip_driver_s *dev)
       /* The slow way... sum over the ICMP message */
 
       picmp->icmpchksum = 0;
-      picmp->icmpchksum = ~uip_icmpchksum(dev, (((uint16_t)picmp->len[0] << 8) | (uint16_t)picmp->len[1]) - UIP_IPH_LEN);
+      picmp->icmpchksum = ~icmp_chksum(dev, (((uint16_t)picmp->len[0] << 8) | (uint16_t)picmp->len[1]) - UIP_IPH_LEN);
       if (picmp->icmpchksum == 0)
         {
           picmp->icmpchksum = 0xffff;
@@ -235,7 +236,7 @@ typeerr:
           picmp->options[1] = 1;  /* Options length, 1 = 8 bytes. */
           memcpy(&(picmp->options[2]), &dev->d_mac, IFHWADDRLEN);
           picmp->icmpchksum = 0;
-          picmp->icmpchksum = ~uip_icmp6chksum(dev);
+          picmp->icmpchksum = ~icmp_6chksum(dev);
         }
       else
         {
@@ -254,7 +255,7 @@ typeerr:
       uiphdr_ipaddr_copy(picmp->destipaddr, picmp->srcipaddr);
       uiphdr_ipaddr_copy(picmp->srcipaddr, &dev->d_ipaddr);
       picmp->icmpchksum = 0;
-      picmp->icmpchksum = ~uip_icmp6chksum(dev);
+      picmp->icmpchksum = ~icmp_6chksum(dev);
     }
 
   /* If an ICMP echo reply is received then there should also be
diff --git a/nuttx/net/icmp/icmp_ping.c b/nuttx/net/icmp/icmp_ping.c
index adcc3626c..549266e6a 100644
--- a/nuttx/net/icmp/icmp_ping.c
+++ b/nuttx/net/icmp/icmp_ping.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/icmp/icmp_ping.c
  *
- *   Copyright (C) 2008-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -54,19 +54,21 @@
 #include <nuttx/net/netdev.h>
 
 #include "uip/uip.h"
-#include "../net.h" /* Should not include this! */
+#include "icmp/icmp.h"
+
+#include "net.h"
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ICMPBUF ((struct uip_icmpip_hdr *)&dev->d_buf[UIP_LLH_LEN])
-#define ICMPDAT (&dev->d_buf[UIP_LLH_LEN + sizeof(struct uip_icmpip_hdr)])
+#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[UIP_LLH_LEN])
+#define ICMPDAT (&dev->d_buf[UIP_LLH_LEN + sizeof(struct icmp_iphdr_s)])
 
 /* Allocate a new ICMP data callback */
 
-#define uip_icmpcallbackalloc()   uip_callbackalloc(&g_echocallback)
-#define uip_icmpcallbackfree(cb)  uip_callbackfree(cb, &g_echocallback)
+#define icmp_callbackalloc()   uip_callbackalloc(&g_echocallback)
+#define icmp_callbackfree(cb)  uip_callbackfree(cb, &g_echocallback)
 
 /****************************************************************************
  * Private Types
@@ -116,7 +118,7 @@ struct icmp_ping_s
  *
  ****************************************************************************/
 
-static inline int ping_timeout(struct icmp_ping_s *pstate)
+static inline int ping_timeout(FAR struct icmp_ping_s *pstate)
 {
   uint32_t elapsed =  clock_systimer() - pstate->png_time;
   if (elapsed >= pstate->png_ticks)
@@ -148,11 +150,11 @@ static inline int ping_timeout(struct icmp_ping_s *pstate)
  *
  ****************************************************************************/
 
-static uint16_t ping_interrupt(struct uip_driver_s *dev, void *conn,
-                               void *pvpriv, uint16_t flags)
+static uint16_t ping_interrupt(FAR struct uip_driver_s *dev, FAR void *conn,
+                               FAR void *pvpriv, uint16_t flags)
 {
-  struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv;
-  uint8_t *ptr;
+  FAR struct icmp_ping_s *pstate = (struct icmp_ping_s *)pvpriv;
+  FAR uint8_t *ptr;
   int i;
 
   nllvdbg("flags: %04x\n", flags);
@@ -166,7 +168,8 @@ static uint16_t ping_interrupt(struct uip_driver_s *dev, void *conn,
 
       if ((flags & UIP_ECHOREPLY) != 0 && conn != NULL)
         {
-          struct uip_icmpip_hdr *icmp = (struct uip_icmpip_hdr *)conn;
+          FAR struct icmp_iphdr_s *icmp = (FAR struct icmp_iphdr_s *)conn;
+
           nlldbg("ECHO reply: id=%d seqno=%d\n",
                  ntohs(icmp->id), ntohs(icmp->seqno));
 
@@ -202,7 +205,7 @@ static uint16_t ping_interrupt(struct uip_driver_s *dev, void *conn,
           (flags & UIP_NEWDATA) == 0 &&   /* No incoming data */
           !pstate->png_sent)              /* Request not sent */
         {
-          struct uip_icmpip_hdr *picmp = ICMPBUF;
+          FAR struct icmp_iphdr_s *picmp = ICMPBUF;
 
           /* We can send the ECHO request now.
            *
@@ -232,7 +235,7 @@ static uint16_t ping_interrupt(struct uip_driver_s *dev, void *conn,
           nlldbg("Send ECHO request: seqno=%d\n", pstate->png_seqno);
 
           dev->d_sndlen = pstate->png_datlen + 4;
-          uip_icmpsend(dev, &pstate->png_addr);
+          icmp_send(dev, &pstate->png_addr);
           pstate->png_sent = true;
           return flags;
         }
@@ -342,7 +345,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno,
 
   /* Set up the callback */
 
-  state.png_cb = uip_icmpcallbackalloc();
+  state.png_cb = icmp_callbackalloc();
   if (state.png_cb)
     {
       state.png_cb->flags   = UIP_POLL|UIP_ECHOREPLY;
@@ -364,7 +367,7 @@ int uip_ping(uip_ipaddr_t addr, uint16_t id, uint16_t seqno,
       nlldbg("Start time: 0x%08x seqno: %d\n", state.png_time, seqno);
       uip_lockedwait(&state.png_sem);
 
-      uip_icmpcallbackfree(state.png_cb);
+      icmp_callbackfree(state.png_cb);
     }
 
   uip_unlock(save);
diff --git a/nuttx/net/icmp/icmp_poll.c b/nuttx/net/icmp/icmp_poll.c
index 2d79255e7..208f933a3 100644
--- a/nuttx/net/icmp/icmp_poll.c
+++ b/nuttx/net/icmp/icmp_poll.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/icmp/icmp_poll.c
  *
- *   Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2009, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: uip_icmppoll
+ * Name: icmp_poll
  *
  * Description:
  *   Poll a UDP "connection" structure for availability of TX data
@@ -85,7 +85,7 @@
  *
  ****************************************************************************/
 
-void uip_icmppoll(struct uip_driver_s *dev)
+void icmp_poll(FAR struct uip_driver_s *dev)
 {
   /* Setup for the application callback */
 
diff --git a/nuttx/net/icmp/icmp_send.c b/nuttx/net/icmp/icmp_send.c
index 96df208ea..0f72b3b3e 100644
--- a/nuttx/net/icmp/icmp_send.c
+++ b/nuttx/net/icmp/icmp_send.c
@@ -1,7 +1,7 @@
 /****************************************************************************
  * net/icmp/icmp_send.c
  *
- *   Copyright (C) 2008-2010, 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2008-2010, 2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,12 +47,13 @@
 #include <nuttx/net/netdev.h>
 
 #include "uip/uip.h"
+#include "icmp/icmp.h"
 
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ICMPBUF ((struct uip_icmpip_hdr *)&dev->d_buf[UIP_LLH_LEN])
+#define ICMPBUF ((struct icmp_iphdr_s *)&dev->d_buf[UIP_LLH_LEN])
 
 /****************************************************************************
  * Public Variables
@@ -71,7 +72,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: uip_icmpsend
+ * Name: icmp_send
  *
  * Description:
  *   Setup to send an ICMP packet
@@ -87,9 +88,9 @@
  *
  ****************************************************************************/
 
-void uip_icmpsend(struct uip_driver_s *dev, uip_ipaddr_t *destaddr)
+void icmp_send(FAR struct uip_driver_s *dev, FAR uip_ipaddr_t *destaddr)
 {
-  struct uip_icmpip_hdr *picmp = ICMPBUF;
+  FAR struct icmp_iphdr_s *picmp = ICMPBUF;
 
   if (dev->d_sndlen > 0)
     {
@@ -149,7 +150,7 @@ void uip_icmpsend(struct uip_driver_s *dev, uip_ipaddr_t *destaddr)
       /* Calculate the ICMP checksum. */
 
       picmp->icmpchksum  = 0;
-      picmp->icmpchksum  = ~(uip_icmpchksum(dev, dev->d_sndlen));
+      picmp->icmpchksum  = ~(icmp_chksum(dev, dev->d_sndlen));
       if (picmp->icmpchksum == 0)
         {
           picmp->icmpchksum = 0xffff;