# HG changeset patch
# User masneyb
# Date 1078194550 0
# Node ID 1ffdbc487a7070057048897adee950127bccd943
# Parent  e55f3cd030480b16aa9fb13b7db2bff789865674
2004-3-1 Brian Masney <masneyb@gftp.org>

        * lib/ftps.c - set the protocol number to GFTP_FTPS_NUM

        * lib/https.c - set the protocol number to GFTP_HTTPS_NUM

        * lib/rfc959.c lib/rfc2068.c - remove references to checking for
        GFTP_FTP_NUM and GFTP_HTTP_NUM

diff -r e55f3cd03048 -r 1ffdbc487a70 ChangeLog
--- a/ChangeLog	Mon Mar 01 17:29:13 2004 +0000
+++ b/ChangeLog	Tue Mar 02 02:29:10 2004 +0000
@@ -1,3 +1,11 @@
+2004-3-1 Brian Masney <masneyb@gftp.org>
+	* lib/ftps.c - set the protocol number to GFTP_FTPS_NUM
+
+	* lib/https.c - set the protocol number to GFTP_HTTPS_NUM
+
+	* lib/rfc959.c lib/rfc2068.c - remove references to checking for
+	GFTP_FTP_NUM and GFTP_HTTP_NUM
+
 2004-2-29 Brian Masney <masneyb@gftp.org>
 	* lib/rfc959.c - in several instances, if an invalid response is
 	received from the server, make sure an error message is logged to the
@@ -2226,7 +2234,7 @@
 
 	* cvsclean - added this script
 
-	* *.[ch] - added $Id: ChangeLog,v 1.227 2004/02/29 14:35:58 masneyb Exp $ tags
+	* *.[ch] - added $Id: ChangeLog,v 1.228 2004/03/02 02:29:09 masneyb Exp $ tags
 
 	* debian/* - updated files from Debian maintainer
 
diff -r e55f3cd03048 -r 1ffdbc487a70 lib/ftps.c
--- a/lib/ftps.c	Mon Mar 01 17:29:13 2004 +0000
+++ b/lib/ftps.c	Tue Mar 02 02:29:10 2004 +0000
@@ -123,6 +123,7 @@
     return (ret);
 
   params = request->protocol_data;
+  request->protonum = GFTP_FTPS_NUM;
   params->auth_tls_start = ftps_auth_tls_start;
   request->get_next_file = ftps_get_next_file;
   request->init = ftps_init;
diff -r e55f3cd03048 -r 1ffdbc487a70 lib/https.c
--- a/lib/https.c	Mon Mar 01 17:29:13 2004 +0000
+++ b/lib/https.c	Tue Mar 02 02:29:10 2004 +0000
@@ -73,6 +73,7 @@
     return (ret);
 
   params = request->protocol_data;
+  request->protonum = GFTP_HTTPS_NUM;
   request->init = https_init;
   request->post_connect = gftp_ssl_session_setup;
   params->real_read_function = gftp_ssl_read;
diff -r e55f3cd03048 -r 1ffdbc487a70 lib/rfc2068.c
--- a/lib/rfc2068.c	Mon Mar 01 17:29:13 2004 +0000
+++ b/lib/rfc2068.c	Tue Mar 02 02:29:10 2004 +0000
@@ -58,7 +58,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->hostname != NULL, GFTP_EFATAL);
 
   params = request->protocol_data;
@@ -187,7 +186,6 @@
   ssize_t ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (command != NULL, GFTP_EFATAL);
 
   if (request->datafd < 0 && (conn_ret = rfc2068_connect (request)) != 0)
@@ -252,7 +250,6 @@
 rfc2068_disconnect (gftp_request * request)
 {
   g_return_if_fail (request != NULL);
-  g_return_if_fail (request->protonum == GFTP_HTTP_NUM);
 
   if (request->datafd > 0)
     {
@@ -281,7 +278,6 @@
   off_t size;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
 
   params = request->protocol_data;
@@ -354,7 +350,6 @@
   size_t len;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
 
   params = request->protocol_data;
   if (params->rbuf != NULL && params->rbuf->curpos != NULL)
@@ -383,7 +378,6 @@
   rfc2068_params * params;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
 
   if (request->datafd < 0)
     return (GFTP_EFATAL);
@@ -409,7 +403,6 @@
   off_t ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
 
   params = request->protocol_data;
   gftp_lookup_request_option (request, "use_http11", &use_http11);
@@ -458,7 +451,6 @@
   off_t size;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
 
   params = request->protocol_data;
@@ -622,7 +614,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (fle != NULL, GFTP_EFATAL);
 
   params = request->protocol_data;
@@ -669,7 +660,6 @@
   char *tempstr, *olddir;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_HTTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
 
   if (request->directory != directory)
diff -r e55f3cd03048 -r 1ffdbc487a70 lib/rfc959.c
--- a/lib/rfc959.c	Mon Mar 01 17:29:13 2004 +0000
+++ b/lib/rfc959.c	Tue Mar 02 02:29:10 2004 +0000
@@ -94,7 +94,6 @@
   ssize_t num_read;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
   *code = '\0';
@@ -144,7 +143,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (command != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -184,7 +182,6 @@
   intptr_t tmp;
 
   g_return_val_if_fail (request != NULL, NULL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, NULL);
 
   gftp_lookup_request_option (request, "proxy_config", &proxy_config);
 
@@ -357,7 +354,6 @@
   int r;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
 
   if (strcmp (directory, "..") == 0)
@@ -389,7 +385,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
   ret = rfc959_send_command (request, "SYST\r\n", 1);
@@ -435,7 +430,6 @@
   rfc959_parms * parms;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->hostname != NULL, GFTP_EFATAL);
 
   if (request->datafd > 0)
@@ -592,7 +586,6 @@
   rfc959_parms * parms;
 
   g_return_if_fail (request != NULL);
-  g_return_if_fail (request->protonum == GFTP_FTP_NUM);
 
   parms = request->protocol_data;
 
@@ -923,7 +916,6 @@
 rfc959_data_connection_new (gftp_request * request)
 {
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
 #ifdef HAVE_IPV6
@@ -953,7 +945,6 @@
   parms = request->protocol_data;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (parms->data_connection > 0, GFTP_EFATAL);
 
   gftp_lookup_request_option (request, "passive_transfer", &passive_transfer);
@@ -1024,7 +1015,6 @@
   char *tempstr;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
 
   parms = request->protocol_data;
   new_ascii = rfc959_is_ascii_transfer (request, filename);
@@ -1060,7 +1050,6 @@
   rfc959_parms * parms;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1136,7 +1125,6 @@
   rfc959_parms * parms;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (filename != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1264,7 +1252,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
   parms = request->protocol_data;
@@ -1294,7 +1281,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
   parms = request->protocol_data;
@@ -1326,7 +1312,6 @@
   char *tempstr, parms[3];
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
   if ((ret = rfc959_data_connection_new (request)) < 0)
@@ -1454,7 +1439,6 @@
   ssize_t len;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (fle != NULL, GFTP_EFATAL);
   g_return_val_if_fail (fd > 0, GFTP_EFATAL);
 
@@ -1515,7 +1499,6 @@
   int ret;
 
   g_return_val_if_fail (request != NULL, 0);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (filename != NULL, 0);
   g_return_val_if_fail (request->datafd > 0, 0);
 
@@ -1537,7 +1520,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1560,7 +1542,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (file != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1583,7 +1564,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (directory != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1607,7 +1587,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (oldname != NULL, GFTP_EFATAL);
   g_return_val_if_fail (newname != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
@@ -1640,7 +1619,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (file != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);
 
@@ -1664,7 +1642,6 @@
   char *tempstr, ret;
 
   g_return_val_if_fail (request != NULL, GFTP_EFATAL);
-  g_return_val_if_fail (request->protonum == GFTP_FTP_NUM, GFTP_EFATAL);
   g_return_val_if_fail (command != NULL, GFTP_EFATAL);
   g_return_val_if_fail (request->datafd > 0, GFTP_EFATAL);