avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ran...@apache.org
Subject cvs commit: jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver FtpDataConnection.java
Date Fri, 08 Mar 2002 06:34:44 GMT
rana_b      02/03/07 22:34:44

  Modified:    ftpserver/src/java/org/apache/avalon/ftpserver
                        FtpDataConnection.java
  Log:
  multihome support
  
  Revision  Changes    Path
  1.5       +5 -2      jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpDataConnection.java
  
  Index: FtpDataConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/ftpserver/src/java/org/apache/avalon/ftpserver/FtpDataConnection.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FtpDataConnection.java	6 Mar 2002 13:54:40 -0000	1.4
  +++ FtpDataConnection.java	8 Mar 2002 06:34:44 -0000	1.5
  @@ -80,13 +80,14 @@
       public void setPasvCommand() throws FtpException {
           try {
             reset();
  -          mServSoc = new ServerSocket(0, 1, mConfig.getServerAddress());
  +          mAddress = mConfig.getSelfAddress();
  +          mServSoc = new ServerSocket(0, 1, mAddress);
             mServSoc.setSoTimeout(60000);
  -          mAddress = mServSoc.getInetAddress();
             miPort = mServSoc.getLocalPort();
             mbPasv = true;
           }
           catch(Exception ex) {
  +            mConfig.getLogger().warn("FtpDataConnection.setPasvCommand()", ex);
               throw new FtpException(550);
           }
       }
  @@ -101,6 +102,7 @@
               mDataSoc.setSoTimeout(60000);
           }
           catch(Exception ex) {
  +            mConfig.getLogger().warn("FtpDataConnection.listenPasvConnection()", ex);
               throw new FtpException(425);
           }
       }
  @@ -132,6 +134,7 @@
                   mDataSoc.setSoTimeout(60000);                  
               }
               catch(Exception ex) {
  +                mConfig.getLogger().warn("FtpDataConnection.getDataSocket()", ex);
                   mDataSoc = null;
               }
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message