Raw sockets: Correct some compile issues; better modularized device-related logic

net/pkt/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # net/pkt/Make.defs
 #
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@ NET_CSRCS += pkt_conn.c
 NET_CSRCS += pkt_input.c
 NET_CSRCS += pkt_callback.c
 NET_CSRCS += pkt_poll.c
+NET_CSRCS += pkt_finddev.c
 
 # Include packet socket build support
 

net/pkt/pkt.h

@@ -196,7 +196,22 @@ uint16_t pkt_callback(FAR struct net_driver_s *dev,
 
 /* pkt_input() is prototyped in include/nuttx/net/pkt.h */
 
-/* Defined in pkt_poll.c ****************************************************/
+/****************************************************************************
+ * Function: pkt_find_device
+ *
+ * Description:
+ *   Select the network driver to use with the PKT transaction.
+ *
+ * Input Parameters:
+ *   conn - PKT connection structure (not currently used).
+ *
+ * Returned Value:
+ *   A pointer to the network driver to use.
+ *
+ ****************************************************************************/
+
+FAR struct net_driver_s *pkt_find_device(FAR struct pkt_conn_s *conn);
+
 /****************************************************************************
  * Name: pkt_poll
  *

net/pkt/pkt_finddev.c

@@ -0,0 +1,95 @@
+/****************************************************************************
+ * net/pkt/pkt_finddev.c
+ *
+ *   Copyright (C) 2015 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <gnutt@nuttx.org>
+ *
+ * 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. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "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
+ * COPYRIGHT OWNER OR CONTRIBUTORS 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>
+#if defined(CONFIG_NET) && defined(CONFIG_NET_PKT)
+
+#include <nuttx/net/netdev.h>
+
+#include "netdev/netdev.h"
+#include "pkt/pkt.h"
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Function: pkt_find_device
+ *
+ * Description:
+ *   Select the network driver to use with the PKT transaction.
+ *
+ * Input Parameters:
+ *   conn - PKT connection structure (not currently used).
+ *
+ * Returned Value:
+ *   A pointer to the network driver to use.
+ *
+ ****************************************************************************/
+
+FAR struct net_driver_s *pkt_find_device(FAR struct pkt_conn_s *conn)
+{
+#ifdef CONFIG_NETDEV_MULTINIC
+  FAR struct net_driver_s *dev;
+
+  /* There are multiple network devices.
+   *
+   * REVISIT:  This is bogus.  A better network device lookup is needed.
+   */
+
+  return netdev_findbyname("eth0");
+
+#else
+  /* There is only a single network device... the one at the head of the
+   * g_netdevices list.
+   */
+
+  return g_netdevices;
+#endif
+}
+
+#endif /* CONFIG_NET && CONFIG_NET_PKT */

net/pkt/pkt_send.c

@@ -228,9 +228,8 @@ ssize_t psock_pkt_send(FAR struct socket *psock, FAR const void *buf,
     }
 
   /* Get the device driver that will service this transfer */
-  /* TODO better lookup network interface from *psock or *conn */
 
-  dev = netdev_findbyname("eth0");
+  dev = pkt_find_device((FAR struct pkt_conn_s *)psock->s_conn);
   if (dev == NULL)
     {
       err = ENODEV;

net/socket/recvfrom.c

@@ -1316,12 +1316,11 @@ static ssize_t pkt_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len,
   recvfrom_init(psock, buf, len, from, fromlen, &state);
 
   /* Get the device driver that will service this transfer */
-  /* TODO better lookup network interface from *psock or *conn */
 
-  dev  = netdev_findbyname("eth0");
+  dev  = pkt_find_device(conn);
   if (dev == NULL)
     {
-      err = ENODEV;
+      ret = -ENODEV;
       goto errout_with_state;
     }