added log.h and some update
This commit is contained in:
1 parent
8e54631e4b
commit
df50428f4c
4 files changed
+81
-32
No files matched your search
+14
-7
@@ -1,11 +1,12 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
#define PORT 5555
|
#define PORT 7777
|
||||||
#define BUFFER_SIZE 1024
|
#define BUFFER_SIZE 1024
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
@@ -29,8 +30,8 @@ int main() {
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (fork() == 0) {
|
pid_t child_pid = fork();
|
||||||
// Процесс чтения
|
if (child_pid == 0) {
|
||||||
while (1) {
|
while (1) {
|
||||||
int valread = read(sock, buffer, BUFFER_SIZE);
|
int valread = read(sock, buffer, BUFFER_SIZE);
|
||||||
if (valread > 0) {
|
if (valread > 0) {
|
||||||
@@ -40,13 +41,19 @@ int main() {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
char username[50];
|
char username[50];
|
||||||
|
printf("Enter your username: ");
|
||||||
fgets(username, 50, stdin);
|
fgets(username, 50, stdin);
|
||||||
username[strlen(username)-1] = '\0';
|
username[strlen(username) - 1] = '\0';
|
||||||
send(sock, username, 50, 0);
|
send(sock, username, 50, 0);
|
||||||
printf("username = %s\n", username);
|
log_info("username = %s\n", username);
|
||||||
// Процесс отправки
|
|
||||||
while (1) {
|
while (1) {
|
||||||
fgets(buffer, BUFFER_SIZE, stdin);
|
fgets(buffer, BUFFER_SIZE, stdin);
|
||||||
|
if (strcmp(buffer, "/exit\n") == 0) {
|
||||||
|
log_info("Client is exiting\n");
|
||||||
|
kill(child_pid, SIGKILL);
|
||||||
|
close(sock);
|
||||||
|
break;
|
||||||
|
}
|
||||||
send(sock, buffer, strlen(buffer), 0);
|
send(sock, buffer, strlen(buffer), 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+9
-12
@@ -1,14 +1,13 @@
|
|||||||
#ifndef COLORS_H
|
#pragma once
|
||||||
#define COLORS_H
|
|
||||||
#define RESET "\033[0m"
|
#define RESET "\033[0m"
|
||||||
#define GREEN "\033[0;32m" // GREEN
|
#define GREEN "\033[0;32m" // GREEN
|
||||||
#define BLUE "\033[0;34m" // BLUE
|
#define BLUE "\033[0;34m" // BLUE
|
||||||
#define YELLOW "\033[1;33m" // YELLOW
|
#define YELLOW "\033[1;33m" // YELLOW
|
||||||
#define RED "\033[0;31m" // RED
|
#define RED "\033[0;31m" // RED
|
||||||
#define BLACK "\033[0;30m" // BLACK
|
#define BLACK "\033[0;30m" // BLACK
|
||||||
#define PURPLE "\033[0;35m" // PURPLE
|
#define PURPLE "\033[0;35m" // PURPLE
|
||||||
#define CYAN "\033[0;36m" // CYAN
|
#define CYAN "\033[0;36m" // CYAN
|
||||||
#define WHITE "\033[0;37m" // WHITE
|
#define WHITE "\033[0;37m" // WHITE
|
||||||
#define BBLACK "\033[1;30m" // BLACK
|
#define BBLACK "\033[1;30m" // BLACK
|
||||||
#define BRED "\033[1;31m" // RED
|
#define BRED "\033[1;31m" // RED
|
||||||
#define BGREEN "\033[1;32m" // GREEN
|
#define BGREEN "\033[1;32m" // GREEN
|
||||||
@@ -57,5 +56,3 @@
|
|||||||
#define ON_IPURPLE "\033[0;105m" // PURPLE
|
#define ON_IPURPLE "\033[0;105m" // PURPLE
|
||||||
#define ON_ICYAN "\033[0;106m" // CYAN
|
#define ON_ICYAN "\033[0;106m" // CYAN
|
||||||
#define ON_IWHITE "\033[0;107m" // WHITE
|
#define ON_IWHITE "\033[0;107m" // WHITE
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <time.h>
|
||||||
|
#include "colors.h"
|
||||||
|
|
||||||
|
void log_info(const char *restrict __format, ...) {
|
||||||
|
time_t now = time(NULL);
|
||||||
|
struct tm *local = localtime(&now);
|
||||||
|
char timebuffer[80];
|
||||||
|
strftime(timebuffer, sizeof(timebuffer), "%d.%m.%Y %H:%M:%S", local);
|
||||||
|
printf("%s[%s]%s [%s] ", GREEN, "INFO", RESET, timebuffer);
|
||||||
|
va_list args;
|
||||||
|
va_start(args, __format);
|
||||||
|
vprintf(__format, args);
|
||||||
|
va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
void log_warn(const char *restrict __format, ...) {
|
||||||
|
time_t now = time(NULL);
|
||||||
|
struct tm *local = localtime(&now);
|
||||||
|
char timebuffer[80];
|
||||||
|
strftime(timebuffer, sizeof(timebuffer), "%d.%m.%Y %H:%M:%S", local);
|
||||||
|
printf("%s[%s]%s [%s] ", YELLOW, "WARN", RESET, timebuffer);
|
||||||
|
va_list args;
|
||||||
|
va_start(args, __format);
|
||||||
|
vprintf(__format, args);
|
||||||
|
va_end(args);
|
||||||
|
}
|
||||||
|
|
||||||
|
void log_error(const char *restrict __format, ...) {
|
||||||
|
time_t now = time(NULL);
|
||||||
|
struct tm *local = localtime(&now);
|
||||||
|
char timebuffer[80];
|
||||||
|
strftime(timebuffer, sizeof(timebuffer), "%d.%m.%Y %H:%M:%S", local);
|
||||||
|
printf("%s[%s]%s [%s] ", RED, "ERROR", RESET, timebuffer);
|
||||||
|
va_list args;
|
||||||
|
va_start(args, __format);
|
||||||
|
vprintf(__format, args);
|
||||||
|
va_end(args);
|
||||||
|
}
|
||||||
+16
-13
@@ -1,13 +1,16 @@
|
|||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
#include <asm-generic/socket.h>
|
#include <asm-generic/socket.h>
|
||||||
|
#include <colors.h>
|
||||||
|
#include <stdarg.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/select.h>
|
#include <sys/select.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
#include "log.h"
|
||||||
|
|
||||||
#define PORT 5555
|
#define PORT 7777
|
||||||
#define MAX_CLIENTS 10
|
#define MAX_CLIENTS 10
|
||||||
#define BUFFER_SIZE 1024
|
#define BUFFER_SIZE 1024
|
||||||
|
|
||||||
@@ -31,13 +34,13 @@ int main() {
|
|||||||
|
|
||||||
server_fd = socket(AF_INET, SOCK_STREAM, 0);
|
server_fd = socket(AF_INET, SOCK_STREAM, 0);
|
||||||
if (server_fd < 0) {
|
if (server_fd < 0) {
|
||||||
perror("socket");
|
log_error("socket");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
int opt = 1;
|
int opt = 1;
|
||||||
if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
|
if (setsockopt(server_fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) < 0) {
|
||||||
perror("setsockopt");
|
log_error("setsockopt");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,12 +49,12 @@ int main() {
|
|||||||
address.sin_port = htons(PORT);
|
address.sin_port = htons(PORT);
|
||||||
|
|
||||||
if (bind(server_fd, (struct sockaddr *) &address, sizeof(address)) < 0) {
|
if (bind(server_fd, (struct sockaddr *) &address, sizeof(address)) < 0) {
|
||||||
perror("bind");
|
log_error("bind");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (listen(server_fd, 5) < 0) {
|
if (listen(server_fd, 5) < 0) {
|
||||||
perror("listen");
|
log_error("listen");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -69,7 +72,7 @@ int main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (select(max_sd + 1, &readfds, NULL, NULL, NULL) < 0) {
|
if (select(max_sd + 1, &readfds, NULL, NULL, NULL) < 0) {
|
||||||
perror("select");
|
log_error("select");
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +81,7 @@ int main() {
|
|||||||
int new_socket = accept(server_fd, (struct sockaddr *) &address,
|
int new_socket = accept(server_fd, (struct sockaddr *) &address,
|
||||||
(socklen_t *) &addrlen);
|
(socklen_t *) &addrlen);
|
||||||
|
|
||||||
printf("New connection: socket %d\n", new_socket);
|
log_info("New connection: socket %d\n", new_socket);
|
||||||
read(new_socket, buffer, BUFFER_SIZE);
|
read(new_socket, buffer, BUFFER_SIZE);
|
||||||
|
|
||||||
for (int i = 0; i < MAX_CLIENTS; i++) {
|
for (int i = 0; i < MAX_CLIENTS; i++) {
|
||||||
@@ -101,20 +104,20 @@ int main() {
|
|||||||
int valread = read(sd, buffer, BUFFER_SIZE);
|
int valread = read(sd, buffer, BUFFER_SIZE);
|
||||||
|
|
||||||
if (valread == 0) {
|
if (valread == 0) {
|
||||||
printf("Client disconnected: socket %d\n", sd);
|
log_info("Client disconnected: socket %d\n", sd);
|
||||||
close(sd);
|
close(sd);
|
||||||
clients[i].sock = 0;
|
clients[i].sock = 0;
|
||||||
bzero(clients[i].username, sizeof(clients[i].username));
|
bzero(clients[i].username, sizeof(clients[i].username));
|
||||||
} else {
|
} else {
|
||||||
buffer[valread] = '\0';
|
buffer[valread] = '\0';
|
||||||
printf("from_socket: %d\n", sd);
|
log_info("[%s]: %s", sd_username, buffer);
|
||||||
printf("from_username: %s\n", sd_username);
|
char *message = malloc(strlen(buffer) + strlen(sd_username) + 5);
|
||||||
printf("Message: %s\n", buffer);
|
sprintf(message, "[%s]: %s", sd_username, buffer);
|
||||||
|
|
||||||
// Рассылка всем другим
|
// Рассылка всем другим
|
||||||
for (int j = 0; j < MAX_CLIENTS; j++) {
|
for (int j = 0; j < MAX_CLIENTS; j++) {
|
||||||
if (clients[j].sock != 0 && clients[j].sock != sd) {
|
if (clients[j].sock != 0 && clients[j].sock != sd) {
|
||||||
send(clients[j].sock, buffer, strlen(buffer), 0);
|
send(clients[j].sock, message, strlen(message), 0);
|
||||||
|
free(message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user