Merge pull request #2 from hardyrafael17/1-add-modulation-converting-sets-of-bits

1 add modulation converting sets of bits

Author: hardyrafael17

.gitignore

@@ -3,4 +3,5 @@ tserver
 .gitignore
 a.out
 minitalk.a
-server2.o
+tserver.o
+tclient.o

Makefile

@@ -14,30 +14,30 @@ CFLAGS = -Wall -Werror -Wextra
 
 XFLAGS = -o
 
-RUN_FLAGS = "Hola mundo Hola mundo ola mundo HHola mundo Hola mundo ola mundo ola mundo Hola mundo ola mundo"
-
 all	:		$(NAME)
 
 $(NAME)	:	$(OBJS) 
-			$(AR) $(NAME) $(OBJS)
+			@$(AR) $(NAME) $(OBJS)
 
 %.o:		%.c
-			$(CC) $(CFLAGS) -c $< -o $@
+			@$(CC) $(CFLAGS) -c $< -o $@
 
 clean:	
-			$(RM) ${OBJS}
+			@$(RM) ${OBJS}
 
 fclean:		clean
-			$(RM) $(NAME)
+			@$(RM) $(NAME)
 
 re:			fclean all
 
 #personal rules
 
-excecutable: all
-			$(CC) client.o $(XFLAGS) tclient && $(CC) server2.o $(XFLAGS) tserver
+client: 
+			gcc client.c -o tclient.o
+
+server:
+			gcc server.c -o tserver.o
 
-vim: 
-			gcc client.c -o tclient && gcc server2.c -o tserver && echo "compliation completed"
+k: fclean client server
 
 .PHONY:		all clean fclean re bonus

client.c

@@ -1,65 +1,92 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   client.c                                           :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: hardy <hardy@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/04/20 19:17:39 by hardy             #+#    #+#             */
+/*   Updated: 2022/04/20 19:43:25 by hardy            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
 #include "minitalk.h"
 
-static status_t	operation;
+static t_data	g_operation;
 
-void
-resume(int signo, siginfo_t *info, void *context)
+int
+	send_singal(int type)
 {
-		if(!operation.context)
+	int	lock;
+
+	lock = 1;
+	if (type && lock)
+	{
+		while (type && lock)
 		{
-				operation.context = context;
-				operation.client_pid = info->si_pid;
-				operation.client_pid = signo;
-		}
-		return;
+			if (!kill(g_operation.server_pid, SIGUSR2))
+			{
+				lock = 0;
+			}
+		}	
+	}
+	else
+	{
+		while (lock)
+		{
+			if (!kill(g_operation.server_pid, SIGUSR1))
+			{
+				lock = 0;
+			}
+		}	
+	}
+	return (1);
 }
 
 void
-send_char(char *string, int message_length)
+	resume(int signo, siginfo_t *info, void *context)
 {
-	int		j;
-	int		i;
+	if (!g_operation.context)
+	{
+		g_operation.context = context;
+		g_operation.client_pid = info->si_pid;
+				g_operation.client_pid = signo;
+	}
+	return ;
+}
 
-	j = 0;
-	while(string && string[j++])
+void
+	send_char(char *string, int message_length)
+{
+	while (string && string[g_operation.counter])
 	{
-		printf("Sending byte\n");
-		i = 8;
-		while (i--)
+		g_operation.shift_count = 8;
+		while (g_operation.shift_count--)
 		{
-			if (string[j] >> i && 1)
-				kill(operation.server_pid, SIGUSR2);
+			if (string[g_operation.counter] >> g_operation.shift_count & 1)
+				send_singal(1);
 			else
-				kill(operation.server_pid, SIGUSR1);
+				send_singal(0);
 			pause();
 		}
-
+		++g_operation.counter;
 	}
-	if(string && !message_length)
+	if (string && !message_length)
 	{
-		//send 0
-		printf("Sending end of string\n");
-		i = 8;
-		while(i--)
-		{
-				printf("sending bit\n");
-				kill(operation.server_pid, SIGUSR1);
-				pause();
-		}
-		return;
+		g_operation.shift_count = 8;
+		while (g_operation.shift_count-- && send_singal(0))
+			pause();
+		return ;
 	}
-	while(message_length--)
-	{
-		kill(operation.server_pid, SIGUSR1);
+	while (message_length-- && send_singal(0))
 		pause();
-	}
-	//done sending message length
-	kill(operation.server_pid, SIGUSR2);
-	return;
+	send_singal(1);
+	pause();
+	return ;
 }
 
 int
-main (int argc, char **argv)
+	main(int argc, char **argv)
 {
 	struct sigaction	s_sigaction;
 	struct sigaction	s_sigaction2;
@@ -70,23 +97,16 @@ main (int argc, char **argv)
 	s_sigaction2.sa_flags = SA_SIGINFO;
 	sigaction(SIGUSR1, &s_sigaction, 0);
 	sigaction(SIGUSR2, &s_sigaction2, 0);
-
 	if (argc != 3 || !strlen(argv[2]))
 	{
 		printf("Argument count %d\n", argc);
 		return (1);
 	}
-	//check that the server's pid is valid/// TODO
-	operation.server_pid = atoi(argv[1]);
-	//	
-	operation.message = argv[2];
-	operation.message_length = strlen(operation.message);
-	//sending message length to server
-	send_char(NULL, operation.message_length);
+	g_operation.server_pid = atoi(argv[1]);
+	g_operation.message = argv[2];
+	g_operation.message_length = strlen(g_operation.message);
+	send_char(NULL, g_operation.message_length);
 	pause();
-	//sending messae
-	printf("Sending message \n");
-	send_char(operation.message, 0);
-	printf("Done sending message\n");
-	return(0);
+	send_char(g_operation.message, 0);
+	return (0);
 }

client.o

@@ -1,46 +1,43 @@
-//define header file (to prevent to autoinclude more than once)
-#ifndef MINITALK_H
-#define MINITALK_H
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   minitalk.h                                         :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: hardy <hardy@student.42.fr>                +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2022/04/20 18:42:55 by hardy             #+#    #+#             */
+/*   Updated: 2022/04/20 19:36:55 by hardy            ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
 
-#include <sys/types.h>
-#include <signal.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
+#ifndef MINITALK_H
+# define MINITALK_H
 
-typedef struct server_status_t
-{
-	int			send_next;
-	int			resend;
-	int			pause;
-	int			message_length;
-	int			done;
-	int			server_pid;
-	char		*message;
-	int			client_pid;
-	int			stage;
-	void		*context;
-}				status_t;
+# include <sys/types.h>
+# include <signal.h>
+# include <string.h>
+# include <stdlib.h>
+# include <unistd.h>
+# include <string.h>
+# include <stdio.h>
 
-typedef struct info_db_t 
+typedef struct s_operation_db
 {
-	int			coutner;
-	void		*context;
-	int			client_pid;
-	char 		*message;
-	int			message_length;
-	int			counter;
-	int			error;
-	int			stage;
-	int			shift_count;
-}				data;
+	int		server_pid;
+	void	*context;
+	int		client_pid;
+	char	*message;
+	int		message_length;
+	int		counter;
+	int		stage;
+	int		shift_count;
+}			t_data;
 
+int		send_singal(int type);
 void	send_char(char *string, int message_length);
 void	resume(int signo, siginfo_t *info, void *context);
-void	get_length (int signo, siginfo_t *info, void *context);
-void	alocate_mem (int signo, siginfo_t *info, void *context);
-void	get_message (int signo, siginfo_t *info, void *context);
+void	get_length(int signo, siginfo_t *info, void *context);
+void	alocate_mem(int signo, siginfo_t *info, void *context);
+void	get_message(int signo, siginfo_t *info, void *context);
 
 #endif