diff lib/sshv2.c @ 168:c505d9ba9d53

2003-6-6 Brian Masney <[e-mail]> * lib/gftp.h - if USE_SSL is defined, include the OpenSSL headers. Added read_function, write_function and post_connect function pointers to gftp_request structure. Added SSL object to gftp_request structure if USE_SSL is defined. Added protocol number and init function declarations for the HTTPS protocol * lib/options.h - added HTTPS to the list of supported protocols * lib/protocols.c lib/cache.c lib/rfc2068.c lib/rfc959.c lib/sshv2.c - renamed gftp_read(), gftp_write() and gftp_set_sockblocking() to gftp_fd_read(), gftp_fd_write() and gftp_fd_set_sockblocking() respectively * lib/bookmark.c lib/local.c * lib/misc.c lib/rfc2068.c - moved base64_encode() to misc.c * lib/protocols.c - improved parsing of URLs. Rather than calling gftp_read() or gftp_write() directly, call the read_function or write_function that is set in the request structure. Expanded tabs to spaces. Cleanup for parsing of timestamps. In gftp_connect_server(), if a post_connect function pointer is set, call it after we are connected to the server. Improvements to gftp_get_line (). * lib/httpcommon.h lib/rfc2068.c - moved rfc2068_params structure to httpcommon.h. Fix for chunked file transfers, they were not handled at all before. Made the I/O calls a little more generic so that we can read from either a socket or a SSL connection. * lib/sslcommon.c - added generic SSL layer * lib/https.c - added support for the HTTPS protocol. It piggy backs off of the existing HTTP support and uses the generic SSL layer * src/gtk/bookmarks.c src/gtk/chmod_dialog.c src/gtk/gftp-gtk.c src/gtk/menu-items.c src/gtk/misc-gtk.c src/gtk/options_dialog.c src/gtk/view_dialog.c - set the window icon name to the gFTP <version> * configure.in - added lib back to SUBDIRS (oops) * lib/Makefile.am - added https.c, sslcommon.c and httpcommon.h

--- a/lib/sshv2.c	Wed May 28 18:37:28 2003 +0000
+++ b/lib/sshv2.c	Sun Jun 08 15:04:40 2003 +0000
@@ -269,7 +269,7 @@
   wrotepw = 0;
   ok = 1;
 
-  if (gftp_set_sockblocking (request, fd, 1) == -1)
+  if (gftp_fd_set_sockblocking (request, fd, 1) == -1)
     return (NULL);
 
   pwstr = g_strconcat (request->password, "\n", NULL);
@@ -277,7 +277,7 @@
   errno = 0;
   while (1)
     {
-      if ((rd = gftp_read (request, tempstr + diff, rem - 1, fd)) <= 0)
+      if ((rd = gftp_fd_read (request, tempstr + diff, rem - 1, fd)) <= 0)
         {
           ok = 0;
           break;
@@ -302,7 +302,7 @@
             }
               
           wrotepw = 1;
-          if (gftp_write (request, pwstr, strlen (pwstr), fd) < 0)
+          if (gftp_fd_write (request, pwstr, strlen (pwstr), fd) < 0)
             {
               ok = 0;
               break;
@@ -327,7 +327,7 @@
             }
 
           wrotepw = 1;
-          if (gftp_write (request, pwstr, strlen (pwstr), fd) < 0)
+          if (gftp_fd_write (request, pwstr, strlen (pwstr), fd) < 0)
             {
               ok = 0;
               break;
@@ -585,7 +585,7 @@
 
   sshv2_log_command (request, gftp_logging_send, type, buf + 5, len);
 
-  if ((ret = gftp_write (request, buf, len + 5, request->sockfd)) < 0)
+  if ((ret = gftp_fd_write (request, buf, len + 5, request->sockfd)) < 0)
     return (ret);
 
   return (0);
@@ -606,7 +606,7 @@
   rem = 5;
   while (rem > 0)
     {
-      if ((numread = gftp_read (request, pos, rem, fd)) < 0)
+      if ((numread = gftp_fd_read (request, pos, rem, fd)) < 0)
         return ((int) numread);
       rem -= numread;
       pos += numread;
@@ -634,7 +634,7 @@
   rem = message->length - 1;
   while (rem > 0)
     {
-      if ((numread = gftp_read (request, pos, rem, fd)) < 0)
+      if ((numread = gftp_fd_read (request, pos, rem, fd)) < 0)
         return ((int) numread);
       rem -= numread;
       pos += numread;
@@ -2255,7 +2255,10 @@
   request->protonum = GFTP_SSHV2_NUM;
   request->init = sshv2_init;
   request->destroy = sshv2_destroy;
+  request->read_function = gftp_fd_read;
+  request->write_function = gftp_fd_write;
   request->connect = sshv2_connect;
+  request->post_connect = NULL;
   request->disconnect = sshv2_disconnect;
   request->get_file = sshv2_get_file;
   request->put_file = sshv2_put_file;