[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kfm-devel
Subject:    Re: KFM Patch Collection Page
From:       David Faure <faure () alpha ! tat ! physik ! uni-tuebingen ! de>
Date:       1999-05-20 18:54:26
[Download RAW message or body]

On Thu, May 20, 1999 at 02:13:35PM -0400, Dawit Alemayehu wrote:
> Hello all,
> 
> I have created a sort of patch collection web page for KFM.
> I initially started this for my own use (locally), but thought
> it might be useful for others as well.  So please check out at
> 
> 	http://home.earthlink.net/~adawit/kde/
> 
> and give me feedback.

Great.

Please replace the fix for ftp uploading with the attached one,
which has been sent to me. It's supposed to fix the problem and yet
keep passive mode.

Thanks to Peter Gruber <peter.gruber@stud.uni-regensburg.de>

-- 
David FAURE
david.faure@insa-lyon.fr, faure@kde.org
http://www.insa-lyon.fr/People/AEDI/dfaure/index.html 
KDE, Making The Future of Computing Available Today


["new.diff" (text/plain)]

--- ftp.cpp	Tue Apr  6 16:37:47 1999
+++ ftp.cpp	Thu May 20 19:36:33 1999
@@ -349,7 +349,7 @@
 	       struct sockaddr sa;
 	       struct sockaddr_in in;
     } sin;
-    struct linger lng = { 0, 0 };
+    struct linger lng = { 1, 120 };
 
     pasv=1;
     if (sDatal != -1)
@@ -400,6 +400,8 @@
 	       return 0;
     }
 
+    if (setsockopt(sDatal, SOL_SOCKET, SO_KEEPALIVE, (char *) &on, (int) sizeof(on)) < 0)
+	       perror("Keepalive not allowed.");
     if (setsockopt(sDatal, SOL_SOCKET,SO_LINGER, (char *) &lng,(int) sizeof (lng)) < 0)
 	       perror("Linger mode was not allowed.");
     return 1;
@@ -460,14 +462,14 @@
     FD_ZERO(&mask);
     FD_SET(sDatal,&mask);
 
+    if (pasv == 1)
+    {
+	    return sDatal;
+    }
     if (select( sDatal + 1, &mask,NULL,NULL, 0L) == 0)
     {
 		close(sDatal);
 		return -2;
-    }
-    if (pasv == 1)
-    {
-	    return sDatal;
     }
 
     l = sizeof(addr);


[prev in list] [next in list] [prev in thread] [next in thread]