From 4222cdb13511ba4fbb7c44280252d413fc4ad49f Mon Sep 17 00:00:00 2001 From: Neeserg Parajuli <n.parajuli@student.unimelb.edu.au> Date: Thu, 19 Apr 2018 03:37:49 +0000 Subject: [PATCH] working with comments --- GETheader.h | 5 +++-- form_response.c | 6 ++++-- server | Bin 14800 -> 14800 bytes server.c | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/GETheader.h b/GETheader.h index d289322..d513f89 100644 --- a/GETheader.h +++ b/GETheader.h @@ -1,9 +1,10 @@ #ifndef GETheader #define GETheader -#define BADREQUEST 400 +#define BADREQUEST 404 #define FILENOTFOUND 404 #define PATHLEN 128 +#define SUCCESS 200 struct GET_header { @@ -22,4 +23,4 @@ int parse_GET_request(char* message, struct GET_header* header); -#endif \ No newline at end of file +#endif diff --git a/form_response.c b/form_response.c index b5ca6c9..27beb2d 100644 --- a/form_response.c +++ b/form_response.c @@ -29,7 +29,7 @@ int formresponse(char buffer[BUFFERSIZE], struct RESP_header* header){ } - else if (header->status ==BADREQUEST)// 404 response header + else if (header->status ==FILENOTFOUND)// 404 response header { char status[4]; sprintf(status, "%d", header->status); @@ -89,10 +89,12 @@ int sendresponse(int sockfd, struct GET_header* header){ break; } if(send(sockfd, buffer,n_bytes,0)<0){ + fclose(fp); return -1; } - } + } + fclose(fp); return 0; } diff --git a/server b/server index 66207235e8d64bc5162d48af204fdcdcbd9dca3d..274ca53cf8b925b3d8264ede36c87eaa4f758cb9 100755 GIT binary patch delta 1576 zcmcame4%*41<pUR3}EnQ;?4a+JThQ51CNXYn8716c@^U=k!MD?`?`D=wH}rKR`>Sc zBL5>X`}#M}U^>OcKS9cY!Q=Qr1u%6yW^*BL2&3N;DF=oZhyMQm@6p|Q;QRmo#~pa4 zFfuUg`2YX^|Ca`g3=AIKtrx!k|G#e?NL%Oe7ixe1|8G4|qO>2ZvjbJ<WMO_|#wC;8 z`DciLrC0nxF?jN4{_Tv8lUEBQF}h6V6O3bYoSZ9I&geM#so-kHh{+R$<}&`7tS>x? zqn?q0q4hvX#AHPg(aHCO?U{HPC(Da?b5CM`Ic?kIQW0Oqu*ru-)WXC(x?5L#|Nq~k z^Z1MH-~RsxJN~sElBnT#kfZrq6951I|C(_El1w{DJt+J<x_y77co_4jYA`S`l(4?& zo2)1*QGb+Mfx)BO^@m62HIV7sK(@3VC{gj~W?cl93jN^Gd`Q5f^O#5H^%v|g!(JX| z0EL|BG_V@D_Hrcc#b7BE?I*te|Gxv|mX{q6?dA1gMR5HVQ2mM?-K-&CDHQ#kF#WH6 zJi0}-!3yAd|9t!Z-=p<F2}myoSPDh2FI=yHN4M*T;|@F%7#SEQn~Pc5p5;<t@aR0a zOM-!cVILy{1H=9(X$OWEVc-7$-w)!xumKs}-OBL)|9_9>0|Fl13?7}w_BSXdFuXW8 zd7YR9Bgf?9Vgb6>zk(v6M8l(-RR+6}OTWU5?4Il*ZYeeK>;M0qtt$Wj|8L$4A{i=q z_7{WfzA<^axElY&FCYUeb@z9G#1>CJBW`3c6U5B^^8f!1CI$wEm-`tQ7`nkG>|<qM zVCX#lf*+zuWdC-MO2^515{8WSlM^IF*pGt*zJ8uuEg|jABI&@e4-^%kSYQ1KY>(jn z>mU_-KmY%~gPDPW;kAfIcdG%&)1Aj(O#k%%|I2I;r@IuCj!a<b=-lLo62Y!fpa1{& z=-v9^`~UyltpVTv|KABRd=~=;*iCOfg8Uis9pq0C$xtb`|1HQa=Fc$ooyT9KO|F!b zukZN+GHGf8+$4|AYn{hm^!xz3QEvZVkiLzdko1Xsf+nliyb!xPkH28}1j?AGDSpq# z|Nl=OPSfL;Zvi=u!7<!1%(3&oW2j?@Pp|4ZW(9^&k6uY#5F^;L^P6YqRUgf#9?fq! zJP!V4esO=Zp42HuOPBZm|1V)+U~u{P|9=Ss1B2D4|NqZ0Ffb^5`Tze70|P_gxBvfn z7#SEWe*XWj!^pr8@azA7A4Ud-ACnDb%o$Hi&Xmz-oH2Q(j5=f5<byKuj5?Da%E&9) ze*ORdIVeIM`2^aSoO#)pA2IQ;b1;C4K#*-LlNDv<8UIXnl$B>}nVcwFKS?ftamwaE zx#LWhJES1x<0UA414{pg(#+Bjc{wPp45e*02P&>-WSlaYQCXaE!DL2dQE5SVVG9l* zD8bAi#E`MsQ(2vf@yFys)qW-(naNCQdW;h`8>+E0GEUiSsXm>Nalzz^8v2Y1lNmMZ z8J|yX)XZm$nfy`nIuncJ<WpMv7+p4ZYO8ZGI!)eas?RwE>a;17Uz(b8E`ahDOx83r W=Rzv(v&_smGoYn^#^#k~>dXKmt(z+V delta 1509 zcmcame4%*41<pIN3}A3);?4a+Z=}I&hBwj<V8$Ei$*UM|iF_3OcS}+~?)Ar;Zy8*t zY>d@8rq#502Gc1n{sJin29M(h8Nk$WyUm5XA&h=4QVt9+4*mWA-=n+r!1w?Ek2~;8 zU}Rv}@&Et-|1S*~85lgeTQ7Y7|9@W}NL%Oe7ixe1|8G4|qO>2ZvjbJ<WMO_|#+J$M z{4+$r(kuR;7(Dqi|8_>j$*TpD7*!_o3C1xhPR<o9XH=a0RB$z;#pH=Xa~bbV))$_{ zk;urv(0ZUGVzQ!$=;V9C_Dt^?Cd-R>b2l@<oHk=}sfaJ5`{ctSY8LEZ*S?nb=x$x{ z{r`WD&f_l}zJpxJ-%{}Z|NqyF6Lx??$fMi$M~a6rkE#X(149Yxi#3z&MJ4JVb1N`- zbi4lW=)4Bfcm-rY>wyv#k8aijV5!g#9?gdYJUWkgbY6d<`tARJuwgHcGl0TIbPHGw zT>Dfc?GwRLDB7QWg=z1AXrGz|Rs`1{2Gy_V(al-}mO|0L9H#%Zk4LwtCs+YouN0DA zHLw(l-t5T^V*X06xfB>YIuGuWU|?X_$H>6Iu-{7Bf#F5TxBvh5gSaoECT|pzV!S{3 zjF<$Y+T^EV0lHtmg2J*y!=szk3cK#ZUtzjePEHcHlv@Aw|NqWbmH+?$H}3_J43#|l zgF)7Oo4i$Ajeq?Ykb#xD`!hgd2PeN0H!`RMF+0Ef|G$HYfq~)Weg+1HZm<daSQ!`? zI*-55g=iAlKOLkpezK2*p-k)-kUcX0|Nrl91(B@>Dh2m12gwV6nLJZMTIQLA1H(RW z+;<*-aq<(`TEYF>K`L%fz91ngwe{2g|1Y!ugHmZJC~=s;633g#|0RN5D?b1K@6o&U z!*`Gk0pI`s-w85o7Xt^_NnD>m)`xrtc@so3RLbo?3o={rGfaKw@fR(Vr%TG$ulfQq zX=(!8B#+K(oyT9S`T=&6-2S^Dedj+R=`;ESO)IZ?yIVnacOHKs_X*@u)MR|?<NyCB z5A(~nfSktQ815M6*!kZv)G@@TSM?pU0z;@rukJf>W(9^|&(3e2omYJ{pL#UE;qW;4 zm-)s2&3;m+7%fxY|Np;)fq^0A<NyC93=9lWpZ@<p!@$7c@a6yiHw+96h2Q@F=V4@E zu=@G`zYZe<L(s4P|9u!47=BF-lrd*~F}YJlpK-_Joigf-ZId6$$TRv(W|WmzjQ#rm z|4C46I`Rp$F*)<HF&|;#Vdr3wVPIeY*~T{6QC6Pu-{eGDdB(QMjk5KVH^?hYk_%ug z*&HZ$oXK*A6r^C=1f_RC>HARnF_iuXrJ11xq0Ht$#r2GgC6gJI#TgqWGb)Qp3&KlD za3DbmW(FY!kI9D0qMPHCg_sy`OfFRIXL=(&nMqBLv0$^I8apFn$!1IS>5PmGlP_xM zGcrtO)U0PbIk{0YpV4meN6qU@&m<<F(%Q$Uwz*SVor_Uv@<vmA&Jw6|N+!QFHRo)A d@){;<nwfJUmDO2hW}F@}5FdJMUTLPz3;;NQe3SqH diff --git a/server.c b/server.c index 01d00bf..e4ae53f 100644 --- a/server.c +++ b/server.c @@ -63,7 +63,7 @@ int main(int argc, char *argv[]){ if(listen(sockfd,MAXUSER)<0){ //listens on that socket perror("ERROR listening"); return 2; - +} while(1){ -- GitLab