diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-11 12:30:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-11 12:30:23 -0600 |
| commit | 8afce11c793cef769c327f81616f417b9d758569 (patch) | |
| tree | b55b1318c106ac012c84920420923b1d1a15d7a0 /apps/netutils/ftpd/ftpd.c | |
| parent | 8e99f6bfed3e066cec389ea80efd83ea86f7d067 (diff) | |
| download | nuttx-8afce11c793cef769c327f81616f417b9d758569.tar.gz nuttx-8afce11c793cef769c327f81616f417b9d758569.tar.bz2 nuttx-8afce11c793cef769c327f81616f417b9d758569.zip | |
Fix netutils configuration issues: CONFIG_NETUTILS_HTTPD_SENDFILE was missing from Kconfig; CONFIG_NET_HAVE_SOLINGER should be CONFIG_NET_SOLINGER; Type of CONFIG_NET_HTTPD_MAXPATH was wrong in Kconfig file. From Max
Diffstat (limited to 'apps/netutils/ftpd/ftpd.c')
| -rw-r--r-- | apps/netutils/ftpd/ftpd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/netutils/ftpd/ftpd.c b/apps/netutils/ftpd/ftpd.c index 4262b2619..51e1b35b1 100644 --- a/apps/netutils/ftpd/ftpd.c +++ b/apps/netutils/ftpd/ftpd.c @@ -1039,7 +1039,7 @@ static int ftpd_dataopen(FAR struct ftpd_session_s *session) return -errval; } -#ifdef CONFIG_NET_HAVE_SOLINGER +#ifdef CONFIG_NET_SOLINGER { struct linger ling; @@ -1070,7 +1070,7 @@ static int ftpd_dataopen(FAR struct ftpd_session_s *session) close(session->data.sd); session->data.sd = sd; -#ifdef CONFIG_NET_HAVE_SOLINGER +#ifdef CONFIG_NET_SOLINGER { struct linger ling; @@ -3988,7 +3988,7 @@ static void ftpd_workersetup(FAR struct ftpd_session_s *session) #if defined(CONFIG_NET_HAVE_IPTOS) || defined(CONFIG_NET_HAVE_OOBINLINE) int temp; #endif -#ifdef CONFIG_NET_HAVE_SOLINGER +#ifdef CONFIG_NET_SOLINGER struct linger ling; #endif @@ -4002,7 +4002,7 @@ static void ftpd_workersetup(FAR struct ftpd_session_s *session) (void)setsockopt(session->cmd.sd, SOL_SOCKET, SO_OOBINLINE, &temp, sizeof(temp)); #endif -#ifdef CONFIG_NET_HAVE_SOLINGER +#ifdef CONFIG_NET_SOLINGER (void)memset(&ling, 0, sizeof(ling)); ling.l_onoff = 1; ling.l_linger = 4; |