modifs

skhinach
1 parent 32c9271a
Showing 5 changed files with 39 additions and 9 deletions Show diff stats
Threads/Page.html
Threads/threadSocket.c
bin/test
bin/test.c
libs/libthrd.a
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+	<head>
+		<meta charset ="utf-8">
+		<title> Interface Tangible </title>
+		</meta>
+	</head>
+	<body>
+	</body>
+</html>
@@ -10,24 +10,27 @@ void* reponseConnexion(void* sock)
 {
 	printf("Connected\n");
-	char buffer[]= "HTTP/1.1 200 OK\nServer: Serveur fait maison\nContent-Type: text/html; charset=UTF-8\nConnection: Keep-alive\n\n<h1>Hey !</h1>";
-	
+	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)
-	{
+	//while(strcmp(buffer, "EXIT\n")!=0)
+	//{
 		printf("WAIT\n");
-		fgets(buffer, BUFF_SIZE, sockdial_stream);
+	//	fgets(buff_rec, BUFF_SIZE, sockdial_stream);
-		printf("Le message reçu : %s", buffer);
+		printf("Le message reçu : %s", buff_rec);
 		fprintf(sockdial_stream, "Ceci est une réponse du serveur TCP.\n");
-	}
+	//}
 	strcpy(buffer, "START");	
 	printf("Fin de la connexion\n");
 #include <stdlib.h>
 #include <stdio.h>
+#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);
+	}
+}
+
+
 void argPortParsing(int argc, char* argv[], char* port)
 {
 	struct option port_arg={"port", 1, NULL, 'p'};
@@ -30,8 +47,8 @@ int main(int argc, char* argv[])
 	char port[10]="80";
 	argPortParsing(argc, argv, port);
-
-	int sock_fd;
+	action.sa_handler=&handler;
+	sigaction(SIGINT, &action, NULL);
 	if( (sock_fd=initialisationServeur(port)) ==-1 ) { fprintf(stderr, "Initialisation du serveur impossible\n"); return -1; }