aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-09 23:10:15 +0000
committerpatacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>2012-02-09 23:10:15 +0000
commit84df1adb6418fabd08a3a98481143ef21eeafc51 (patch)
tree640a178a1676f5429eefc694e4fd3d6f33765ca4
parent4f5b04c8e5842b06ec96b4c774792696cc635991 (diff)
downloadpx4-firmware-84df1adb6418fabd08a3a98481143ef21eeafc51.tar.gz
px4-firmware-84df1adb6418fabd08a3a98481143ef21eeafc51.tar.bz2
px4-firmware-84df1adb6418fabd08a3a98481143ef21eeafc51.zip
Fix an FTPD bug
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@4378 7fd9a85b-ad96-42d3-883c-3090e2eb8679
-rwxr-xr-xapps/netutils/ftpd/ftpd.c2
-rw-r--r--nuttx/ChangeLog3
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/netutils/ftpd/ftpd.c b/apps/netutils/ftpd/ftpd.c
index af11b3960..ff27d794a 100755
--- a/apps/netutils/ftpd/ftpd.c
+++ b/apps/netutils/ftpd/ftpd.c
@@ -3063,7 +3063,7 @@ static int ftpd_command_pasv(FAR struct ftpd_session_s *session)
else
#endif
#ifndef CONFIG_NET_IPv6
- if (session->data.addr.ss.ss_family != AF_INET)
+ if (session->data.addr.ss.ss_family == AF_INET)
{
/* Fixed to ipv4 */
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 444119973..a5856e50f 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -2449,4 +2449,5 @@
* include/pthread.h: Correct PTHREAD_MUTEX_INITIALIZER.
* fs/fat/fs_fatfs.c: Fix and error in the FAT statfs() implementation that
was causing some block counts to be reported incorrectly (reported by
- david_s5y). \ No newline at end of file
+ David Sidrane).
+