bbs/magicka
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Maybe this will work?

Browse Source
This commit is contained in:
Andrew Pamment 2017-03-22 11:20:32 +10:00
parent dcfa0d12e3
commit 04fdc083ec
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
utils/magiftpd/magiftpd.c
View File

@ -210,8 +210,6 @@ int open_tcp_connection(struct ftpserver *cfg, struct ftpclient *client) {
return 0; return 0;
} }
if (connect(client->data_socket, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) == -1) { if (connect(client->data_socket, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) == -1) {
memset(client->data_ip, 0, 20);
client->data_port = -1;
fprintf(stderr, "Error connecting to client\n"); fprintf(stderr, "Error connecting to client\n");
return 0; return 0;
} }
@ -290,6 +288,10 @@ void handle_STOR(struct ftpserver *cfg, struct ftpclient *client, char *path) {
} }
} else if (pid < 0) { } else if (pid < 0) {
send_msg(client, "451 STOR Failed.\r\n"); send_msg(client, "451 STOR Failed.\r\n");
} else {
client->data_socket = -1;
memset(client->data_ip, 0, 20);
client->data_srv_socket = -1;
} }
} else { } else {
send_msg(client, "553 File Exists.\n"); send_msg(client, "553 File Exists.\n");
@ -377,6 +379,10 @@ void handle_RETR(struct ftpserver *cfg, struct ftpclient *client, char *file) {
if (pid > 0) { if (pid > 0) {
// nothing // nothing
client->data_socket = -1;
memset(client->data_ip, 0, 20);
client->data_srv_socket = -1;
} else if (pid == 0) { } else if (pid == 0) {
if (stat(fullpath, &s) == 0) { if (stat(fullpath, &s) == 0) {
@ -424,6 +430,9 @@ void handle_LIST(struct ftpserver *cfg, struct ftpclient *client) {
if (pid > 0) { if (pid > 0) {
// nothing // nothing
client->data_socket = -1;
memset(client->data_ip, 0, 20);
client->data_srv_socket = -1;
} else if (pid == 0) { } else if (pid == 0) {
dirp = opendir(newpath); dirp = opendir(newpath);