Merge branch 'master' of https://archives.plil.fr/amoreau/skam_projet

pifou
2 parents bb11e508 c9ce1fd2
Showing 306 changed files with 369 additions and 148 deletions Show diff stats
Makefile
Network/.sender.c.swp
Network/Makefile
Network/libpcap-1.9.0/CHANGES
Network/libpcap-1.9.0/CMakeLists.txt
Network/libpcap-1.9.0/CONTRIBUTING.md
Network/libpcap-1.9.0/CREDITS
Network/libpcap-1.9.0/ChmodBPF/StartupParameters.plist
Network/libpcap-1.9.0/INSTALL.md
Network/libpcap-1.9.0/LICENSE
Network/libpcap-1.9.0/Makefile-devel-adds
Network/libpcap-1.9.0/Makefile.in
Network/libpcap-1.9.0/README.md
Network/libpcap-1.9.0/TODO
Network/libpcap-1.9.0/VERSION
Network/libpcap-1.9.0/Win32/Prj/wpcap.sln
Network/libpcap-1.9.0/Win32/Prj/wpcap.vcxproj
Network/libpcap-1.9.0/Win32/Prj/wpcap.vcxproj.filters
Network/libpcap-1.9.0/aclocal.m4
Network/libpcap-1.9.0/arcnet.h
@@ -2,29 +2,44 @@
 # Makefile pour generer la bibliotheque de fonctions de communication
 #
-all : sniffer sender
+CC=gcc
+CFLAGS=-W -Wall -Wextra
+CLIBS=ar -rcs
+LIB=libnet.a
+LDIR=../libs/
+LIBS=$(LDIR)libnet.a $(LDIR)libthrd.a
+IDIR=../includes/
+LDFLAGS=-lpthread -lpcap
-sniffer: sniffer.c
-	gcc -o sniffer sniffer.c -lpcap
-sender: sender.c
-	gcc -o sender sender.c
-#all: libnet.a
+all: $(LIB)
-#
-# La cible de nettoyage
-#
+$(LIB): sender.o sniffer.o tcpserver.o
+	rm -f $@
+	$(CLIBS) $(LDIR)$@ $^
+<<<<<<< HEAD
+	ranlib $(LDIR)$@
+	rm -f *.o	
+=======
+	ranlib $(LDIR)$@ 
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+	
+
+tcpserver.o: tcpserver.c
+	$(CC) -o $@ -c $^ -I$(IDIR) $(CFLAGS) 
+
+sniffer.o: sniffer.c
+	$(CC) -o $@ -c $^ $(CFLAGS)
+
+sender.o: sender.c
+	$(CC) -o $@ -c $^ $(CFLAGS)
-#clean: 
-#	rm -f core *.o libnet.a
 #
-# Les cibles pour la bibliotheque
+# La cible de nettoyage
 #
-#libnet.o: libnet.c libnet.h
+clean: 
+	rm -f *.o $(LDIR)$(LIB) ../bin/test
-#libcom.a: libnet.o
-#	rm -f $@
-#	$(CLIB) $@ $+
@@ -6,23 +6,30 @@
 #include <string.h>
 #include <netdb.h>
 #include <arpa/inet.h>
+#include <errno.h>
-
-int initialized=0;
-int sock_id;
+<<<<<<< HEAD
+int initializeSocketUDP(char* service)
+{
+	int sock_id;
+	struct addrinfo precisions, *resultat=NULL, *origine; // On stocke dans précisions nos besoins pour le socket, dans resultat l'adresse qui respectera les requêtes
+=======
 int initializeSocketUDP(char* service)
 {
+	int sock_id;
 	struct addrinfo precisions, *resultat=NULL, *origine; // On stocke dans précisions nos besoins pour le socket, dans resultat l'adresse qui respectera les reqêtes
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
 	memset(&precisions, 0, sizeof precisions);
 	precisions.ai_family = AF_UNSPEC;
 	precisions.ai_socktype = SOCK_DGRAM;
 	//precisions.ai_flags = AI_PASSIVE;
-	
-	if(getaddrinfo(NULL, service, &precisions, &origine)<0) { fprintf(stderr, "Erreur getaddrinfo\n"); return(-1); }
-	
+
+
+	if(getaddrinfo("192.168.0.14", service, &precisions, &origine)<0) { fprintf(stderr, "Erreur getaddrinfo\n"); return(-1); }
+
 	int n=0;
 	for(struct addrinfo* i=origine; i!=NULL && resultat==NULL; i=i->ai_next)
@@ -38,6 +45,8 @@ int initializeSocketUDP(char* service)
 		n++;
 	}
+	printf("Value : %d\n", n);
+
 	struct sockaddr_in* test=(struct sockaddr_in*)(resultat->ai_addr);
 	printf("Addr : %x\n", test->sin_addr.s_addr);
 	if((sock_id=socket(resultat->ai_family, resultat->ai_socktype, resultat->ai_protocol))<0) { fprintf(stderr, "Erreur socket\n"); return(-1); }
@@ -50,12 +59,10 @@ int initializeSocketUDP(char* service)
 	freeaddrinfo(origine);
-
-	initialized=1;
+	return sock_id;
 }
-
 int sendUDPBroadcast(char* message, int port)
 {
 	static struct sockaddr_in addrUDP;
@@ -65,17 +72,27 @@ int sendUDPBroadcast(char* message, int port)
 	struct in_addr tmpadd={0xffffffff};	
 	addrUDP.sin_addr=tmpadd;
-	if(initialized!=1)
-	{
-		printf("Initialize via Broadcast\n");
-		char tmp_str[15];
-		sprintf(tmp_str, "%d", port);
-		initializeSocketUDP( tmp_str );
-	}
+	char tmp_str[15];
+	sprintf(tmp_str, "%d", port);
+	int sock_id=initializeSocketUDP( tmp_str );
+
+	printf("Initialize via Broadcast %d\n", sock_id);
+<<<<<<< HEAD
+	
+	int status;
+	if((status=sendto(sock_id, message, sizeof(message), 0, (struct sockaddr*) &addrUDP, sizeof(addrUDP))) < 0) { fprintf(stderr, "Erreur sendto %d\n", status); return(-1);}       
+
+=======
-	if(sendto(sock_id, message, sizeof(message), 0, (struct sockaddr*) &addrUDP, sizeof(addrUDP)) < 0) { fprintf(stderr, "Erreur sendto\n"); return(-1);} 
+	if(sendto(sock_id, message, sizeof(message), 0, (struct sockaddr*) &addrUDP, sizeof(addrUDP)) < 0) { fprintf(stderr, "Erreur sendto\n"); return(-1);}
+       	
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+	close(sock_id);	
+	return 0;
 }
+
+
 int sendUDPUnicast(char* address, char* message, int port)
 {
 	static struct sockaddr_in addrUDP;
@@ -84,26 +101,38 @@ int sendUDPUnicast(char* address, char* message, int port)
 	inet_aton(address, &(addrUDP.sin_addr)); // Converti l'écriture string de format a.b.c.d en format Internet
-	
+	char tmp_str[15];
+	sprintf(tmp_str, "%d", port);
+	int sock_id=initializeSocketUDP( tmp_str );
+	printf("Initialize via Unicast %d\n", sock_id);
+<<<<<<< HEAD
-	if(initialized!=1)
-	{
-		printf("Initialize via Unicast\n");
-		char tmp_str[15];
-		sprintf(tmp_str, "%d", port);
-		initializeSocketUDP( tmp_str );
-	}
+	if(sendto(sock_id, message, sizeof(message), 0, (struct sockaddr*) &addrUDP, sizeof(addrUDP)) < 0 ) { fprintf(stderr, "Error sendto %d\n", errno); return(-1); }
+
+=======
 	if(sendto(sock_id, message, sizeof(message), 0, (struct sockaddr*) &addrUDP, sizeof(addrUDP)) < 0 ) { fprintf(stderr, "Error sendto\n"); return(-1); }
+	
+	close(sock_id);
+	return 0;
 }
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+	close(sock_id);
+	return 0;
+}
+<<<<<<< HEAD
+=======
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+/*
 int main(void)
 {
 	sendUDPBroadcast("Broadwesh", 2020);
-	sendUDPUnicast("255.255.255.255", "Uniwesh", 2020);
+	sendUDPUnicast("192.168.43.174", "Uniwesh", 2020);
 	return(1);
-	close(sock_id);
 }
+
+*/
@@ -7,7 +7,7 @@
 #define SZ_DEV 10
-
+/*
 // Fonction lors de la detection d'un paquet
 void arp_detect(u_char *args, const struct pcap_pkthdr *header, const u_char *packet)
 {
@@ -18,8 +18,8 @@ void arp_detect(u_char *args, const struct pcap_pkthdr *header, const u_char *pa
 	if(num==10) { loop++; num=0; printf("10 paquets ARP ont été reçus !\n");}
 }
-
-
+*/
+/*
 int main(int argc, char *argv[])
 {	
@@ -55,10 +55,10 @@ int main(int argc, char *argv[])
 	printf("Device: %s\n", dev);
-	// Permet d'obtenir l'adresse ip de l'interface demandée
+	// Permet d'obtenir l'adresse ip de l'interface demandée*/
 	/* pcap permet de lister les interfaces et obtenir les adresses ip de ces dernières
 	 * On utilise la fonction pcap_findalldevs 
-	 */
+	 *//*
 	pcap_if_t* interfaces;
 	if(pcap_findalldevs(&interfaces, buf_err)!=0) { printf("%s\n", buf_err); return(EXIT_FAILURE); }
@@ -142,3 +142,5 @@ int main(int argc, char *argv[])
 	return(0);
 }
+
+*/
@@ -3,15 +3,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <getopt.h>
 #include <string.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <pthread.h>
-
-#define BUFF_SIZE 100
-
-
+#include "libthrd.h"
@@ -62,42 +57,7 @@ int initialisationServeur(char* service)
 	return sock_fd;
 }
-void* reponseConnexion(void* sock)
-{
-	printf("Connected\n");
-	char buffer[BUFF_SIZE];
-	
-	FILE* sockdial_stream = fdopen(*((int*)(sock)), "a+");
-	
-	printf("Sock : %d // Stream : %p \n", *((int*)(sock)), sockdial_stream);
-
-	while(strcmp(buffer, "EXIT\n")!=0)
-	{
-		printf("WAIT\n");
-		fgets(buffer, BUFF_SIZE, sockdial_stream);
-	
-		printf("Le message reçu : %s", buffer);
-
-		fprintf(sockdial_stream, "Ceci est une réponse du serveur TCP.\n");
-
-	}
-	
-	printf("Fin de la connexion\n");
-	fclose(sockdial_stream);
-
-}
-
-int lanceThread(void(* fonction) (void *), void* arg, int size)
-{
-	pthread_t thr_id;
-	
-	if(pthread_create(&thr_id, NULL, (void*)fonction, arg )!=0) { fprintf(stderr, "Le thread n'a pas pu être créé.\n"); return -1; }
-	
-	pthread_detach(thr_id);
-
-	return 0;
-}
 int boucleServeur(int socket, void(* fctConnex)(int))
@@ -116,38 +76,3 @@ int boucleServeur(int socket, void(* fctConnex)(int))
 	}
 }
-void argPortParsing(int argc, char* argv[], char* port)
-{
-	struct option port_arg={"port", 1, NULL, 'p'};
-	char opt;
-	int longindex;
-
-	while( (opt=getopt_long(argc, argv, "p:", &port_arg, &longindex)) !='p' && opt!=-1) {}
-
-	if(opt=='p') 
-	{
-		strcpy(port, optarg);
-		printf("%s\n", optarg);
-	}
-	else
-	{
-		printf("La syntaxe doit être ./sioux -p <port> ou ./sioux --port <port>");
-	}
-}
-
-int main(int argc, char* argv[])
-{
-	char port[10]="80";
-	argPortParsing(argc, argv, port);
-	
-
-	int sock_fd=initialisationServeur(port);
-
-	if( sock_fd==-1 ) { fprintf(stderr, "Initialisation du serveur impossible\n"); return -1; }
-
-
-	boucleServeur(sock_fd, (void*)&reponseConnexion);
-	return 0;
-}
-
-
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset ="utf-8">
+		<title> Interface Tangible </title>
+		</meta>
+	</head>
+	<body>
+	</body>
+</html>
@@ -53,16 +53,25 @@ int connexionServeur(char* host, char* service)
 int main(void)
 {
+
+	char buffer[100];
 	int sock_fd = connexionServeur("localhost", "2020");
 	if(sock_fd<0) { fprintf(stderr, "Erreur connexionServeur\n"); return(-1); }
 	FILE* sockfd_stream = fdopen(sock_fd, "a+");
-	while(1)
+	printf("State sock : %p\n", sockfd_stream);
+
+	for(int i=0; i<10; i++)
 	{
-		fprintf(sockfd_stream, "YES !!! ");	
-	}
+		fprintf(sockfd_stream, "YES !!!\n");	
+	
+		//fprintf(sockfd_stream, "EXIT\n");
+		fgets(buffer, 100, sockfd_stream);
+	}
+	fprintf(sockfd_stream, "EXIT\n");
+	fclose(sockfd_stream);	
 	shutdown(sock_fd, SHUT_RDWR);
@@ -0,0 +1,34 @@
+#
+# Makefile pour generer la bibliotheque de fonctions de communication
+#
+
+CC=gcc
+CFLAGS=-W -Wall -Wextra
+CLIBS=ar -rcs
+LIB=libthrd.a
+LDIR=../libs/
+IDIR=../includes/
+LDFLAGS=-lpthread
+
+
+
+all: $(LIB)
+
+$(LIB): threadSocket.o
+	rm -f $@
+	$(CLIBS) $(LDIR)$@ $^
+	ranlib $(LDIR)$@ 
+	rm -f *.o
+	
+threadSocket.o: threadSocket.c
+	$(CC) -o $@ -c $^ $(CFLAGS) $(LDFLAGS)
+
+
+#
+# La cible de nettoyage
+#
+
+clean: 
+	rm -f *.o $(LDIR)$(LIB)
+
+
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset ="utf-8">
+		<title> Interface Tangible </title>
+		</meta>
+	</head>
+	<body>
+	</body>
+</html>
@@ -0,0 +1,73 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <pthread.h>
+#include <string.h>
+#include <unistd.h>
+
+#define BUFF_SIZE 1000
+
+void* reponseConnexion(void* sock)
+{
+	
+	printf("Connected\n");
+<<<<<<< HEAD
+	char buff_rec[BUFF_SIZE];
+	char buffer[]="HTTP/1.1 200 OK\r\nServer: Serveur fait maison\r\nContent-Type: text/html; charset=UTF-8\r\nConnection: Keep-alive\r\n\r\nPOST /Page.html HTTP/1.1\r\n\r\n";
+
+
+	FILE* sockdial_stream = fdopen(*((int*)(sock)), "a+");
+	
+	printf("Sock : %d // Stream : %p \n", *((int*)(sock)), sockdial_stream);
+	
+	fgets(buff_rec, BUFF_SIZE, sockdial_stream);
+	fprintf(sockdial_stream, "%s", buffer);
+
+	//while(strcmp(buffer, "EXIT\n")!=0)
+	//{
+		printf("WAIT\n");
+	//	fgets(buff_rec, BUFF_SIZE, sockdial_stream);
+	
+		printf("Le message reçu : %s", buff_rec);
+
+		fprintf(sockdial_stream, "Ceci est une réponse du serveur TCP.\n");
+
+	//}
+=======
+	char buffer[BUFF_SIZE];
+	
+	FILE* sockdial_stream = fdopen(*((int*)(sock)), "a+");
+	
+	printf("Sock : %d // Stream : %p \n", *((int*)(sock)), sockdial_stream);
+
+	while(strcmp(buffer, "EXIT\n")!=0)
+	{
+		printf("WAIT\n");
+		fgets(buffer, BUFF_SIZE, sockdial_stream);
+	
+		printf("Le message reçu : %s", buffer);
+
+		fprintf(sockdial_stream, "Ceci est une réponse du serveur TCP.\n");
+
+	}
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+
+	strcpy(buffer, "START");	
+	printf("Fin de la connexion\n");
+	fclose(sockdial_stream);
+	pthread_exit(NULL);
+}
+
+
+int lanceThread(void(* fonction) (void *), void* arg, int size)
+{
+	pthread_t thr_id;
+	printf("%d \n",size);	
+	if(pthread_create(&thr_id, NULL, (void*)fonction, arg )!=0) { fprintf(stderr, "Le thread n'a pas pu être créé.\n"); return -1; }
+	
+	pthread_detach(thr_id);
+
+	return 0;
+}
+
+
+
@@ -1,21 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <pthread.h>
-
-
-int lanceThread(void(* fonction) (void *), void* arg, int size)
-{
-	pthread_t thr_id;
-
-	if(pthread_create(&thr_id, NULL, fonction, arg)!=0) { fprintf(stderr, "Le thread n'a pas pu être créé.\n"); return -1; }
-	
-	pthread_detach(thr_id);
-
-	
-
-}
-
-int main(void)
-{
-	
-}
@@ -0,0 +1,29 @@
+
+CC=gcc
+CFLAGS=-W -Wall -Wextra
+CLIBS=ar -rcs
+LIB=libnet.a
+LDIR=../libs/
+LIBS=$(LDIR)libnet.a $(LDIR)libthrd.a
+IDIR=../includes/
+LDFLAGS=-lpthread -lpcap
+
+
+
+all: test
+
+test: test.c
+	cd ../Threads/ && make
+	cd ../Network/ && make
+	$(CC) -o $@ $< -I$(IDIR) $(LDIR)libnet.a $(LDIR)libthrd.a $(CFLAGS) $(LDFLAGS) 
+	rm -f *.o
+
+#
+# La cible de nettoyage
+#
+
+clean: 
+	cd ../Threads/ && make clean
+	cd ../Network/ && make clean
+	rm -f *.o test
+
@@ -0,0 +1,84 @@
+#include <stdlib.h>
+#include <stdio.h>
+<<<<<<< HEAD
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <signal.h>
+#include "libnet.h"
+
+
+int sock_fd;
+
+struct sigaction action;
+
+void handler(int sig)
+{
+	if(sig==SIGINT)
+	{
+		printf("\nINTERRUPTION SOCKET : %d\n\n", sock_fd);
+		close(sock_fd);
+		exit(1);
+	}
+}
+
+
+=======
+#include <getopt.h>
+#include <string.h>
+#include "libnet.h"
+
+
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+void argPortParsing(int argc, char* argv[], char* port)
+{
+	struct option port_arg={"port", 1, NULL, 'p'};
+	char opt;
+	int longindex;
+
+	while( (opt=getopt_long(argc, argv, "p:", &port_arg, &longindex)) !='p' && opt!=-1) {}
+
+	if(opt=='p') 
+	{
+		strcpy(port, optarg);
+		printf("%s\n", optarg);
+	}
+	else
+	{
+		printf("La syntaxe doit être de la forme %s -p <port> ou %s --port <port>\n\n", argv[0], argv[0]);
+	}
+}
+
+
+int main(int argc, char* argv[])
+{
+	char port[10]="80";
+	argPortParsing(argc, argv, port);
+	
+<<<<<<< HEAD
+	action.sa_handler=&handler;
+	sigaction(SIGINT, &action, NULL);
+
+	if( (sock_fd=initialisationServeur(port)) ==-1 ) { fprintf(stderr, "Initialisation du serveur impossible\n"); return -1; }
+
+	boucleServeur(sock_fd, (void*)&reponseConnexion);
+
+	
+	sendUDPBroadcast("BroadWesh", 2020);
+	sendUDPUnicast("192.168.0.37", "Coucou", 2020);
+=======
+
+	int sock_fd=initialisationServeur(port);
+
+	if( sock_fd==-1 ) { fprintf(stderr, "Initialisation du serveur impossible\n"); return -1; }
+
+
+	boucleServeur(sock_fd, (void*)&reponseConnexion);
+
+
+	sendUDPBroadcast("BroadWesh", 2020);
+
+>>>>>>> 52d8a1eaf954b611aaf0861144b440a15f7c517d
+	return 0;
+}
+
@@ -0,0 +1,13 @@
+#ifndef __LIBNET_H__
+#define __LIBNET_H__
+
+int boucleServeur(int socket, void(* fctConnex)(int));
+int lanceThread(void(* fonction) (void *), void* arg, int size);
+void* reponseConnexion(void* sock);
+int initialisationServeur(char* service);
+int initializeSocketUDP(char* service);
+int sendUDPBroadcast(char* message, int port);
+int sendUDPUnicast(char* address, char* message, int port);
+
+
+#endif
@@ -0,0 +1,9 @@
+#ifndef __LIBTHRD_H__
+#define __LIBTHRD_H__
+
+void* reponseConnexion(void* sock);
+
+int lanceThread(void(* fonction) (void *), void* arg, int size);
+
+
+#endif