Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

THTTPD now gets past initialization

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2007 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-08-02 16:08:20 +00:00
parent 4322c23e43
commit 7c8051a574
5 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netutils/thttpd/libhttpd.c
+15 -6
View File
@@ -202,8 +202,12 @@ static int check_referer(httpd_conn *hc);
#ifdef CONFIG_THTTPD_URLPATTERN
static int really_check_referer(httpd_conn *hc);
#endif
static int sockaddr_check(httpd_sockaddr * saP);
static size_t sockaddr_len(httpd_sockaddr * saP);
#ifdef CONFIG_DEBUG
static int sockaddr_check(httpd_sockaddr *saP);
#else
# define sockaddr_check(saP) (1)
#endif
static size_t sockaddr_len(httpd_sockaddr *saP);
/****************************************************************************
* Private Data
@@ -295,11 +299,13 @@ static int initialize_listen_socket(httpd_sockaddr *saP)
/* Check sockaddr. */
#ifdef CONFIG_DEBUG
if (!sockaddr_check(saP))
{
ndbg("unknown sockaddr family on listen socket\n");
return -1;
}
#endif
/* Create socket. */
@@ -321,7 +327,7 @@ static int initialize_listen_socket(httpd_sockaddr *saP)
/* Bind to it. */
if (bind(listen_fd, (struct sockaddr*)&saP, sockaddr_len(saP)) < 0)
if (bind(listen_fd, (struct sockaddr*)saP, sockaddr_len(saP)) < 0)
{
ndbg("bind to %s failed: %d\n", httpd_ntoa(saP), errno);
(void)close(listen_fd);
@@ -3293,7 +3299,8 @@ static int really_check_referer(httpd_conn *hc)
}
#endif
static int sockaddr_check(httpd_sockaddr * saP)
#ifdef CONFIG_DEBUG
static int sockaddr_check(httpd_sockaddr *saP)
{
switch (saP->sin_family)
{
@@ -3309,8 +3316,9 @@ static int sockaddr_check(httpd_sockaddr * saP)
return 0;
}
}
#endif
static size_t sockaddr_len(httpd_sockaddr * saP)
static size_t sockaddr_len(httpd_sockaddr *saP)
{
switch (saP->sin_family)
{
@@ -3382,7 +3390,6 @@ FAR httpd_server *httpd_initialize(FAR httpd_sockaddr *sa, FAR const char *cwd)
return NULL;
}
nvdbg("Calling init_mime()\n");
init_mime();
/* Done initializing. */
@@ -3593,6 +3600,7 @@ int httpd_get_conn(httpd_server * hs, int listen_fd, httpd_conn *hc)
return GC_FAIL;
}
#ifdef CONFIG_DEBUG
if (!sockaddr_check(&sa))
{
ndbg("unknown sockaddr family\n");
@@ -3600,6 +3608,7 @@ int httpd_get_conn(httpd_server * hs, int listen_fd, httpd_conn *hc)
hc->conn_fd = -1;
return GC_FAIL;
}
#endif
hc->hs = hs;
(void)memset(&hc->client_addr, 0, sizeof(hc->client_addr));
netutils/thttpd/thttpd.c
+1 -5
View File
@@ -737,11 +737,7 @@ int thttpd_main(int argc, char **argv)
int cnum;
FAR struct connect_s *conn;
FAR httpd_conn *hc;
#ifdef CONFIG_NET_IPv6
struct sockaddr_in6 sa;
#else
struct sockaddr_in sa;
#endif
httpd_sockaddr sa;
struct timeval tv;
#ifdef CONFIG_THTTPD_DIR
int ret;