diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-08-02 16:31:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-08-02 16:31:50 +0000 |
| commit | ecd3b8c85c7faf6f4317856f90bdd64cb57e1afc (patch) | |
| tree | 3b2e70f57a5b67c3d3f7e0b851110a09e7edd3cf /nuttx/net | |
| parent | 0c8b72e500e8a2f920b5e4dddb7deb90d5de74ed (diff) | |
| download | px4-nuttx-ecd3b8c85c7faf6f4317856f90bdd64cb57e1afc.tar.gz px4-nuttx-ecd3b8c85c7faf6f4317856f90bdd64cb57e1afc.tar.bz2 px4-nuttx-ecd3b8c85c7faf6f4317856f90bdd64cb57e1afc.zip | |
Fix accept() -- it wanted parts of return address initialized
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2008 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/net')
| -rw-r--r-- | nuttx/net/accept.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/nuttx/net/accept.c b/nuttx/net/accept.c index c2e64153c..81ac8dbff 100644 --- a/nuttx/net/accept.c +++ b/nuttx/net/accept.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/accept.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <spudmonkey@racsa.co.cr> * * Redistribution and use in source and binary forms, with or without @@ -102,10 +102,17 @@ struct accept_s #ifdef CONFIG_NET_IPv6 static inline void accept_tcpsender(FAR struct uip_conn *conn, FAR struct sockaddr_in6 *addr) +{ + if (addr) + { + addr->sin_family = AF_INET6; + addr->sin_port = conn->rport; + uip_ipaddr_copy(addr->sin_addr.s_addr, conn->ripaddr); + } +} #else static inline void accept_tcpsender(FAR struct uip_conn *conn, FAR struct sockaddr_in *addr) -#endif { if (addr) { @@ -114,7 +121,8 @@ static inline void accept_tcpsender(FAR struct uip_conn *conn, uip_ipaddr_copy(addr->sin_addr.s_addr, conn->ripaddr); } } -#endif +#endif /* CONFIG_NET_IPv6 */ +#endif /* CONFIG_NET_TCP */ /**************************************************************************** * Function: accept_interrupt @@ -304,9 +312,9 @@ int accept(int sockfd, struct sockaddr *addr, socklen_t *addrlen) if (addr) { #ifdef CONFIG_NET_IPv6 - if (addr->sa_family != AF_INET6 || *addrlen < sizeof(struct sockaddr_in6)) + if (*addrlen < sizeof(struct sockaddr_in6)) #else - if (addr->sa_family != AF_INET || *addrlen < sizeof(struct sockaddr_in)) + if (*addrlen < sizeof(struct sockaddr_in)) #endif { err = EBADF; |