diff --git a/webserver/.main.c.swp b/webserver/.main.c.swp
deleted file mode 100644
index f48dd6d6fe81c6798f62acde92b3d64671f61cbe..0000000000000000000000000000000000000000
Binary files a/webserver/.main.c.swp and /dev/null differ
diff --git a/webserver/.main.h.swp b/webserver/.main.h.swp
deleted file mode 100644
index 63bf98f06823935d16fb0617ba930026d5801124..0000000000000000000000000000000000000000
Binary files a/webserver/.main.h.swp and /dev/null differ
diff --git a/webserver/.pawnee.swp b/webserver/.pawnee.swp
deleted file mode 100644
index df090c7dafff7765b97047d6ebabe28e66fae937..0000000000000000000000000000000000000000
Binary files a/webserver/.pawnee.swp and /dev/null differ
diff --git a/webserver/.socket.c.swp b/webserver/.socket.c.swp
index 145b0174816035472b857cf01619fdd822b717c3..36066abd09b6d63155fdf784302f40a32c2a53c0 100644
Binary files a/webserver/.socket.c.swp and b/webserver/.socket.c.swp differ
diff --git a/webserver/main.c b/webserver/main.c
index 1d00ad2e324df343dd5d370341d0b327c8cb8394..20c2a69805081a7ff5d3e91b20d942815c22896b 100644
--- a/webserver/main.c
+++ b/webserver/main.c
@@ -21,6 +21,6 @@ int main(int argc, char **argv) {
}
initialiser_signaux();
printf("Need an advice?\n");
- creer_serveur(8000);
+ creer_serveur(8080);
return 0;
}
diff --git a/webserver/main.o b/webserver/main.o
index c5c2f62d38978d2db4f41fd35e981c4b9f29e54d..16c42a2da10ef21faf2f6937a4ac6a8824af92e5 100644
Binary files a/webserver/main.o and b/webserver/main.o differ
diff --git a/webserver/pawnee b/webserver/pawnee
index 72d3816d9572c54f43b52a1779d041470bb03554..4769e4d4a9faee65d9a246c9fd1acb0f8d1da359 100755
Binary files a/webserver/pawnee and b/webserver/pawnee differ
diff --git a/webserver/socket.c b/webserver/socket.c
index e88498dac6d416ced6025fd042cfdddeffbca5cb..8abb0e2fddff07b12f49fe63049f93779f0d9772 100644
--- a/webserver/socket.c
+++ b/webserver/socket.c
@@ -3,7 +3,8 @@
#include <stdio.h>
#include "socket.h"
#include <netinet/in.h>
-
+#include <sys/wait.h>
+#include <stdlib.h>
int creer_serveur(int port){
//socket
@@ -12,11 +13,13 @@ int creer_serveur(int port){
if (socket_serveur == -1) {
/* traitement de l'erreur */
perror("socket_serveur");
+ exit(1);
}
int optval = 1;
if (setsockopt(socket_serveur, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(int)) == -1) {
perror("Can not set SO_REUSEADDR option");
+ exit(1);
}
/*Utilisation de la socket serveur */
@@ -28,29 +31,42 @@ int creer_serveur(int port){
if (bind(socket_serveur, (struct sockaddr *)&saddr, sizeof(saddr)) == -1){
perror("bind socker_serveur");
/* traitement de l'erreur */
+ exit(1);
}
+
//listen
if (listen(socket_serveur, 10) == -1) {
perror("listen socket_serveur");
/* traitement d'erreur */
+ exit(1);
}
-
+//decouper ici ---
int socket_client;
- socket_client = accept(socket_serveur, NULL, NULL);
- if (socket_client == -1) {
- perror("accept");
- /* traitement d'erreur */
- }
- /* On peut maintenant dialoguer avec le client */
- const char *message_bienvenue = "Bonjour, bienvenue sur mon serveur\nExcogitatum est super his, ut homines quidam ignoti, vilitate ipsa parum cavendi ad colligendos rumores per Antiochiae latera cuncta destinarentur relaturi quae audirent. hi peragranter et dissimulanter honoratorum circulis adsistendo pervadendoque divites domus egentium habitu quicquid noscere poterant vel audire latenter intromissi per posticas in regiam nuntiabant, id observantes conspiratione concordi, ut fingerent quaedam et cognita duplicarent in peius, laudes vero supprimerent Caesaris, quas invitis conpluribus formido malorum inpendentium exprimebat.Sed fruatur sane hoc solacio atque hanc insignem ignominiam, quoniam uni praeter se inusta sit, putet esse leviorem, dum modo, cuius exemplo se consolatur, eius exitum expectet, praesertim cum in Albucio nec Pisonis libidines nec audacia Gabini fuerit ac tamen hac una plaga conciderit, ignominia senatus.Post emensos insuperabilis expeditionis eventus languentibus partium animis, quas periculorum varietas fregerat et laborum, nondum tubarum cessante clangore vel milite locato per stationes hibernas, fortunae saevientis procellae tempestates alias rebus infudere communibus per multa illa et dira facinora Caesaris Galli, qui ex squalore imo miseriarum in aetatis adultae primitiis ad principale culmen insperato saltu provectus ultra terminos potestatis delatae procurrens asperitate nimia cuncta foedabat. propinquitate enim regiae stirpis gentilitateque etiam tum Constantini nominis efferebatur in fastus, si plus valuisset, ausurus hostilia in auctorem suae felicitatis, ut videbatur.";
while(1){
- write(socket_client, message_bienvenue, strlen(message_bienvenue));
- sleep(1);
- }
- //int optval=1;
- if (setsockopt(socket_client, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(int)) == -1) {
- perror("Can not set SO_REUSEADDR option");
- return -1;
+ socket_client = accept(socket_serveur, NULL, NULL);
+
+ if (socket_client == -1) {
+ perror("accept");
+ /* traitement d'erreur */
+ exit(1);
+ }
+
+ int pid = fork();
+ if(pid == -1){
+ perror("dork fail");
+ exit(1);
+ }else if(pid > 0) {
+ //close(socket_client); fait une erreur si on le met
+ }else{
+ /* On peut maintenant dialoguer avec le client */
+ const char *message_bienvenue = "Bonjour, bienvenue sur mon serveur\nExcogitatum est super his, ut homines quidam ignoti, vilitate ipsa parum cavendi ad colligendos rumores per Antiochiae latera cuncta destinarentur relaturi quae audirent. hi peragranter et dissimulanter honoratorum circulis adsistendo pervadendoque divites domus egentium habitu quicquid noscere poterant vel audire latenter intromissi per posticas in regiam nuntiabant, id observantes conspiratione concordi, ut fingerent quaedam et cognita duplicarent in peius, laudes vero supprimerent Caesaris, quas invitis conpluribus formido malorum inpendentium exprimebat.Sed fruatur sane hoc solacio atque hanc insignem ignominiam, quoniam uni praeter se inusta sit, putet esse leviorem, dum modo, cuius exemplo se consolatur, eius exitum expectet, praesertim cum in Albucio nec Pisonis libidines nec audacia Gabini fuerit ac tamen hac una plaga conciderit, ignominia senatus.Post emensos insuperabilis expeditionis eventus languentibus partium animis, quas periculorum varietas fregerat et laborum, nondum tubarum cessante clangore vel milite locato per stationes hibernas, fortunae saevientis procellae tempestates alias rebus infudere communibus per multa illa et dira facinora Caesaris Galli, qui ex squalore imo miseriarum in aetatis adultae primitiis ad principale culmen insperato saltu provectus ultra terminos potestatis delatae procurrens asperitate nimia cuncta foedabat. propinquitate enim regiae stirpis gentilitateque etiam tum Constantini nominis efferebatur in fastus, si plus valuisset, ausurus hostilia in auctorem suae felicitatis, ut videbatur.";
+ while(1){
+ write(socket_client, message_bienvenue, strlen(message_bienvenue));
+ sleep(1);
+ }
+ close(socket_client);
+ exit(0);
+ }
}
return 0;
}
diff --git a/webserver/socket.o b/webserver/socket.o
index 0b82ed68b8d11a76ee51266d539551e0bfa79a1c..01cfd92ce54f541cc5bafab22cbd8b0eba180093 100644
Binary files a/webserver/socket.o and b/webserver/socket.o differ