42/42_INT_05_minitalk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nouvel algorythme avec reponse du server fonctionne a peu pres sauf eof

Browse Source
This commit is contained in:
hugogogo
2021-09-03 13:54:06 +02:00
parent bb90704a0c
commit db27c5bee9
7 changed files with 31 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
builds/client.o
View File

Binary file not shown.

BIN
builds/server.o
View File

Binary file not shown.

BIN
client
View File

Binary file not shown.

3
includes/client.h
View File

@@ -10,8 +10,9 @@ typedef struct s_client
{ {
int mask; int mask;
int count_char; int count_char;
int server_pid; int srv_pid;
char *text; char *text;
int done;
} t_client; } t_client;
t_client client; t_client client;

BIN
server
View File

Binary file not shown.

53
srcs/client.c
View File

@@ -6,36 +6,6 @@ int usage(void)
return (0); return (0);
} }
// void send_char(int server_pid, char c)
// {
// int mask;
//
// mask = 1 << 6;
// while (mask != 0)
// {
// if (msg_received == 1)
// {
// if ((c & mask) != 0)
// kill(server_pid, SIGUSR1);
// if ((c & mask) == 0)
// kill(server_pid, SIGUSR2);
// msg_received = 0;
// mask >>= 1;
// }
// }
// }
//
// void send_message(int sig_num)
// {
// (void)sig_num;
// while (*(client.text))
// {
// send_char(client.server_pid, *(client.text));
// (client.text)++;
// }
// send_char(client.server_pid, *(client.text));
// }
void send_char(char c, int mask, int server_pid) void send_char(char c, int mask, int server_pid)
{ {
if ((c & mask) != 0) if ((c & mask) != 0)
@@ -47,28 +17,26 @@ void send_char(char c, int mask, int server_pid)
void send_message(int sig_num) void send_message(int sig_num)
{ {
(void)sig_num; (void)sig_num;
if (client.text[client.count_char] != '\0') client.mask >>= 1;
{
if (client.mask == 0) if (client.mask == 0)
{ {
client.mask = 1 << 6; client.mask = 1 << 6;
if (client.text[client.count_char] == '\0')
client.done = 1;
(client.count_char)++; (client.count_char)++;
} }
else if (client.done == 0)
client.mask >>= 1; send_char(client.text[client.count_char], client.mask, client.srv_pid);
send_char(client.text[client.count_char], client.mask, client.server_pid); ft_putnbrbase(client.text[client.count_char], "01"); ft_printf(" - %i - [%i] %s\n", (client.text[client.count_char] & client.mask) != 0, client.count_char, client.text + client.count_char);
}
send_char(client.text[client.count_char], client.mask, client.server_pid);
ft_putnbrbase(client.mask, "01"); ft_printf(" (%i) - [%i] %s\n", client.mask, client.count_char, client.text + client.count_char);
} }
void init_client(int pid, char *msg) void init_client(int pid, char *msg)
{ {
client.mask = 0; client.mask = 1 << 7;
client.count_char = 1 << 7; client.count_char = 0;
client.server_pid = pid; client.srv_pid = pid;
client.text = msg; client.text = msg;
client.done = 0;
} }
int main(int ac, char **av) int main(int ac, char **av)
@@ -78,5 +46,6 @@ int main(int ac, char **av)
return (usage()); return (usage());
init_client(ft_atoi(av[1]), av[2]); init_client(ft_atoi(av[1]), av[2]);
kill((int)getpid(), SIGUSR1); kill((int)getpid(), SIGUSR1);
while (client.done == 0);
return (0); return (0);
} }

57
srcs/server.c
View File

@@ -1,14 +1,25 @@
#include "server.h" #include "server.h"
void send_char(void)
{
if (message.count_bits == 7)
{
ft_putchar(message.character);
if (message.character == '\0')
exit(EXIT_SUCCESS);
message.count_bits = 0;
message.character = 0;
}
}
void sig_handler_1(int sig_num, siginfo_t *info, void *context) void sig_handler_1(int sig_num, siginfo_t *info, void *context)
{ {
(void)sig_num; (void)sig_num;
(void)context; (void)context;
message.character ^= 1 << (6 - message.count_bits); message.character ^= 1 << (6 - message.count_bits);
message.count_bits++; message.count_bits++;
send_char();
kill(info->si_pid, SIGUSR1); kill(info->si_pid, SIGUSR1);
// if (kill(info->si_pid, SIGUSR1) == 0)
// ft_putstr("client->server signal 1 received, server->client signal 1 sent");
} }
void sig_handler_2(int sig_num, siginfo_t *info, void *context) void sig_handler_2(int sig_num, siginfo_t *info, void *context)
@@ -16,22 +27,8 @@ void sig_handler_2(int sig_num, siginfo_t *info, void *context)
(void)sig_num; (void)sig_num;
(void)context; (void)context;
message.count_bits++; message.count_bits++;
send_char();
kill(info->si_pid, SIGUSR1); kill(info->si_pid, SIGUSR1);
// if (kill(info->si_pid, SIGUSR1) == 0)
// ft_putstr("client->server signal 2 received, server->client signal 1 sent");
}
void handler_1(int sig_num)
{
(void)sig_num;
message.character ^= 1 << (6 - message.count_bits);
message.count_bits++;
}
void handler_2(int sig_num)
{
(void)sig_num;
message.count_bits++;
} }
void init_message(void) void init_message(void)
@@ -41,25 +38,6 @@ void init_message(void)
message.text = ft_strdup(""); message.text = ft_strdup("");
} }
void concat_msg()
{
if (message.count_bits == 7)
{
ft_putchar(message.character);
// if (message.character == 0)
// {
// ft_printf("%s\n", message.text);
// message.text = ft_strdup("");
// }
// else
// message.text = ft_strjoinfree(message.text, ft_strdup(&(message.character)));
message.count_bits = 0;
message.character = 0;
}
}
int main() int main()
{ {
struct sigaction act_1; struct sigaction act_1;
@@ -71,14 +49,9 @@ int main()
act_2.sa_sigaction = sig_handler_2; act_2.sa_sigaction = sig_handler_2;
sigaction(SIGUSR1, &act_1, NULL); sigaction(SIGUSR1, &act_1, NULL);
sigaction(SIGUSR2, &act_2, NULL); sigaction(SIGUSR2, &act_2, NULL);
// signal(SIGUSR1, handler_1);
// signal(SIGUSR2, handler_2);
ft_putnbrendl((int)getpid()); ft_putnbrendl((int)getpid());
init_message(); init_message();
while (1) while (1);
concat_msg();
return (0); return (0);
} }