implementation recepetion message incomplete et makefile foncitonne avec deux headers separes

This commit is contained in:
hugogogo
2021-09-01 08:16:31 +02:00
parent a988550a35
commit 016e16e7be
9 changed files with 70 additions and 35 deletions

View File

@@ -1,4 +1,4 @@
#include "../includes/minitalk.h"
#include "client.h"
int usage(void)
{
@@ -13,12 +13,15 @@ void send_char(int server_pid, char c)
mask = 1 << 6;
while (mask != 0)
{
if ((c & mask) != 0)
kill(server_pid, SIGUSR1);
if ((c & mask) == 0)
kill(server_pid, SIGUSR2);
mask >>= 1;
usleep(1);
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;
}
}
}
@@ -32,11 +35,19 @@ void send_message(int server_pid, char *msg)
send_char(server_pid, *msg);
}
void message_received(int sig_num)
{
(void)sig_num;
msg_received = 1;
}
int main(int ac, char **av)
{
signal(SIGUSR1, message_received);
if (ac != 3)
return (usage());
send_message(ft_atoi(av[1]), av[2]);
msg_received = 1;
ft_putnbrendl((int)getpid());
send_message(ft_atoi(av[1]), av[2]);
return (0);
}

View File

@@ -1,10 +1,10 @@
#include "minitalk.h"
#include "server.h"
void sig_handler_1(int sig_num, siginfo_t *info, void *context)
{
(void)sig_num;
(void)context;
kill(info->sa__pid, SIGUSR1);
kill(info->si_pid, SIGUSR1);
message.character ^= 1 << (6 - message.count_bits);
message.count_bits++;
}
@@ -13,7 +13,20 @@ void sig_handler_2(int sig_num, siginfo_t *info, void *context)
{
(void)sig_num;
(void)context;
kill(info->sa__pid, SIGUSR2);
kill(info->si_pid, SIGUSR1);
message.count_bits++;
}
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++;
}
@@ -51,6 +64,10 @@ int main()
act_2.sa_sigaction = sig_handler_2;
sigaction(SIGUSR1, &act_1, NULL);
sigaction(SIGUSR2, &act_2, NULL);
// signal(SIGUSR1, handler_1);
// signal(SIGUSR2, handler_2);
ft_putnbrendl((int)getpid());
init_message();
while (1)