Move arp_arpin() from arp_inout.c to its own file. Rename arp_inout.c to...

Move arp_arpin() from arp_inout.c to its own file. Rename arp_inout.c to arpipin.c because that is all that is left in the file

net/arp/Make.defs

@@ -36,7 +36,11 @@
 # ARP supported is not provided for SLIP (Ethernet only)
 
 ifneq ($(CONFIG_NET_SLIP),y)
-NET_CSRCS += arp_inout.c arp_out.c arp_table.c arp_timer.c
+NET_CSRCS +=arp_arpin.c arp_out.c arp_table.c arp_timer.c
+
+ifeq ($(CONFIG_NET_ARP_IPIN),y)
+NET_CSRCS += arp_ipin.c
+endif
 
 ifeq ($(CONFIG_NET_ARP_DUMP),y)
 NET_CSRCS += arp_dump.c

net/arp/arp_inout.c → net/arp/arp_arpin.c

 /****************************************************************************
- * net/arp/arp_inout.c
- * Implementation of the ARP Address Resolution Protocol.
+ * net/arp/arp_arpin.c
  *
  *   Copyright (C) 2007-2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -43,24 +42,15 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
-#ifdef CONFIG_NET
 
-#include <sys/ioctl.h>
-#include <stdint.h>
 #include <string.h>
 #include <debug.h>
 
 #include <netinet/in.h>
-#include <arpa/inet.h>
 
-#include <net/ethernet.h>
-#include <nuttx/net/netconfig.h>
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
-#include <nuttx/net/ip.h>
 
-#include "netdev/netdev.h"
-#include "route/route.h"
 #include "arp/arp.h"
 
 #ifdef CONFIG_NET_ARP
@@ -69,9 +59,8 @@
  * Pre-processor Definitions
  ****************************************************************************/
 
-#define ETHBUF        ((struct eth_hdr_s *)&dev->d_buf[0])
-#define ARPBUF        ((struct arp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN])
-#define IPBUF         ((struct arp_iphdr_s *)&dev->d_buf[NET_LL_HDRLEN])
+#define ETHBUF  ((struct eth_hdr_s *)&dev->d_buf[0])
+#define ARPBUF  ((struct arp_hdr_s *)&dev->d_buf[NET_LL_HDRLEN])
 
 /****************************************************************************
  * Private Types
@@ -89,38 +78,6 @@
  * Public Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: arp_ipin
- *
- * Description:
- *   The arp_ipin() function should be called by Ethernet device drivers
- *   whenever an IP packet arrives from the network.  The function will
- *   check if the address is in the ARP cache, and if so the ARP cache entry
- *   will be refreshed. If no ARP cache entry was found, a new one is created.
- *
- *   This function expects that an IP packet with an Ethernet header is
- *   present in the d_buf buffer and that the length of the packet is in the
- *   d_len field.
- *
- ****************************************************************************/
-
-#ifdef CONFIG_NET_ARP_IPIN
-void arp_ipin(FAR struct net_driver_s *dev)
-{
-  in_addr_t srcipaddr;
-
-  /* Only insert/update an entry if the source IP address of the incoming IP
-   * packet comes from a host on the local network.
-   */
-
-  srcipaddr = net_ip4addr_conv32(IPBUF->eh_srcipaddr);
-  if (net_ipaddr_maskcmp(srcipaddr, dev->d_ipaddr, dev->d_netmask))
-    {
-      arp_update(IPBUF->eh_srcipaddr, ETHBUF->src);
-    }
-}
-#endif /* CONFIG_NET_ARP_IPIN */
-
 /****************************************************************************
  * Name: arp_arpin
  *
@@ -209,4 +166,3 @@ void arp_arpin(FAR struct net_driver_s *dev)
 }
 
 #endif /* CONFIG_NET_ARP */
-#endif /* CONFIG_NET */

net/arp/arp_ipin.c

+/****************************************************************************
+ * net/arp/arp_ipin.c
+ *
+ *   Copyright (C) 2007-2011, 2014 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * Based on uIP which also has a BSD style license:
+ *
+ *   Author: Adam Dunkels <adam@dunkels.com>
+ *   Copyright (c) 2001-2003, Adam Dunkels.
+ *   All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote
+ *    products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+
+#include <netinet/in.h>
+
+#include <nuttx/net/netdev.h>
+#include <nuttx/net/arp.h>
+
+#include "arp/arp.h"
+
+#ifdef CONFIG_NET_ARP_IPIN
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define ETHBUF ((struct eth_hdr_s *)&dev->d_buf[0])
+#define IPBUF  ((struct arp_iphdr_s *)&dev->d_buf[NET_LL_HDRLEN])
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Name: arp_ipin
+ *
+ * Description:
+ *   The arp_ipin() function should be called by Ethernet device drivers
+ *   whenever an IP packet arrives from the network.  The function will
+ *   check if the address is in the ARP cache, and if so the ARP cache entry
+ *   will be refreshed. If no ARP cache entry was found, a new one is created.
+ *
+ *   This function expects that an IP packet with an Ethernet header is
+ *   present in the d_buf buffer and that the length of the packet is in the
+ *   d_len field.
+ *
+ ****************************************************************************/
+
+void arp_ipin(FAR struct net_driver_s *dev)
+{
+  in_addr_t srcipaddr;
+
+  /* Only insert/update an entry if the source IP address of the incoming IP
+   * packet comes from a host on the local network.
+   */
+
+  srcipaddr = net_ip4addr_conv32(IPBUF->eh_srcipaddr);
+  if (net_ipaddr_maskcmp(srcipaddr, dev->d_ipaddr, dev->d_netmask))
+    {
+      arp_update(IPBUF->eh_srcipaddr, ETHBUF->src);
+    }
+}
+
+#endif /* CONFIG_NET_ARP_IPIN */

net/arp/arp_out.c

 /****************************************************************************
  * net/arp/arp_out.c
- * Implementation of the ARP Address Resolution Protocol.
  *
  *   Copyright (C) 2007-2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>