Mercurial > ecos
annotate packages/net/ftpclient/current/src/ftpclient.c @ 1004:c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
IPv6. This meant changing from using the PORT command to using
EPRT, when setting up the data connection. EPRT is protocol
independant.
* tests/ftpclient1.c (ftp_test): Added tests which use IPv6
addresses. Fixed a few minor bugs with format strings.
* doc/ftpclient.sgml: Mention we support IPv6 and DNS.
| author | asl |
|---|---|
| date | Mon, 12 May 2003 10:02:08 +0000 |
| parents | 7fffb214536c |
| children | 353800bc5758 |
| 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. |
|
208
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
13 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
14 // 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
|
15 // 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
|
16 // 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
|
17 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
18 // 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
|
19 // 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
|
20 // 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
|
21 // for more details. |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
22 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
23 // 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
|
24 // 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
|
25 // 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
|
26 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
27 // 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
|
28 // 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
|
29 // 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
|
30 // 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
|
31 // 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
|
32 // 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
|
33 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
34 // 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
|
35 // 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
|
36 // |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
37 // 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
|
38 // 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
|
39 // ------------------------------------------- |
|
e0c0827131d1
Merge from eCos master repository on 2002-05-20-20:11:54-BST
jlarmour
parents:
198
diff
changeset
|
40 //####ECOSGPLCOPYRIGHTEND#### |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
41 //========================================================================== |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
42 //#####DESCRIPTIONBEGIN#### |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
43 // |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
44 // Author(s): andrew.lunn@ascom.ch |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
45 // Contributors: andrew.lunn@ascom.ch |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
46 // Date: 2001-11-4 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
47 // Purpose: |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
48 // Description: |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
49 // |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
50 //####DESCRIPTIONEND#### |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
51 // |
|
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 |
|
198
ea3f0bd33a73
Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents:
196
diff
changeset
|
54 #include <pkgconf/system.h> |
|
ea3f0bd33a73
Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents:
196
diff
changeset
|
55 |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
56 #include <network.h> |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
57 #include <stdio.h> |
|
269
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
58 #include <stdlib.h> |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
59 #include <sys/socket.h> |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
60 #include <netinet/in.h> |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
61 #include <arpa/inet.h> |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
62 #include <ctype.h> |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
63 #include "ftpclient.h" |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
64 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
65 /* 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
|
66 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
67 build_cmd(char *buf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
68 unsigned bufsize, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
69 char *cmd, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
70 char *arg1) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
71 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
72 int cnt; |
|
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 if (arg1) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
75 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
|
76 } else { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
77 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
|
78 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
79 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
80 if (cnt < bufsize) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
81 return 1; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
82 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
83 return 0; |
|
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 |
|
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 /* 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
|
88 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
|
89 the line. */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
90 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
91 get_line(int s, char *buf, unsigned buf_size,ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
92 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
93 int eol = 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
94 int cnt = 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
95 int ret; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
96 char c; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
97 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
98 while(!eol) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
99 ret = read(s,&c,1); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
100 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
101 if (ret != 1) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
102 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
|
103 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
104 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
105 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
106 if (c == '\n') { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
107 eol = 1; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
108 continue; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
109 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
110 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
111 if (cnt < buf_size) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
112 buf[cnt++] = c; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
113 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
114 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
115 if (cnt < buf_size) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
116 buf[cnt++] = '\0'; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
117 } else { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
118 buf[buf_size -1] = '\0'; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
119 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
120 return 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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
123 /* 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
|
124 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
|
125 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
|
126 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
|
127 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
128 get_reply(int s,ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
129 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
130 char buf[BUFSIZ]; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
131 int more = 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
132 int ret; |
|
269
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
133 int first_line=1; |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
134 int code=0; |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
135 |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
136 do { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
137 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
138 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
|
139 return(ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
140 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
141 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
142 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
|
143 |
|
269
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
144 if (first_line) { |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
145 code = strtoul(buf,NULL,0); |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
146 first_line=0; |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
147 more = (buf[3] == '-'); |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
148 } else { |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
149 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
|
150 (code == strtoul(buf,NULL,0)) && |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
151 buf[3]==' ') { |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
152 more=0; |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
153 } else { |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
154 more =1; |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
155 } |
|
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
156 } |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
157 } while (more); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
158 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
159 return (buf[0] - '0'); |
|
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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
162 /* Send a command to the server */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
163 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
164 send_cmd(int s,char * msgbuf,ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
165 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
166 int len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
167 int slen = strlen(msgbuf); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
168 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
169 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
|
170 if (slen < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
171 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
|
172 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
173 } else { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
174 ftp_printf(1,"write truncasted!\n"); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
175 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
176 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
177 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
178 return 1; |
|
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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
181 /* 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
|
182 MSB of the reply code. */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
183 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
184 command(char * cmd, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
185 char * arg, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
186 int s, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
187 char *msgbuf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
188 int msgbuflen, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
189 ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
190 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
191 int err; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
192 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
193 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
|
194 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
|
195 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
196 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
197 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
198 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
|
199 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
200 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
|
201 return(err); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
202 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
203 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
204 return (get_reply(s,ftp_printf)); |
|
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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
207 /* 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
|
208 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
|
209 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
210 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
211 connect_to_server(char *hostname, |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
212 struct sockaddr * local, |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
213 ftp_printf_t ftp_printf) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
214 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
215 int s, len; |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
216 int error; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
217 struct addrinfo *res, *nai; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
218 char name[80]; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
219 char port[8]; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
220 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
221 error = getaddrinfo(hostname, "ftp", NULL, &res); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
222 if (error != EAI_NONE) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
223 return FTP_NOSUCHHOST; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
224 } |
|
198
ea3f0bd33a73
Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents:
196
diff
changeset
|
225 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
226 nai=res; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
227 while (nai) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
228 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
|
229 if (s < 0) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
230 nai = nai->ai_next; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
231 continue; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
232 } |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
233 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
234 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
|
235 getnameinfo(nai->ai_addr, nai->ai_addrlen, |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
236 name, sizeof(name), NULL,0, NI_NUMERICHOST); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
237 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
|
238 close (s); |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
239 nai = nai->ai_next; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
240 continue; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
241 } |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
242 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
243 len = sizeof(struct sockaddr); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
244 if (getsockname(s, (struct sockaddr *)local, &len) < 0) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
245 ftp_printf(1,"getsockname failed %s\n",strerror(errno)); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
246 close(s); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
247 nai = nai->ai_next; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
248 continue; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
249 } |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
250 getnameinfo(nai->ai_addr, nai->ai_addrlen, |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
251 name, sizeof(name), port, sizeof(port), |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
252 NI_NUMERICHOST|NI_NUMERICSERV); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
253 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
254 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
|
255 freeaddrinfo(res); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
256 return (s); |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
257 } |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
258 freeaddrinfo(res); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
259 return FTP_NOSUCHHOST; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
260 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
261 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
262 /* 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
|
263 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
|
264 always needed. Is this true? */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
265 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
266 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
267 login(char * username, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
268 char *passwd, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
269 int s, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
270 char *msgbuf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
271 unsigned msgbuflen, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
272 ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
273 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
274 int ret; |
|
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 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
|
277 if (ret != 3) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
278 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
|
279 return (FTP_BADUSER); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
280 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
281 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
282 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
|
283 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
284 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
285 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
286 if (ret != 2) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
287 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
|
288 return (FTP_BADUSER); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
289 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
290 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
291 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
|
292 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
293 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
|
294 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
295 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
296 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
297 if (ret != 2) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
298 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
|
299 return (FTP_BAD); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
300 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
301 return (ret); |
|
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 |
|
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 /* 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
|
306 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
|
307 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
|
308 port we are listening on.*/ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
309 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
310 opendatasock(int ctrl_s, |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
311 struct sockaddr *ctrl, |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
312 char *msgbuf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
313 unsigned msgbuflen, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
314 ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
315 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
316 struct sockaddr local; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
317 char name[64]; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
318 char port[10]; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
319 socklen_t len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
320 int on = 1; |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
321 char buf[80]; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
322 int ret; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
323 int s; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
324 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
325 s = socket(ctrl->sa_family, SOCK_STREAM, 0); |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
326 if (s < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
327 ftp_printf(1,"socket: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
328 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
329 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
330 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
331 if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof (on)) < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
332 ftp_printf(1,"setsockopt: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
333 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
334 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
335 } |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
336 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
337 memcpy(&local,ctrl,sizeof(struct sockaddr)); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
338 switch (ctrl->sa_family) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
339 case AF_INET: { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
340 struct sockaddr_in * sa4 = (struct sockaddr_in *) &local; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
341 sa4->sin_port = 0; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
342 break; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
343 } |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
344 #ifdef CYGPKG_NET_INET6 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
345 case AF_INET6: { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
346 struct sockaddr_in6 * sa6 = (struct sockaddr_in6 *) &local; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
347 sa6->sin6_port = 0; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
348 break; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
349 } |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
350 #endif |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
351 default: |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
352 close (s); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
353 return FTP_BAD; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
354 } |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
355 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
356 if (bind(s,&local,local.sa_len) < 0) { |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
357 ftp_printf(1,"bind: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
358 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
359 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
360 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
361 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
362 len = sizeof(local); |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
363 if (getsockname(s,&local,&len) < 0) { |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
364 ftp_printf(1,"getsockname: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
365 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
366 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
367 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
368 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
369 if (listen(s, 1) < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
370 ftp_printf(1,"listen: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
371 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
372 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
373 } |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
374 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
375 getnameinfo(&local,sizeof(local),name,sizeof(name), port, sizeof(port), |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
376 NI_NUMERICHOST|NI_NUMERICSERV); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
377 switch (local.sa_family) { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
378 case AF_INET: { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
379 sprintf(buf,"|1|%s|%s|", name, port); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
380 break; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
381 } |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
382 #ifdef CYGPKG_NET_INET6 |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
383 case AF_INET6: { |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
384 sprintf(buf,"|2|%s|%s|", name, port); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
385 break; |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
386 } |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
387 #endif |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
388 default: |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
389 close (s); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
390 return (FTP_BAD); |
|
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
391 } |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
392 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
393 ret = command("EPRT",buf,ctrl_s,msgbuf,msgbuflen,ftp_printf); |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
394 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
395 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
396 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
397 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
398 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
399 if (ret != 2) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
400 ftp_printf(1,"FTP: PORT failed!\n"); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
401 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
402 return (FTP_BAD); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
403 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
404 return (s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
405 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
406 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
407 /* 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
|
408 afterwards */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
409 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
410 receive_file(int data_s, char *buf, int buf_size,ftp_printf_t ftp_printf) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
411 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
412 int remaining = buf_size; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
413 int finished = 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
414 int total_size=0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
415 char *bufp = buf; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
416 int len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
417 int s; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
418 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
419 s = accept(data_s,NULL,0); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
420 if (s<0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
421 ftp_printf(1,"listen: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
422 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
423 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
424 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
425 do { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
426 len = read(s,bufp,remaining); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
427 if (len < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
428 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
|
429 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
430 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
431 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
432 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
433 if (len == 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
434 finished = 1; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
435 } else { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
436 total_size += len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
437 remaining -= len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
438 bufp += len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
439 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
440 if (total_size == buf_size) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
441 ftp_printf(1,"FTP: File too big!\n"); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
442 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
443 return FTP_TOOBIG; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
444 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
445 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
446 } while (!finished); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
447 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
448 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
449 return total_size; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
450 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
451 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
452 /* 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
|
453 static int |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
454 send_file(int data_s, char *buf, int buf_size,ftp_printf_t ftp_printf) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
455 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
456 int remaining=buf_size; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
457 int finished = 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
458 char * bufp = buf; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
459 int len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
460 int s; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
461 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
462 s = accept(data_s,NULL,0); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
463 if (s<0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
464 ftp_printf(1,"listen: %s\n",strerror(errno)); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
465 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
466 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
467 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
468 do { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
469 len = write(s,bufp,remaining); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
470 if (len < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
471 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
|
472 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
473 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
474 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
475 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
476 if (len == remaining) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
477 finished = 1; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
478 } else { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
479 remaining -= len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
480 bufp += len; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
481 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
482 } while (!finished); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
483 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
484 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
485 return 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
486 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
487 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
488 /* All done, say bye, bye */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
489 static int quit(int s, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
490 char *msgbuf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
491 unsigned msgbuflen, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
492 ftp_printf_t ftp_printf) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
493 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
494 int ret; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
495 |
|
269
7fffb214536c
* src/ftpclient.c: Send "quit" not "quit " to keep some servers
asl
parents:
210
diff
changeset
|
496 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
|
497 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
498 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
499 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
500 if (ret != 2) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
501 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
|
502 return (FTP_BAD); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
503 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
504 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
505 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
|
506 return (0); |
|
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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
509 /* 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
|
510 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
|
511 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
|
512 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
|
513 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
|
514 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
|
515 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
|
516 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
|
517 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
|
518 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
|
519 indicating the type of error. */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
520 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
521 int ftp_get(char * hostname, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
522 char * username, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
523 char * passwd, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
524 char * filename, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
525 char * buf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
526 unsigned buf_size, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
527 ftp_printf_t ftp_printf) |
|
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 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
530 struct sockaddr local; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
531 char msgbuf[256]; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
532 int s,data_s; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
533 int bytes; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
534 int ret; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
535 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
536 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
|
537 if (s < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
538 return (s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
539 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
540 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
541 /* 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
|
542 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
|
543 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
|
544 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
545 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
546 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
547 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
548 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
|
549 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
550 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
551 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
552 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
553 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
554 /* 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
|
555 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
|
556 command ready to send */ |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
557 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
|
558 if (data_s < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
559 close (s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
560 return (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
561 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
562 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
563 /* Ask for the file */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
564 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
|
565 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
566 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
567 close(data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
568 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
569 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
570 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
571 if (ret != 1) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
572 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
|
573 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
574 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
575 return (FTP_BADFILENAME); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
576 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
577 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
578 if ((bytes=receive_file(data_s,buf,buf_size,ftp_printf)) < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
579 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
|
580 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
581 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
582 return (bytes); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
583 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
584 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
585 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
|
586 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
|
587 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
588 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
589 return (FTP_BAD); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
590 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
591 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
592 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
|
593 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
594 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
595 close(data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
596 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
597 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
598 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
599 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
600 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
601 return bytes; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
602 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
603 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
604 /* 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
|
605 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
|
606 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
|
607 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
|
608 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
|
609 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
|
610 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
|
611 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
|
612 returned indicating the type of error. */ |
|
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 int ftp_put(char * hostname, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
615 char * username, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
616 char * passwd, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
617 char * filename, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
618 char * buf, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
619 unsigned buf_size, |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
620 ftp_printf_t ftp_printf) |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
621 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
622 |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
623 struct sockaddr local; |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
624 char msgbuf[256]; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
625 int s,data_s; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
626 int ret; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
627 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
628 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
|
629 if (s < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
630 return (s); |
|
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 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
633 /* 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
|
634 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
|
635 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
|
636 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
637 return FTP_BAD; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
638 } |
|
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 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
|
641 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
642 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
643 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
644 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
645 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
646 /* 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
|
647 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
|
648 command ready to send */ |
|
1004
c1abcb7d0cf8
* src/ftpclient.c (connect_to_server): Added support for
asl
parents:
269
diff
changeset
|
649 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
|
650 if (data_s < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
651 close (s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
652 return (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
653 } |
|
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 /* Ask for the file */ |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
656 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
|
657 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
658 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
659 close(data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
660 return (ret); |
|
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 (ret != 1) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
664 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
|
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_BADFILENAME); |
|
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 if ((ret = send_file(data_s,buf,buf_size,ftp_printf)) < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
671 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
|
672 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
673 close(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 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
|
678 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
|
679 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
680 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
681 return (FTP_BAD); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
682 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
683 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
684 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
|
685 if (ret < 0) { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
686 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
687 close(data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
688 return (ret); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
689 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
690 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
691 close (data_s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
692 close(s); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
693 return 0; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
694 } |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
695 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
696 /* 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
|
697 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
|
698 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
|
699 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
|
700 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
|
701 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
|
702 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
703 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
|
704 { |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
705 va_list ap; |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
706 |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
707 va_start(ap, fmt); |
|
198
ea3f0bd33a73
Merge from eCos master repository on 2001-12-07-11:40:47-GMT
jlarmour
parents:
196
diff
changeset
|
708 diag_vprintf( fmt, ap); |
|
196
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
709 va_end(ap); |
|
9b55e9c69693
Merge from eCos master repository on 2001-11-23-15:32:03-GMT
jlarmour
parents:
diff
changeset
|
710 } |
