diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-27 14:26:10 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-27 14:26:10 -0600 |
| commit | c14d27eddcb135974dda7c5ba0211060837ec46f (patch) | |
| tree | 87afbbeb89fe9408a8c145b30c33795d3eb92b26 /nuttx/net | |
| parent | a421598360b72505746ff5514541af56a8530a82 (diff) | |
| download | px4-nuttx-c14d27eddcb135974dda7c5ba0211060837ec46f.tar.gz px4-nuttx-c14d27eddcb135974dda7c5ba0211060837ec46f.tar.bz2 px4-nuttx-c14d27eddcb135974dda7c5ba0211060837ec46f.zip | |
Unix domain: More fixed to build without Ethernet or Slip
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/devif/devif_poll.c | 4 | ||||
| -rw-r--r-- | nuttx/net/netdev/netdev_register.c | 2 | ||||
| -rw-r--r-- | nuttx/net/socket/recvfrom.c | 36 |
3 files changed, 28 insertions, 14 deletions
diff --git a/nuttx/net/devif/devif_poll.c b/nuttx/net/devif/devif_poll.c index 3070584b6..c942ea266 100644 --- a/nuttx/net/devif/devif_poll.c +++ b/nuttx/net/devif/devif_poll.c @@ -313,7 +313,7 @@ static inline int devif_poll_tcp_timer(FAR struct net_driver_s *dev, int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback) { - int bstop; + int bstop = false; /* Traverse all of the active packet connections and perform the poll * action. @@ -417,7 +417,7 @@ int devif_poll(FAR struct net_driver_s *dev, devif_poll_callback_t callback) int devif_timer(FAR struct net_driver_s *dev, devif_poll_callback_t callback, int hsec) { - int bstop; + int bstop = false; /* Increment the timer used by the IP reassembly logic */ diff --git a/nuttx/net/netdev/netdev_register.c b/nuttx/net/netdev/netdev_register.c index 1f9ff501e..464eef16c 100644 --- a/nuttx/net/netdev/netdev_register.c +++ b/nuttx/net/netdev/netdev_register.c @@ -65,7 +65,7 @@ #if defined(CONFIG_NET_SLIP) # define NETDEV_DEFAULT_FORMAT NETDEV_SLIP_FORMAT -#elif defined(CONFIG_NET_ETHERNET) +#else /* `if defined(CONFIG_NET_ETHERNET) */ # define NETDEV_DEFAULT_FORMAT NETDEV_ETH_FORMAT #endif diff --git a/nuttx/net/socket/recvfrom.c b/nuttx/net/socket/recvfrom.c index 61733d574..8e38d7881 100644 --- a/nuttx/net/socket/recvfrom.c +++ b/nuttx/net/socket/recvfrom.c @@ -1615,23 +1615,37 @@ ssize_t psock_recvfrom(FAR struct socket *psock, FAR void *buf, size_t len, /* Get the minimum socket length */ + switch (psock->s_domain) + { #ifdef CONFIG_NET_IPv4 -#ifdef CONFIG_NET_IPv6 - if (psock->s_domain == PF_INET) + case PF_INET: + { + minlen = sizeof(struct sockaddr_in); + } + break; #endif - { - minlen = sizeof(struct sockaddr_in); - } -#endif /*CONFIG_NET_IPv4 */ #ifdef CONFIG_NET_IPv6 -#ifdef CONFIG_NET_IPv4 - else + case PF_INET6: + { + minlen = sizeof(struct sockaddr_in6); + } + break; #endif - { - minlen = sizeof(struct sockaddr_in6); + +#ifdef CONFIG_NET_LOCAL + case PF_LOCAL: + { + minlen = sizeof(sa_family_t); + } + break; +#endif + + default: + DEBUGPANIC(); + err = EINVAL; + goto errout; } -#endif /*CONFIG_NET_IPv6 */ if (*fromlen < minlen) { |