diff --git a/ftp/srcs/client/cli_ls.c b/ftp/srcs/client/cli_ls.c index b6933ba8..5221f93c 100644 --- a/ftp/srcs/client/cli_ls.c +++ b/ftp/srcs/client/cli_ls.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/08 13:43:10 by jhalford #+# #+# */ -/* Updated: 2017/11/12 14:19:35 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:20:26 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ftp/srcs/client/cli_pasv.c b/ftp/srcs/client/cli_pasv.c index e4659550..e6e7e9d6 100644 --- a/ftp/srcs/client/cli_pasv.c +++ b/ftp/srcs/client/cli_pasv.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/09 11:19:41 by jhalford #+# #+# */ -/* Updated: 2017/11/12 15:01:58 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:21:04 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ftp/srcs/client/crlf.c b/ftp/srcs/client/crlf.c index 5e88559d..06d061d1 100644 --- a/ftp/srcs/client/crlf.c +++ b/ftp/srcs/client/crlf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/08 19:52:07 by jhalford #+# #+# */ -/* Updated: 2017/11/20 13:00:14 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:24:00 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ @@ -52,7 +52,6 @@ int ftp_recv(int sock, char **msg) return (-1); if (ret == 0) return (-1); - console_msg(2, "recv size=%i", ret); buf[ret] = 0; if (buf[ret - 1] == '\n' && buf[ret - 2] == '\r') { diff --git a/ftp/srcs/client/dconn.c b/ftp/srcs/client/dconn.c index a313733e..fb4399c1 100644 --- a/ftp/srcs/client/dconn.c +++ b/ftp/srcs/client/dconn.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/08 14:55:15 by jhalford #+# #+# */ -/* Updated: 2017/11/15 13:11:45 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:20:44 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ftp/srcs/client/ftp_crlf.c b/ftp/srcs/client/ftp_crlf.c new file mode 100644 index 00000000..583c91c3 --- /dev/null +++ b/ftp/srcs/client/ftp_crlf.c @@ -0,0 +1,58 @@ +/* ************************************************************************** */ +/* */ +/* ::: :::::::: */ +/* ftp_crlf.c :+: :+: :+: */ +/* +:+ +:+ +:+ */ +/* By: jhalford +#+ +:+ +#+ */ +/* +#+#+#+#+#+ +#+ */ +/* Created: 2017/11/20 12:45:58 by jhalford #+# #+# */ +/* Updated: 2017/11/20 13:23:21 by jhalford ### ########.fr */ +/* */ +/* ************************************************************************** */ + +#include "ftp_client.h" + +int ftp_send(int sock, char *msg, ...) +{ + int err; + char *crlf_tmp; + char *crlf_msg; + va_list ap; + + va_start(ap, msg); + ft_vasprintf(&crlf_tmp, msg, ap); + console_msg(1, "---> %s", crlf_tmp); + crlf_msg = ft_strjoin(crlf_tmp, "\r\n"); + if ((err = send(sock, crlf_msg, ft_strlen(crlf_msg), 0)) < 0) + { + return (err); + } + ft_strdel(&crlf_tmp); + ft_strdel(&crlf_msg); + return (ft_atoi(msg)); +} + +int ftp_msg(t_ftp *ftp, char **msg) +{ + int code; + + if (ftp_recv(ftp->cmd_sock, msg) < 0) + { + console_msg(0, "server terminated"); + exit(0); + } + code = ft_atoi(*msg); + console_msg(0, "<--- %s", *msg); + return (code); +} + +int ftp_code(t_ftp *ftp) +{ + char *msg; + int code; + + if ((code = ftp_msg(ftp, &msg)) < 0) + return (-1); + ft_strdel(&msg); + return (code); +} diff --git a/ftp/srcs/server/crlf.c b/ftp/srcs/server/crlf.c index a14789a1..42caf158 100644 --- a/ftp/srcs/server/crlf.c +++ b/ftp/srcs/server/crlf.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/08 19:52:07 by jhalford #+# #+# */ -/* Updated: 2017/11/15 13:27:59 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:21:25 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/ftp/srcs/server/dconn.c b/ftp/srcs/server/dconn.c index 33e52be7..eae48066 100644 --- a/ftp/srcs/server/dconn.c +++ b/ftp/srcs/server/dconn.c @@ -6,7 +6,7 @@ /* By: jhalford +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2017/11/08 14:55:15 by jhalford #+# #+# */ -/* Updated: 2017/11/15 13:11:03 by jhalford ### ########.fr */ +/* Updated: 2017/11/20 13:20:29 by jhalford ### ########.fr */ /* */ /* ************************************************************************** */