From 0c8b72e500e8a2f920b5e4dddb7deb90d5de74ed Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 2 Aug 2009 16:08:20 +0000 Subject: THTTPD now gets past initialization git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2007 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/net/listen.c | 5 +++-- nuttx/net/net_vfcntl.c | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'nuttx/net') diff --git a/nuttx/net/listen.c b/nuttx/net/listen.c index b4d519d9b..c28f9fae0 100644 --- a/nuttx/net/listen.c +++ b/nuttx/net/listen.c @@ -1,7 +1,7 @@ /**************************************************************************** * net/listen.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -43,6 +43,7 @@ #include #include #include +#include #include "net_internal.h" @@ -96,7 +97,7 @@ int listen(int sockfd, int backlog) if (!psock || psock->s_crefs <= 0) { /* It is not a valid socket description. Distinguish between the cases - * where sockfd is a just valid and when it is a valid file descriptor used + * where sockfd is a just invalid and when it is a valid file descriptor used * in the wrong context. */ diff --git a/nuttx/net/net_vfcntl.c b/nuttx/net/net_vfcntl.c index 0b228b212..88e46ad22 100644 --- a/nuttx/net/net_vfcntl.c +++ b/nuttx/net/net_vfcntl.c @@ -125,7 +125,7 @@ int net_vfcntl(int sockfd, int cmd, va_list ap) { /* This summarizes the behavior of the NuttX/uIP sockets */ - ret = O_RDWR | O_SYNC | O_RSYNC; + ret = O_RDWR | O_SYNC | O_RSYNC; /* TCP/IP sockets may also be non-blocking if read-ahead is enabled */ @@ -158,11 +158,11 @@ int net_vfcntl(int sockfd, int cmd, va_list ap) { if ((mode & O_NONBLOCK) != 0) { - psock->s_type |= _SF_NONBLOCK; + psock->s_flags |= _SF_NONBLOCK; } else { - psock->s_type &= ~_SF_NONBLOCK; + psock->s_flags &= ~_SF_NONBLOCK; } } #endif -- cgit v1.2.3