annotate packages/net/ftpclient/current/src/ftpclient.c @ 1792:435babd3f38e

* src/ftpclient.c (opendatasock): Don't clobber the socket variable with a temporary variable of local scope.
author asl
date Tue, 05 Oct 2004 08:04:34 +0000
parents 0e6a7d89dd0e
children 1f65cc07a3e5
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
1 //==========================================================================
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
2 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
3 // ftpclient.c
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
4 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
5 // A simple FTP client
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
6 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
7 //==========================================================================
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
8 //####ECOSGPLCOPYRIGHTBEGIN####
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
9 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
10 // This file is part of eCos, the Embedded Configurable Operating System.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
11 // Copyright (C) 1998, 1999, 2000, 2001, 2002 Red Hat, Inc.
269
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
12 // Copyright (C) 2002 Andrew Lunn.
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
13 // Copyright (C) 2004 Gary Thomas
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
14 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
15 // eCos is free software; you can redistribute it and/or modify it under
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
16 // the terms of the GNU General Public License as published by the Free
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
17 // Software Foundation; either version 2 or (at your option) any later version.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
18 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
19 // eCos is distributed in the hope that it will be useful, but WITHOUT ANY
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
20 // WARRANTY; without even the implied warranty of MERCHANTABILITY or
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
21 // FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
22 // for more details.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
23 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
24 // You should have received a copy of the GNU General Public License along
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
25 // with eCos; if not, write to the Free Software Foundation, Inc.,
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
26 // 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
27 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
28 // As a special exception, if other files instantiate templates or use macros
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
29 // or inline functions from this file, or you compile this file and link it
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
30 // with other works to produce a work based on this file, this file does not
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
31 // by itself cause the resulting work to be covered by the GNU General Public
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
32 // License. However the source code for this file must still be made available
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
33 // in accordance with section (3) of the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
34 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
35 // This exception does not invalidate any other reasons why a work based on
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
36 // this file might be covered by the GNU General Public License.
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
37 //
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
38 // Alternative licenses for eCos may be arranged by contacting Red Hat, Inc.
210
d2c90368aeef Merge from eCos master repository on 2002-05-23-21:39:14-BST
jlarmour
parents: 208
diff changeset
39 // at http://sources.redhat.com/ecos/ecos-license/
208
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
40 // -------------------------------------------
e0c0827131d1 Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents: 198
diff changeset
41 //####ECOSGPLCOPYRIGHTEND####
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
42 //==========================================================================
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
43 //#####DESCRIPTIONBEGIN####
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
44 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
45 // Author(s): andrew.lunn@ascom.ch
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
46 // Contributors: andrew.lunn@ascom.ch
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
47 // Date: 2001-11-4
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
48 // Purpose:
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
49 // Description:
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
50 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
51 //####DESCRIPTIONEND####
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
52 //
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
53 //==========================================================================
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
54
198
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents: 196
diff changeset
55 #include <pkgconf/system.h>
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
56 #include <pkgconf/net_ftpclient.h>
198
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents: 196
diff changeset
57
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
58 #include <network.h>
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
59 #include <stdio.h>
269
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
60 #include <stdlib.h>
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
61 #include <sys/socket.h>
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
62 #include <netinet/in.h>
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
63 #include <arpa/inet.h>
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
64 #include <ctype.h>
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
65 #include "ftpclient.h"
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
66
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
67 /* Build one command to send to the FTP server */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
68 static int
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
69 build_cmd(char *buf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
70 unsigned bufsize,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
71 char *cmd,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
72 char *arg1)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
73 {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
74 int cnt;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
75
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
76 if (arg1) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
77 cnt = snprintf(buf,bufsize,"%s %s\r\n",cmd,arg1);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
78 } else {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
79 cnt = snprintf(buf,bufsize,"%s\r\n",cmd);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
80 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
81
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
82 if (cnt < bufsize)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
83 return 1;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
84
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
85 return 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
86 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
87
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
88
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
89 /* Read one line from the server, being careful not to overrun the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
90 buffer. If we do reach the end of the buffer, discard the rest of
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
91 the line. */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
92 static int
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
93 get_line(int s, char *buf, unsigned buf_size, ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
94 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
95 int eol = 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
96 int cnt = 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
97 int ret;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
98 char c;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
99
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
100 while(!eol) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
101 ret = read(s,&c,1);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
102
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
103 if (ret != 1) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
104 ftp_printf(1,"read %s\n",strerror(errno));
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
105 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
106 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
107
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
108 if (c == '\n') {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
109 eol = 1;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
110 continue;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
111 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
112
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
113 if (cnt < buf_size) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
114 buf[cnt++] = c;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
115 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
116 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
117 if (cnt < buf_size) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
118 buf[cnt++] = '\0';
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
119 } else {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
120 buf[buf_size -1] = '\0';
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
121 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
122 return 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
123 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
124
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
125 /* Read the reply from the server and return the MSB from the return
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
126 code. This gives us a basic idea if the command failed/worked. The
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
127 reply can be spread over multiple lines. When this happens the line
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
128 will start with a - to indicate there is more*/
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
129 static int
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
130 get_reply(int s, ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
131 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
132 char buf[BUFSIZ];
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
133 int more = 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
134 int ret;
269
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
135 int first_line=1;
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
136 int code=0;
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
137
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
138 do {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
139
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
140 if ((ret=get_line(s,buf,sizeof(buf),ftp_printf)) < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
141 return(ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
142 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
143
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
144 ftp_printf(0,"FTP: %s\n",buf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
145
269
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
146 if (first_line) {
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
147 code = strtoul(buf,NULL,0);
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
148 first_line=0;
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
149 more = (buf[3] == '-');
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
150 } else {
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
151 if (isdigit(buf[0]) && isdigit(buf[1]) && isdigit(buf[2]) &&
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
152 (code == strtoul(buf,NULL,0)) &&
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
153 buf[3]==' ') {
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
154 more=0;
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
155 } else {
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
156 more =1;
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
157 }
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
158 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
159 } while (more);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
160
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
161 return (buf[0] - '0');
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
162 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
163
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
164 /* Send a command to the server */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
165 static int
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
166 send_cmd(int s, char * msgbuf, ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
167 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
168 int len;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
169 int slen = strlen(msgbuf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
170
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
171 if ((len = write(s,msgbuf,slen)) != slen) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
172 if (slen < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
173 ftp_printf(1,"write %s\n",strerror(errno));
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
174 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
175 } else {
1100
353800bc5758 * src/ftpclient.c (send_cmd): Fix typo in error message.
asl
parents: 1004
diff changeset
176 ftp_printf(1,"write truncated!\n");
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
177 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
178 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
179 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
180 return 1;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
181 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
182
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
183 /* Send a complete command to the server and receive the reply. Return the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
184 MSB of the reply code. */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
185 static int
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
186 command(char * cmd,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
187 char * arg,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
188 int s,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
189 char *msgbuf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
190 int msgbuflen,
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
191 ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
192 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
193 int err;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
194
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
195 if (!build_cmd(msgbuf,msgbuflen,cmd,arg)) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
196 ftp_printf(1,"FTP: %s command to long\n",cmd);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
197 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
198 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
199
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
200 ftp_printf(0,"FTP: Sending %s command\n",cmd);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
201
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
202 if ((err=send_cmd(s,msgbuf,ftp_printf)) < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
203 return(err);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
204 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
205
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
206 return (get_reply(s,ftp_printf));
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
207 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
208
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
209 /* Open a socket and connect it to the server. Also print out the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
210 address of the server for debug purposes.*/
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
211
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
212 static int
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
213 connect_to_server(char *hostname,
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
214 struct sockaddr * local,
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
215 ftp_printf_t ftp_printf)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
216 {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
217 int s, len;
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
218 int error;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
219 struct addrinfo *res, *nai;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
220 char name[80];
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
221 char port[8];
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
222
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
223 error = getaddrinfo(hostname, "ftp", NULL, &res);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
224 if (error != EAI_NONE) {
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
225 return FTP_NOSUCHHOST;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
226 }
198
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents: 196
diff changeset
227
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
228 nai=res;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
229 while (nai) {
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
230 s = socket(nai->ai_family, nai->ai_socktype,nai->ai_protocol);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
231 if (s < 0) {
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
232 nai = nai->ai_next;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
233 continue;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
234 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
235
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
236 if (connect(s, nai->ai_addr, nai->ai_addrlen) < 0) {
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
237 getnameinfo(nai->ai_addr, nai->ai_addrlen,
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
238 name, sizeof(name), NULL,0, NI_NUMERICHOST);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
239 ftp_printf(1,"FTP Connect to %s failed: %s\n",name, strerror(errno));
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
240 close (s);
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
241 nai = nai->ai_next;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
242 continue;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
243 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
244
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
245 len = sizeof(struct sockaddr);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
246 if (getsockname(s, (struct sockaddr *)local, &len) < 0) {
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
247 ftp_printf(1,"getsockname failed %s\n",strerror(errno));
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
248 close(s);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
249 nai = nai->ai_next;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
250 continue;
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
251 }
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
252 getnameinfo(nai->ai_addr, nai->ai_addrlen,
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
253 name, sizeof(name), port, sizeof(port),
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
254 NI_NUMERICHOST|NI_NUMERICSERV);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
255
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
256 ftp_printf(0,"FTP: Connected to %s:%s\n", name, port);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
257 freeaddrinfo(res);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
258 return (s);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
259 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
260 freeaddrinfo(res);
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
261 return FTP_NOSUCHHOST;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
262 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
263
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
264 /* Perform a login to the server. Pass the username and password and
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
265 put the connection into binary mode. This assumes a passwd is
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
266 always needed. Is this true? */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
267
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
268 static int
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
269 login(char * username,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
270 char *passwd,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
271 int s,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
272 char *msgbuf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
273 unsigned msgbuflen,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
274 ftp_printf_t ftp_printf) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
275
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
276 int ret;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
277
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
278 ret = command("USER",username,s,msgbuf,msgbuflen,ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
279 if (ret != 3) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
280 ftp_printf(1,"FTP: User %s not accepted\n",username);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
281 return (FTP_BADUSER);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
282 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
283
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
284 ret = command("PASS",passwd,s,msgbuf,msgbuflen,ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
285 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
286 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
287 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
288 if (ret != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
289 ftp_printf(1,"FTP: Login failed for User %s\n",username);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
290 return (FTP_BADUSER);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
291 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
292
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
293 ftp_printf(0,"FTP: Login sucessfull\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
294
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
295 ret = command("TYPE","I",s,msgbuf,msgbuflen,ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
296 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
297 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
298 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
299 if (ret != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
300 ftp_printf(1,"FTP: TYPE failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
301 return (FTP_BAD);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
302 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
303 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
304 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
305
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
306
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
307 /* Open a data socket. This is a client socket, i.e. its listening
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
308 waiting for the FTP server to connect to it. Once the socket has been
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
309 opened send the port command to the server so the server knows which
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
310 port we are listening on.*/
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
311 static int
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
312 opendatasock(int ctrl_s,
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
313 struct sockaddr *ctrl,
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
314 char *msgbuf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
315 unsigned msgbuflen,
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
316 ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
317 {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
318 struct sockaddr local;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
319 char name[64];
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
320 char port[10];
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
321 socklen_t len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
322 int on = 1;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
323 char buf[80];
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
324 int ret;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
325 int s;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
326
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
327 s = socket(ctrl->sa_family, SOCK_STREAM, 0);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
328 if (s < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
329 ftp_printf(1,"socket: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
330 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
331 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
332
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
333 if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof (on)) < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
334 ftp_printf(1,"setsockopt: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
335 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
336 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
337 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
338
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
339 memcpy(&local,ctrl,sizeof(struct sockaddr));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
340 switch (ctrl->sa_family) {
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
341 case AF_INET: {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
342 struct sockaddr_in * sa4 = (struct sockaddr_in *) &local;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
343 sa4->sin_port = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
344 break;
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
345 }
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
346 #ifdef CYGPKG_NET_INET6
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
347 case AF_INET6: {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
348 struct sockaddr_in6 * sa6 = (struct sockaddr_in6 *) &local;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
349 sa6->sin6_port = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
350 break;
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
351 }
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
352 #endif
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
353 default:
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
354 close (s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
355 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
356 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
357
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
358 if (bind(s,&local,local.sa_len) < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
359 ftp_printf(1,"bind: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
360 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
361 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
362 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
363
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
364 len = sizeof(local);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
365 if (getsockname(s,&local,&len) < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
366 ftp_printf(1,"getsockname: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
367 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
368 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
369 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
370
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
371 if (listen(s, 1) < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
372 ftp_printf(1,"listen: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
373 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
374 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
375 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
376
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
377 getnameinfo(&local, sizeof(local), name, sizeof(name), port, sizeof(port),
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
378 NI_NUMERICHOST|NI_NUMERICSERV);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
379 switch (local.sa_family) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
380 case AF_INET: {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
381 snprintf(buf, sizeof(buf), "|1|%s|%s|", name, port);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
382 break;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
383 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
384 #ifdef CYGPKG_NET_INET6
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
385 case AF_INET6: {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
386 snprintf(buf, sizeof(buf), "|2|%s|%s|", name, port);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
387 break;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
388 }
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
389 #endif
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
390 default:
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
391 close (s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
392 return (FTP_BAD);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
393 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
394
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
395 ret = command("EPRT",buf,ctrl_s,msgbuf,msgbuflen,ftp_printf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
396 if (ret < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
397 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
398 return (ret);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
399 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
400
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
401 if (ret != 2) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
402 int _port = atoi(port);
1792
435babd3f38e * src/ftpclient.c (opendatasock): Don't clobber the socket
asl
parents: 1650
diff changeset
403 char *str = name;
435babd3f38e * src/ftpclient.c (opendatasock): Don't clobber the socket
asl
parents: 1650
diff changeset
404 while (*str) {
435babd3f38e * src/ftpclient.c (opendatasock): Don't clobber the socket
asl
parents: 1650
diff changeset
405 if (*str == '.') *str = ',';
435babd3f38e * src/ftpclient.c (opendatasock): Don't clobber the socket
asl
parents: 1650
diff changeset
406 str++;
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
407 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
408 snprintf(buf, sizeof(buf), "%s,%d,%d", name, _port/256, _port%256);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
409 ret = command("PORT",buf,ctrl_s,msgbuf,msgbuflen,ftp_printf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
410 if (ret < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
411 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
412 return (ret);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
413 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
414 if (ret != 2) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
415 ftp_printf(1,"FTP: PORT failed!\n");
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
416 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
417 return (FTP_BAD);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
418 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
419 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
420 return (s);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
421 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
422
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
423 /* Receive the file into the buffer and close the data socket
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
424 afterwards */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
425 static int
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
426 receive_file(int data_s, ftp_write_t ftp_write, void *ftp_write_priv, ftp_printf_t ftp_printf)
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
427 {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
428 char *buf;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
429 int finished = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
430 int total_size=0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
431 int len, wlen;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
432 int s;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
433
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
434 if ((buf = (char *)malloc(CYGNUM_NET_FTPCLIENT_BUFSIZE)) == (char *)0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
435 return FTP_NOMEMORY;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
436 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
437 s = accept(data_s, NULL, 0);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
438 if (s < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
439 ftp_printf(1, "listen: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
440 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
441 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
442 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
443
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
444 do {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
445 len = read(s, buf, CYGNUM_NET_FTPCLIENT_BUFSIZE);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
446 if (len < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
447 ftp_printf(1, "read: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
448 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
449 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
450 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
451 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
452
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
453 if (len == 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
454 finished = 1;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
455 } else {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
456 wlen = (*ftp_write)(buf, len, ftp_write_priv);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
457 if (wlen != len) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
458 ftp_printf(1, "FTP: File too big!\n");
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
459 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
460 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
461 return FTP_TOOBIG;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
462 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
463 total_size += len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
464 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
465 } while (!finished);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
466
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
467 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
468 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
469 return total_size;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
470 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
471
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
472 /* Receive the file into the buffer and close the socket afterwards*/
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
473 static int
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
474 send_file(int data_s, ftp_read_t ftp_read, void *ftp_read_priv, ftp_printf_t ftp_printf)
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
475 {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
476 char *buf;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
477 int len, rlen;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
478 int s;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
479
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
480 if ((buf = (char *)malloc(CYGNUM_NET_FTPCLIENT_BUFSIZE)) == (char *)0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
481 return FTP_NOMEMORY;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
482 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
483 s = accept(data_s,NULL,0);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
484 if (s<0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
485 ftp_printf(1,"listen: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
486 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
487 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
488 }
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
489
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
490 do {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
491 rlen = (*ftp_read)(buf, CYGNUM_NET_FTPCLIENT_BUFSIZE, ftp_read_priv);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
492 if (rlen > 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
493 len = write(s, buf, rlen);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
494 if (len < 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
495 ftp_printf(1,"write: %s\n",strerror(errno));
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
496 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
497 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
498 return FTP_BAD;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
499 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
500 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
501 } while (rlen > 0);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
502
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
503 close(s);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
504 free(buf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
505 return 0;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
506 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
507
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
508 /* All done, say bye, bye */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
509 static int quit(int s,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
510 char *msgbuf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
511 unsigned msgbuflen,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
512 ftp_printf_t ftp_printf) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
513
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
514 int ret;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
515
269
7fffb214536c * src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents: 210
diff changeset
516 ret = command("QUIT",NULL,s,msgbuf,msgbuflen,ftp_printf);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
517 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
518 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
519 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
520 if (ret != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
521 ftp_printf(1,"FTP: Quit failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
522 return (FTP_BAD);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
523 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
524
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
525 ftp_printf(0,"FTP: Connection closed\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
526 return (0);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
527 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
528
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
529 /* Get a file from an FTP server. Hostname is the name/IP address of
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
530 the server. username is the username used to connect to the server
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
531 with. Passwd is the password used to authentificate the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
532 username. filename is the name of the file to receive. It should be
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
533 the full pathname of the file. buf is a pointer to a buffer the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
534 contents of the file should be placed in and buf_size is the size
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
535 of the buffer. If the file is bigger than the buffer, buf_size
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
536 bytes will be retrieved and an error code returned. ftp_printf is a
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
537 function to be called to perform printing. On success the number of
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
538 bytes received is returned. On error a negative value is returned
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
539 indicating the type of error. */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
540
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
541 struct _ftp_data{
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
542 char *buf;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
543 int len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
544 int max_len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
545 };
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
546
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
547 static int _ftp_read(char *buf, int len, void *priv)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
548 {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
549 struct _ftp_data *dp = (struct _ftp_data *)priv;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
550 int res = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
551
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
552 // FTP data channel desires to write 'len' bytes. Fetch up
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
553 // to that amount into 'buf'
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
554 if (dp->len > 0) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
555 res = dp->len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
556 if (res > len) res = len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
557 memcpy(buf, dp->buf, res);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
558 dp->buf += len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
559 dp->len -= res;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
560 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
561 return res;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
562 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
563
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
564 static int _ftp_write(char *buf, int len, void *priv)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
565 {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
566 struct _ftp_data *dp = (struct _ftp_data *)priv;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
567 int res = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
568
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
569 // FTP data channel has 'len' bytes that have been read.
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
570 // Move into 'buf', respecting the max size of 'buf'
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
571 if (dp->len < dp->max_len) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
572 res = dp->max_len - dp->len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
573 if (res > len) {
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
574 res = len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
575 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
576 memcpy(dp->buf, buf, res);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
577 dp->buf += len;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
578 dp->len += res;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
579 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
580 return res;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
581 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
582
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
583 int ftp_get(char * hostname,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
584 char * username,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
585 char * passwd,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
586 char * filename,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
587 char * buf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
588 unsigned buf_size,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
589 ftp_printf_t ftp_printf)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
590 {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
591 struct _ftp_data ftp_data;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
592
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
593 ftp_data.buf = buf;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
594 ftp_data.len = 0;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
595 ftp_data.max_len = buf_size;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
596 return ftp_get_var(hostname, username, passwd, filename, _ftp_write, &ftp_data, ftp_printf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
597 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
598
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
599 int ftp_get_var(char *hostname,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
600 char *username,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
601 char *passwd,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
602 char *filename,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
603 ftp_write_t ftp_write,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
604 void *ftp_write_priv,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
605 ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
606 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
607
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
608 struct sockaddr local;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
609 char msgbuf[256];
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
610 int s,data_s;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
611 int bytes;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
612 int ret;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
613
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
614 s = connect_to_server(hostname,&local,ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
615 if (s < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
616 return (s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
617 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
618
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
619 /* Read the welcome message from the server */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
620 if (get_reply(s,ftp_printf) != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
621 ftp_printf(0,"FTP: Server refused connection\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
622 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
623 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
624 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
625
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
626 ret = login(username,passwd,s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
627 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
628 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
629 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
630 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
631
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
632 /* We are now logged in and ready to transfer the file. Open the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
633 data socket ready to receive the file. It also build the PORT
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
634 command ready to send */
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
635 data_s = opendatasock(s,&local,msgbuf,sizeof(msgbuf),ftp_printf);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
636 if (data_s < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
637 close (s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
638 return (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
639 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
640
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
641 /* Ask for the file */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
642 ret = command("RETR",filename,s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
643 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
644 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
645 close(data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
646 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
647 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
648
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
649 if (ret != 1) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
650 ftp_printf(0,"FTP: RETR failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
651 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
652 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
653 return (FTP_BADFILENAME);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
654 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
655
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
656 if ((bytes=receive_file(data_s,ftp_write,ftp_write_priv,ftp_printf)) < 0) {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
657 ftp_printf(0,"FTP: Receiving file failed\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
658 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
659 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
660 return (bytes);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
661 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
662
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
663 if (get_reply(s,ftp_printf) != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
664 ftp_printf(0,"FTP: Transfer failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
665 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
666 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
667 return (FTP_BAD);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
668 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
669
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
670 ret = quit(s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
671 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
672 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
673 close(data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
674 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
675 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
676
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
677 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
678 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
679 return bytes;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
680 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
681
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
682 /* Put a file on an FTP server. Hostname is the name/IP address of the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
683 server. username is the username used to connect to the server
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
684 with. Passwd is the password used to authentificate the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
685 username. filename is the name of the file to receive. It should be
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
686 the full pathname of the file. buf is a pointer to a buffer the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
687 contents of the file should be placed in and buf_size is the size
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
688 of the buffer. ftp_printf is a function to be called to perform
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
689 printing. On success 0 is returned. On error a negative value is
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
690 returned indicating the type of error. */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
691
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
692 int ftp_put(char * hostname,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
693 char * username,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
694 char * passwd,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
695 char * filename,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
696 char * buf,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
697 unsigned buf_size,
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
698 ftp_printf_t ftp_printf)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
699 {
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
700 struct _ftp_data ftp_data;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
701
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
702 ftp_data.buf = buf;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
703 ftp_data.len = buf_size;
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
704 return ftp_put_var(hostname, username, passwd, filename, _ftp_read, &ftp_data, ftp_printf);
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
705 }
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
706
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
707 int ftp_put_var(char *hostname,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
708 char *username,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
709 char *passwd,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
710 char *filename,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
711 ftp_read_t ftp_read,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
712 void *ftp_read_priv,
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
713 ftp_printf_t ftp_printf)
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
714 {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
715
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
716 struct sockaddr local;
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
717 char msgbuf[256];
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
718 int s,data_s;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
719 int ret;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
720
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
721 s = connect_to_server(hostname,&local,ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
722 if (s < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
723 return (s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
724 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
725
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
726 /* Read the welcome message from the server */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
727 if (get_reply(s,ftp_printf) != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
728 ftp_printf(1,"FTP: Server refused connection\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
729 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
730 return FTP_BAD;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
731 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
732
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
733 ret = login(username,passwd,s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
734 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
735 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
736 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
737 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
738
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
739 /* We are now logged in and ready to transfer the file. Open the
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
740 data socket ready to receive the file. It also build the PORT
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
741 command ready to send */
1004
c1abcb7d0cf8 * src/ftpclient.c (connect_to_server): Added support for
asl
parents: 269
diff changeset
742 data_s = opendatasock(s,&local,msgbuf,sizeof(msgbuf),ftp_printf);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
743 if (data_s < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
744 close (s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
745 return (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
746 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
747
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
748 /* Ask for the file */
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
749 ret = command("STOR",filename,s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
750 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
751 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
752 close(data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
753 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
754 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
755
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
756 if (ret != 1) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
757 ftp_printf(1,"FTP: STOR failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
758 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
759 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
760 return (FTP_BADFILENAME);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
761 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
762
1650
0e6a7d89dd0e New stream oriented functions - ftp_get_var()/ftp_put_var()
gthomas
parents: 1100
diff changeset
763 if ((ret = send_file(data_s,ftp_read,ftp_read_priv,ftp_printf)) < 0) {
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
764 ftp_printf(1,"FTP: Sending file failed\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
765 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
766 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
767 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
768 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
769
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
770 if (get_reply(s,ftp_printf) != 2) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
771 ftp_printf(1,"FTP: Transfer failed!\n");
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
772 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
773 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
774 return (FTP_BAD);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
775 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
776
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
777 ret = quit(s,msgbuf,sizeof(msgbuf),ftp_printf);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
778 if (ret < 0) {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
779 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
780 close(data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
781 return (ret);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
782 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
783
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
784 close (data_s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
785 close(s);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
786 return 0;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
787 }
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
788
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
789 /* An example ftp_printf function. This uses the standard eCos diag
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
790 output device for outputting error and diagnostic messages. The
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
791 function take one addition parameter to the normal printf function. The
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
792 first parameter indicates when the message is an error message when
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
793 true. This can be used to filter errors from diagnostic output. In
198
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents: 196
diff changeset
794 this example the error parameter is ignored and everything printed. */
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
795
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
796 void ftpclient_printf(unsigned error, const char *fmt, ...)
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
797 {
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
798 va_list ap;
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
799
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
800 va_start(ap, fmt);
198
ea3f0bd33a73 Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents: 196
diff changeset
801 diag_vprintf( fmt, ap);
196
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
802 va_end(ap);
9b55e9c69693 Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff changeset
803 }