8nl/plainbin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed

Browse Source
This commit is contained in:
Your Name 2024-09-28 16:55:35 +03:00
parent 784164ec7b
commit a19419ccae
1 changed files with 101 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

243
plainbin.c
View File

@ -20,7 +20,7 @@
#define MSG4 "No namespace available.\n" #define MSG4 "No namespace available.\n"
#ifndef VERSION #ifndef VERSION
#define VERSION "1.2.1" #define VERSION "1.2.2"
#endif #endif
typedef struct { typedef struct {
@ -44,12 +44,15 @@ typedef struct {
} CFG; } CFG;
CFG cfg = {.max_clients = 15, .max_size = 1, .buf_size = 32000, .name_len = 15, .dir = "."}; CFG cfg = {.max_clients = 15, .max_size = 1, .buf_size = 32000, .name_len = 15, .dir = "."};
/* Server sockets */ typedef struct {
int ifd; int fd;
size_t ifd_clients; char *buf;
char *filename;
} CLIENT_THREAD;
int ifd;
int ofd; int ofd;
size_t ofd_clients; size_t clients;
enum { enum {
OUTPUT, OUTPUT,
@ -68,15 +71,15 @@ int new_server(const int port, const int backlog) {
struct timeval tout = {.tv_sec = RECV_TIMEOUT, .tv_usec = 0}; struct timeval tout = {.tv_sec = RECV_TIMEOUT, .tv_usec = 0};
if (setsockopt(listen_fd, SOL_SOCKET, SO_RCVTIMEO, &tout, sizeof(tout)) < 0) if (setsockopt(listen_fd, SOL_SOCKET, SO_RCVTIMEO, &tout, sizeof(tout)) < 0)
goto NS_ERROR; goto NEW_SOCKET_ERROR;
tout.tv_sec = SEND_TIMEOUT; tout.tv_sec = SEND_TIMEOUT;
if (setsockopt(listen_fd, SOL_SOCKET, SO_SNDTIMEO, &tout, sizeof(tout)) < 0) if (setsockopt(listen_fd, SOL_SOCKET, SO_SNDTIMEO, &tout, sizeof(tout)) < 0)
goto NS_ERROR; goto NEW_SOCKET_ERROR;
int reuse = 1; int reuse = 1;
if (setsockopt(listen_fd, SOL_SOCKET, SO_REUSEPORT, &reuse, sizeof(reuse)) < 0) if (setsockopt(listen_fd, SOL_SOCKET, SO_REUSEPORT, &reuse, sizeof(reuse)) < 0)
goto NS_ERROR; goto NEW_SOCKET_ERROR;
struct sockaddr_in serv_addr; struct sockaddr_in serv_addr;
serv_addr.sin_family = AF_INET; serv_addr.sin_family = AF_INET;
@ -84,57 +87,48 @@ int new_server(const int port, const int backlog) {
serv_addr.sin_port = htons(port); serv_addr.sin_port = htons(port);
if (bind(listen_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0) if (bind(listen_fd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0)
goto NS_ERROR; goto NEW_SOCKET_ERROR;
if (listen(listen_fd, backlog) < 0) if (listen(listen_fd, backlog) < 0)
goto NS_ERROR; goto NEW_SOCKET_ERROR;
return listen_fd; return listen_fd;
NS_ERROR: NEW_SOCKET_ERROR:
close(listen_fd); close(listen_fd);
return -1; return -1;
} }
char *rand_string(void) { char rand_name(char *buf) {
char abc[] = "asdfghjklzxcvbnmqwertyuiopQWERTYUIOPASDFGHJKLZXCVBNM1234567890"; const char abc[] = "asdfghjklzxcvbnmqwertyuiopQWERTYUIOPASDFGHJKLZXCVBNM1234567890";
char *res = malloc(cfg.name_len + 1);
if (res == NULL)
return NULL;
for (size_t i = 0; i < cfg.name_len; i++)
res[i] = abc[rand() % (sizeof(abc) - 1)];
res[cfg.name_len] = '\0';
return res;
}
char *rand_name(void) {
for (int i = 0; i < 1000; i++) { for (int i = 0; i < 1000; i++) {
char *filename = rand_string(); for (size_t i = 0; i < cfg.name_len; i++)
if (filename == NULL) buf[i] = abc[rand() % (sizeof(abc) - 1)];
continue;
buf[cfg.name_len] = '\n';
buf[cfg.name_len + 1] = '\0';
struct stat sb; struct stat sb;
if (stat(filename, &sb) < 0) if (stat(buf, &sb) < 0)
return filename; return 1;
free(filename); return 0;
} }
return NULL; return 1;
} }
int send_str(int fd, char *str, ssize_t size, int flag) { int send_str(int fd, char *str, ssize_t size, int flag) {
while (size) { while (size) {
ssize_t ret = 0; ssize_t ret = 0;
if (flag) if (flag)
ret = send(fd, str, size, 0); ret = send(fd, str, size, MSG_NOSIGNAL);
else else
ret = write(fd, str, size); ret = write(fd, str, size);
if (ret < 0 && !(errno == EAGAIN || errno == EINTR)) if (ret < 0)
return 1; return 1;
else if (ret == 0) else if (ret == 0)
@ -147,153 +141,93 @@ int send_str(int fd, char *str, ssize_t size, int flag) {
return 0; return 0;
} }
void upload(int cfd, pid_t par) { void upload(CLIENT_THREAD *CT) {
int ffd = -1; if (rand_name(CT->filename)) {
char *buf = NULL; send(CT->fd, MSG4, sizeof(MSG4), 0);
return;
/* Send and create filename */
char *filename = rand_name();
if (filename == NULL) {
send(cfd, MSG4, sizeof(MSG4), 0);
goto UPL_ERROR;
} }
if (send(cfd, filename, strlen(filename), 0) < 0) if (send(CT->fd, CT->filename, strlen(CT->filename), 0) < 0)
goto UPL_ERROR; return;
if (send(cfd, "\n", 1, 0) < 0) /* Create file */
goto UPL_ERROR; int ffd = open(CT->filename, O_CREAT | O_WRONLY, 0666);
ffd = open(filename, O_CREAT | O_WRONLY, 0666);
if (ffd < 0) if (ffd < 0)
goto UPL_ERROR; goto UPLOAD_ERROR;
/* Sending */
buf = malloc(cfg.buf_size + 1);
if (buf == NULL)
goto UPL_ERROR;
size_t tbytes = 0; size_t tbytes = 0;
while (1) { while (1) {
ssize_t rbytes = recv(cfd, buf, cfg.buf_size, 0); ssize_t rbytes = recv(CT->fd, CT->buf, cfg.buf_size, MSG_NOSIGNAL);
if (rbytes < 0 && !(errno == EAGAIN || errno == EINTR)) if (rbytes < 0 && errno != EINTR)
goto UPL_ERROR; goto UPLOAD_ERROR;
else if (rbytes == 0) else if (rbytes == 0)
break; break;
tbytes += (size_t)rbytes; tbytes += (size_t)rbytes;
if (tbytes / 1024 / 1024 >= cfg.max_size) { if (tbytes / 1024 / 1024 >= cfg.max_size) {
send_str(cfd, MSG2, sizeof(MSG2), WRITE); send_str(CT->fd, MSG2, sizeof(MSG2), WRITE);
break; break;
} }
if (send_str(ffd, buf, rbytes, WRITE)) if (send_str(ffd, CT->buf, rbytes, WRITE))
goto UPL_ERROR; goto UPLOAD_ERROR;
} }
/* Clear */ UPLOAD_ERROR:
UPL_ERROR:
if (buf)
free(buf);
if (ffd != -1) if (ffd != -1)
close(ffd); close(ffd);
if (filename)
free(filename);
close(cfd);
kill(par, SIGUSR1);
exit(0);
} }
void load(int cfd, pid_t par) { void load(CLIENT_THREAD *CT) {
int ffd = -1; ssize_t rbytes = recv(CT->fd, CT->filename, cfg.name_len, 0);
char *buf = NULL;
/* For INFO cmd */
cfg.name_len += 4;
/* Get filename */
char *filename = malloc(cfg.name_len + 1);
if (filename == NULL)
goto LD_ERROR;
ssize_t rbytes = recv(cfd, filename, cfg.name_len, 0);
if (rbytes <= 0) if (rbytes <= 0)
goto LD_ERROR; return;
filename[rbytes] = '\0'; CT->filename[rbytes] = '\0';
char *ptr = strchr(filename, '\n'); char *ptr = strchr(CT->filename, '\n');
if (ptr) if (ptr)
*ptr = '\0'; *ptr = '\0';
if (strstr(filename, ".") || strstr(filename, "/")) if (strstr(CT->filename, ".") || strstr(CT->filename, "/"))
goto LD_ERROR; return;
/* INFO */ /* INFO */
if (!strcmp(filename, "INFO")) { if (!strcmp(CT->filename, "INFO")) {
char msg[336]; char msg[336];
int ret = snprintf(msg, sizeof(msg), "Max file size: %zuMB\nMax clients in thread: %zu\nBuffer size: %zu\nMOTD: %s\n", cfg.max_size, cfg.max_clients, cfg.buf_size, (cfg.motd) ? cfg.motd : ""); int ret = snprintf(msg, sizeof(msg), "Max file size: %zuMB\nMax clients: %zu\nBuffer size: %zu\nMOTD: %s\n", cfg.max_size, cfg.max_clients, cfg.buf_size, (cfg.motd) ? cfg.motd : "");
if (send_str(cfd, msg, (ssize_t)ret, SEND)) send_str(CT->fd, msg, (ssize_t)ret, SEND);
goto LD_ERROR; return;
goto LD_ERROR;
} }
/* Open */ /* Open */
ffd = open(filename, O_RDONLY); int ffd = open(CT->filename, O_RDONLY);
if (ffd < 0) { if (ffd < 0) {
send_str(cfd, MSG3, sizeof(MSG3), SEND); send_str(CT->fd, MSG3, sizeof(MSG3), SEND);
goto LD_ERROR; goto LOAD_ERROR;
} }
/* Sending */
buf = malloc(cfg.buf_size + 1);
if (buf == NULL)
goto LD_ERROR;
while (1) { while (1) {
rbytes = read(ffd, buf, cfg.buf_size); rbytes = read(ffd, CT->buf, cfg.buf_size);
if (rbytes < 0 && !(errno == EAGAIN || errno == EINTR)) if (rbytes < 0 && errno != EINTR)
goto LD_ERROR; goto LOAD_ERROR;
else if (rbytes == 0) else if (rbytes == 0)
break; break;
if (send_str(cfd, buf, rbytes, SEND)) if (send_str(CT->fd, CT->buf, rbytes, SEND))
goto LD_ERROR; goto LOAD_ERROR;
} }
/* Clear */ LOAD_ERROR:
LD_ERROR:
if (buf)
free(buf);
if (ffd != -1) if (ffd != -1)
close(ffd); close(ffd);
if (filename)
free(filename);
sleep(1);
close(cfd);
kill(par, SIGUSR2);
exit(0);
} }
void sig_handler(int sig) { void sig_handler(int sig) {
if (sig == SIGUSR1) { if (sig == SIGUSR1 && clients)
if (ifd_clients) clients--;
ifd_clients--;
}
else if (sig == SIGUSR2) {
if (ofd_clients)
ofd_clients--;
}
else { else {
close(ifd); close(ifd);
@ -314,21 +248,41 @@ void Proc(int fd, int flag) {
if (cfd < 0) if (cfd < 0)
continue; continue;
if (flag == INPUT && ifd_clients < cfg.max_clients) { printf("%d\n", clients);
ifd_clients++; if (clients < cfg.max_clients) {
clients++;
if (fork() == 0) { if (fork() == 0) {
close(fd); close(fd);
upload(cfd, par);
}
}
else if (flag == OUTPUT && ofd_clients < cfg.max_clients) { /* Allocate buffers */
ofd_clients++; char *buf = malloc(cfg.buf_size);
char *filename = malloc(cfg.name_len + 1);
if (filename == NULL || buf == NULL) {
if (filename != NULL)
free(filename);
if (fork() == 0) { if (buf != NULL)
close(fd); free(buf);
load(cfd, par);
exit(1);
}
/* Start functions */
CLIENT_THREAD CT = {.fd = cfd, .buf = buf, .filename = filename};
if (flag == INPUT)
upload(&CT);
else if (flag == OUTPUT)
load(&CT);
/* Clean */
sleep(1);
free(buf);
close(cfd);
kill(par, SIGUSR1);
exit(0);
} }
} }
@ -343,10 +297,10 @@ int main(int argc, char **argv) {
srand(time(NULL)); srand(time(NULL));
signal(SIGUSR1, sig_handler); signal(SIGUSR1, sig_handler);
signal(SIGUSR2, sig_handler);
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
signal(SIGTERM, sig_handler); signal(SIGTERM, sig_handler);
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, SIG_IGN);
signal(SIGPIPE, SIG_IGN);
int backlog = 1; int backlog = 1;
int iport = 8080; int iport = 8080;
@ -378,6 +332,11 @@ int main(int argc, char **argv) {
case 'n': case 'n':
sscanf(optarg, "%zu", &cfg.name_len); sscanf(optarg, "%zu", &cfg.name_len);
if (cfg.name_len < 4) {
fprintf(stderr, "%s: name lenght can not be less than 4\n", argv[0]);
return 1;
}
break; break;
case 'b': case 'b':