From a9c571bf0da87d20e579cb6dcf2f192a3521c3d4 Mon Sep 17 00:00:00 2001
From: "romain.gabet.etu" <romain.gabet.etu@univ-lille.fr>
Date: Mon, 15 Feb 2021 17:03:07 +0100
Subject: [PATCH] ok o ok
---
webserver/.client.c.swp | Bin 1024 -> 0 bytes
webserver/client.c | 19 ++++++++++++-------
webserver/client.o | Bin 3008 -> 3064 bytes
webserver/makefile.dep | 2 +-
webserver/pawnee | Bin 18080 -> 18080 bytes
5 files changed, 13 insertions(+), 8 deletions(-)
delete mode 100644 webserver/.client.c.swp
diff --git a/webserver/.client.c.swp b/webserver/.client.c.swp
deleted file mode 100644
index d8c251ca9ab55ecb09d9f63cece9cc73881b3abd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1024
zcmYc?$V<%2S1{HyVn6}c{TLY16O&R)ico~Ha)?!zoRgWFSE84U)sRua(GVC70lJ3(
E0MX_Q5dZ)H
diff --git a/webserver/client.c b/webserver/client.c
index 00e454c..19fffad 100644
--- a/webserver/client.c
+++ b/webserver/client.c
@@ -9,16 +9,18 @@
-char* testCorrect(char* str){
+char* testCorrect(char* str, int first){
char* strRet;
char *correctStr = "GET / HTTP/1.1";
char *incorrectStr = "HTTP/1.1 400 Bad Request\r\nConnection: close\r\nContent-Length: 17\r\n\r\n400 Bad request";
char *correctStr2 = "HTTP/1.1 200 OK\r\nConnection: close\r\nContent-Length: 17\r\n\r\n200 OK";
- if(strstr(str,correctStr) == NULL && !strcmp(str,"\r\n")){
+ if(strstr(str,correctStr) == NULL && first == 0) {
strRet=incorrectStr;
//printf("---\n%s\n---",str);
- }else{
+ }else if(!strcmp(str,"\r\n")) {
strRet = correctStr2;
+ }else{
+ strRet = NULL;
}
printf("---\n%s\n---",strRet);
return strRet;
@@ -41,12 +43,15 @@ int traitementClient(int socket_client){
exit(1);
}
//printf("test avant while\n");
-
- while(!feof(fd) && fgets(str,8000,fd) != NULL){ /* writing content to stdout */
- fprintf(fd,"<Notre Serveur> %s\n",testCorrect(str));
+ int first = 0;
+ while(!feof(fd) && fgets(str,8000,fd) != NULL){
+ char* resTest = testCorrect(str,first);
+ if(resTest!=NULL)fprintf(fd,"<Notre Serveur> %s\n",resTest);
+ first=1;
fflush(fd);
}
+ first=0;
//fflush(fd);
fclose(fd);
return 0;
-}
\ No newline at end of file
+}
diff --git a/webserver/client.o b/webserver/client.o
index 61b9d020a9db41fd90e632ee226d73beee69e6d1..3c7aaca08ec00cfdfd7053bcff251547ae5502d8 100644
GIT binary patch
delta 832
zcmX>g{zH6%2IG#2n##<brB^2USXc=(*Ir>L<?`ruec{pR`s1~xN4M(@k6u#-1_lO?
z&f_mYbn5}If(Kv)93IDAe}F_Mu2bbLkY`}%+&kyN|Nq^sb0$6zVg2CI?fPNjPnr4;
z45eZoy|y5QU^DhJGB7ZJS;t-ffJ9&Wb%*}(=xtr_;Q#;5YcQ)kI$d9QG}pdhD3S5#
z4t)VK4dIv_Abl`1K<0s^p^ijmw;r%8mG$Tj{Qxz8pMyNYHy*7AN?W0hK-L5{{p8`z
zD;P}}jpl=_a^w?eV{+zYW17Xo&cVPS!@$5`0}^LoU|<AU510SL!_G0ekwa>70Vm63
z9p*EP^C$mg&KCq50#nSuz~DWZkwtv-1QriQNg=2?ObiSRtPBhcfBr*&?BtKE;*uI@
zvMEr${bWTpamjcn52kl1l%GC1kWE~&8_I*pu7L8VPHtoqm)r^E!DKf>`3EL%WD}qK
zgH3>Q8&u@s<cDnHlJB8BnEDe?{+G#u?BbsPpga}^1_qFiV7`zBg$@G)14x_`$#<qu
zahPehq57RB7qW{>hC*dQx<rt4B~D(*E-qP%BrAp_J9Y9!c6-M8lLa}>GcK6?ki(ow
zfNioArybJ+#>s-rVv`FvHDJsQoEnS|Cg0?=XS_UFlFOdy0~16Amj>g9$uqg^nG`rC
e-{P`k^q4HkZO_;-Ig;C+Gk^o)#>B~qobmwhD&kuJ
delta 706
zcmew%en5PJ24llSP34LH7FvoP-L5x0dQBM^7#KV{kG}xXtp`fEJi1+9cyzk{c+KI_
z?fL-3ns`uEEkT}vp>yw=2mk+fw}MEhMyNiJDvxg0ACq|)Wioy+l=^t|+Jejj8@iv7
zfq?<c^5|{d@ZkS{m~9@Nhd`R3MtO7|-vQSH7Ka($?fL_zrS(9mtVeg~50FWdH!_Nd
z&qY=V)_?La0|Ue62aG0+Mm-?&9Qg#=n4EdpnA&;RIT#pZ7#J9AK;jGx3^zeET>c6V
zJICaW98!}Lm@hE)Og3c6=K>o5R=9Z;OBy31|71ZnaY-qVHU<U;CI$uuRt5$J9w=XR
zvLl<gB+PIY1_lOh1_p*d{~^F<av__zWC&C(NEW0ICR;IiA)B~l6Ot@1lHO&LFS3bC
zu0@jNN0L1`nUP&w@*I+^0FvyT$%gFWlO@=Bcm<I}Ur$bC7nl5nq=yqpmSgfnc5z8j
zP{c7XFo4`Dj3lc#`5?Qvq%M-ID3Yw_<d5v)j8T(0IqVsGCVO(6XH1<e$!X4XgLQHc
zryb+c$rCy48JAAJ$Z5~GVzMBYJ>%@jfn4^CJ0?#AlNY({nO?9@7UH&J6qp>yZO<4m
Oc_Ozxqr~Kk-0A=%G2bNs
diff --git a/webserver/makefile.dep b/webserver/makefile.dep
index 65ca8f9..425baca 100644
--- a/webserver/makefile.dep
+++ b/webserver/makefile.dep
@@ -1,3 +1,3 @@
+socket.o: socket.c socket.h client.h
client.o: client.c socket.h client.h
main.o: main.c socket.h
-socket.o: socket.c socket.h client.h
diff --git a/webserver/pawnee b/webserver/pawnee
index d9dbb98ac0b40d43a5f742b1454b8029696d61a3..65c1d490681a32cb8646f454ae999aff9c33b416 100755
GIT binary patch
delta 1657
zcmZ3`%ebJIaRUb<XD&Mf801bCWYp*UzzpUve3<OXxL@#rB7_I0CrdKj7P%<M{ZISt
z-?b+nZ+N*ya+QAZj~VuxIharJ33RbCFnILxDuXH8Ei98C37(!DCMv9W=imSTovweH
zYybQ&74zt|HQ{Aoc#;0^|Ns4r3=9k}YX42{5>+#B{rmra^ACs$Mvw{>xC*O(|No~Q
zcYVOb(CvDMfBS*X<1ftrPJSRNUw;fq(<L4Th8I`=!i;_W_y7NH*FXEX7#J8jkH4rv
zQn?4Day4A#L5Rv-An)!25uL|h%>4^;^N;3QsEg)<v{b;g^!@$+|HaC`^&mxGnrpv6
zoZSRc6arV21+udC3q$?lZr2~3$6st^00oe38c3Dgpa1{&gY0_Y^7sG$P>;^19?fqI
zJUVM{be3N6=w%J#VPNp+bp7Db%Nh+~zVPT}T>)V}@aPWx;L+`Rqu!(Qnn&mH7lwcT
z|MzG;P%6+|dxfEt%cI-%g-56BkJp+YMIODTo51>xzmWX%|9|TNu!09*1sop7U4MX_
z;nD5-!=v+<N3U%s4+FyvkkE_MzyJRSiJv?Sc3<P00(l08&b@OU{QuwG3L-t~drd*U
z={)|z;Lrd6VE1;re(>l#xJ!_MfngsgdOdn=-9R4B2PtT-{lEZD0<It-9Z(p6)Vy%|
z^Z);G*FPXzU;A~3{_*H-UGU)le~9NE{sSBR!lSwN1w)C9M|bE850EXrrb3Aje?goZ
z_Zw^o$Uv}s=kXWS5FdO1g;D%(u-|3DVFxjPpMyLol#jpo{0kC(tx!k6^soLknNdW>
zY6UkeNEZM4|NpgEx9cBpP%VUucmMkTe;3&1UeniF3=I4K|NsC0h3fCg;UX#`^&rzh
zNt?%`*EW%xf#Jp9Uz7Vq<e74QP2M0PC%oq;B;|vo#X!=le@%WUqT%|B3*x$)Kfx{+
z_UN^J&&9y-BJ$_||2wo87#LnFyfFFy|G!7C?Guo=<In&9_fL>#V0f|S_y7OkKskAM
z@&z#w@e67U451#qx*$5(M-!CRI9^=-vH7>yRgOst9Fr3iYc{he#4x5YN;6xhFfcH1
zGcYhXy!-!u0|NuYh4=se-(X;1c<}!J{{{vIhNB<;|Np?iz+m&~|9=5S28P?8{{J^%
zWMH`S`Tzd_Mg|7+FaQ4+FfuUg`11e%1V#o1g|GkrZ(w9#X!!d7{|`_YF-*2oQeupl
zoT#MF*fDvcl6w7zcmMx$fMOqtWf&M3Vi*`0&c6TuzZ|5+kx!tF$(ff8Nxp`GfkEZt
z|NrwrVla88Sv>3<3=AOsa~K#H7JvNzpAlI<(;v9}9tH-6mQVlxM>8-)F)+Xl2!kuQ
z!@$6>|I`2fjVKn>z~w>7RpImh{~0Lq$zXXG1_lNhMh1qA$rF{`SsOn8|IfJjp)xbq
z<QKXYj47KH^}<;gQzlm$=}W>&SCAnv%*-If;Ia9j(SAn8Rg)V{%o*QI-f2?K_+YZ3
zsk>5wI7Au9TOgJyBLjmF10Ta~5fG1ofst|YEYmzDak0r<W_nUGP*HFwF)%P}hN|8p
zIyuP9jWK2NOfz?;r9zt@nVB&%F^Er=vRKA6Lu~UQi(`yp#retEsU>>J49Pi}sd*qq
zZenKM=6P019E=MmA9T{^Oo6&3W%5racgA~@9i8<#VIF!gxzgF3(?bd3Dv!-Oou4xS
E0QVb@82|tP
delta 1611
zcmZ3`%ebJIaRUb<r!6}J7}!o0WYp(;!3^dwyqN6CxL@#&B7_I0CrdKj7Rk9Yp}BwS
z`Z@LQ-gH|&3G^}xV)x(7!F-BOAc~cN!K0V=GYg2aWn!NENbq#MM`!H~k6zXQUIqq_
zPS+0}y{w@S<_nKr)<qEJ1CQ>|4<6mFH#|D8d2}9svHIWt{~oOeN)^Fky{3D>%8tKS
z{P+L=)&r$n9^I}lJUU%}yyo!ec6|V1d33w}@aR0|(Q7-Imw{mi$lWhO|Nj5)QQz(Q
z<K*E`kIttajc*d<85lbEu6gkPe|Ia0^yoD$;ALRwJpN)ANNuO<4~RJjcL_2uFzjPw
z0DA=F^cO!t3Yu$wFqHau^xFFKGBCW@_V@q){U9|j&VVF)TQ@xT{~zRhrvD)N5ZJ8x
zUQ;uO>miO}0x1PM_V^1mBsLesYqB2Qp+7tzM(uNu2Zh=37xVr=f@3b&#LnX{V*mXA
z4>k_!v*tGnowaYeUEhF1;1&-&1pfTj{r_65+w~7v;xb&q_Rs(SyFgC&=rx_I!@#ir
z|NsC0UtIq)nNv(f#1Ld%^N;_fJfPs@VPJT%{?BAbF?nOTKmY$9cYVRYz#!n!+nVtI
z|NmW}fcEG-wjUH;FY<o>{}0pW0n!)yXYyn*jd~p(h(Ef2gQHK_qt{juB+dQ%|Nk9Y
z3=9mf6<(Nt!mQU;3?%;f*Z=?fC&)7}yZ|LmRF4{T*4_cz3XYxqObiSRFO2{E|KI8Q
zr@8je|57oJUfajq3=A*!{f5O3)0N+o9}1}%%=raz9!SXskdkV+l8L|n|4%#a`hba{
z+w~6r_5+>AU-bQ&Y%VNcFAMb(NK+$7lMY;y)9?TPyIue6<6;0Oq030dXM<ES!Bt8?
zR6^Vh3bM}QFTVT&Ir>L)?GK2f{XkmIgM1E(mlsce{r~@h;dc;7(U<1hFAznBAVsU;
ziVlLTto_1Jzqs4=N9XYuO`w?TwG{=aD*gHY|9+5NFJ}Mx|36KSU%myzW0){WTtu8f
zoq-|LqgNM12m5F~^=N*>@q+p1W^M7S9Fr$-8B9{(*xaEI!8n;ip(cq@n%O#mfq{XW
zfq}v0-T(h<7#J9?y#N3I3IhYfllTAs*Dx?Joc!?r{~HDdhR~1y|MM_1Fz9{y|6hlZ
zfuZx$|NlOW3=CYK|NqZnWMC-z{QrLsBLl;iFaQ6qVPs$k`TGC=7sknMN=l3glQWg{
z87EAhsie;MWAZ^Iai^>A|Nrj+Iogp=ppD6ymyM~Nhn<6gL56{W0c5G;hyVX?qR3x?
z%g<q8VEFZ6vX!zF+a3l62Gfs|qm-pw?=UbhO#Ar%e+G)KWVo(B3=9nSKK}n-4vGVq
ztsu1^uQM<($S^W6I82_Y?9Ldm`Jpm9*W>^uj>#`{Ef`HUE9!-_Fq%xRG}4!Zm6uSB
zV2YVRh{0j=L8JYQj4LKLnwT>_nY`1aobk?NLsNGp197k#29T{FmMS9ygAfBBgP|~p
z$G~utVe%}~Jf>8U$y{c7QcHy(qTrxmU|`q`Rm~+bImpb7(PZ*WGj}FG(an#{%ov$2
zh)tHVSjO~BWb+}5V~k?SIhm<>C3?vWxrv#1ddUpM`N`R-C7b72DRD3sPCn?Q&uId6
li^=4lPVS61Cp$XpbHY4yXL6;pIj4gX#D0g(JDs010RV2Rg9ZQq
--
GitLab