From e473bd929146ea8d481bdf108edc88445055cf27 Mon Sep 17 00:00:00 2001 From: Terence Denning <terrencedenning@gmail.com> Date: Wed, 17 Apr 2019 12:19:03 +1000 Subject: [PATCH] update --- http-server.c | 15 +++++++++++---- server | Bin 18304 -> 18304 bytes 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/http-server.c b/http-server.c index 7ba28a6..13af679 100644 --- a/http-server.c +++ b/http-server.c @@ -36,6 +36,7 @@ static int const HTTP_404_LENGTH = 45; static int user1 = -1; static int user1_start = 0; + static int user2 = -1; static int user2_start = 0; @@ -91,14 +92,18 @@ static bool handle_http_request(int sockfd) while (*curr == '.' || *curr == '/'){ ++curr; } - printf("I AM THE CURRENT: %s\n\n\n", curr); - // assume the only valid request URI is "/" but it can be modified to accept more files - if (*curr == ' ') { + + if (strlen(curr) > 0) { + if (method == GET) { if( strstr(buff, "?start=Start") != NULL ){ + if(sockfd == user1){ + user1_start = 1; + } else if(sockfd == user2){ + user2_start = 1; + } webpage = "html/3_first_turn.html"; - printf("\n\n\nWORKING\n\n\n"); } else { webpage = "html/1_intro.html"; } @@ -150,9 +155,11 @@ static bool handle_http_request(int sockfd) // get the size of the file struct stat st; stat(webpage, &st); + // increase file size to accommodate the username long size = st.st_size + added_length; n = sprintf(buff, HTTP_200_FORMAT, size); + // send the header first if (write(sockfd, buff, n) < 0) { diff --git a/server b/server index c2e65dfd92cdeefb5259329cea9670ab310390c1..fc50a3489cdca35b6da89c6b3962d7536bcc09c3 100755 GIT binary patch delta 1767 zcmZqZXKd(aoN$5DK#l<n3?|;(FStMk%w~YolUFj{7V*AaB+GSEW245;;{Ds^&yLZO zp1x)C45k^Zj5j75a)?VRNJDfz&`|(0IKU(WL&WApjz(7gT|5j79=*KIV9Hi&^G9BP zMn;dxj{Kscc03FWJ3y*m$o&2PAIy3=YjQTf6%#+t<mLQ^j1MQ@<k!;?<z`^$Zk74| z|G!7)xz6J+RR8?{@6mdoQqH5-b`CcK!wVL;?n{%61@!9qw=uLF;BQG_VPI(9tMdK- ze+K^6Vn&cNT0ekH={0rYW?=B>JpMxPFW9IOr*76Vc?AYbuq~xL$5~tC6&M&97#Lnl zbh9QPWVnvA=0RmVdRaNarm&{SD=@s~^XO$2fbbnc<P{h^x><ceRPWRTkd>X+K-O*M zWMJ^<o;m>}(#v}m#OsAPsq>si=W%cdyzu)o`Gk;)>5pGvr&Wr1^xEcgF)+Ni{u>rX zOPN8&u%44sVAux=KDgE;lk)_X7!xN?6qM6)1nJ5B{r`V=tIhZS|2vPrIPeQ*fF3g_ zM4`efC*Ks5=Vau9gvi9nj6#x(>XW5~WP?u1Dljzv_+QEg3H?si9kL1xuf@Arw?HL$ zU=oXE6&O5vS*L+~)XBON#Or3=1fo#<FEP1GNRCl)@=76D#@UmP3#ppA{zUk44+jIo z3l+E{KY?Pbn^jsC-IpIHD+((*`2YO>zq8fg`~UyVdqE^arLsq_tt!ZjBR@gDwt)Cr z{3p!Ut&AXFLxmY8Hwizk?*YX`_tXdw)!Pe791tHt652YDaO;7}9FW263=A)Ne?ZN8 z9p}-_nlG)u;L&+-mlOj7!#+@A@#wXU1}QuC<NyEH<~wv57#KW~FL?Cw*0O<YMx@|S zsKHvo9=*0_*ccdIn7~bD-2pbLyYxqjhp~yO1_J{_3F`}&$$X+tq6eiw!EAb!4IEdH z<l;LyRn$O@=LaY>Hv9vH28d(;r<*AtqYJ<P|Gyt(=8Nr<cZ(Y6n|=HLzx4oEJ^&=I z2A9tPIjgtzz`y_h_X&U;-+BCn#AGQkImXP%mSWP}f4}|z&%gaZ=kXWJljFsdbQ=&R z9c5);croD{%%*GKKrsMv$UasE28Pb#FHAPC6H8!}-uwk_xh)F=!wcrGFfE>wH6?mw zy1#(@u?OrA5Xn#}=+SFCk(q(vMZn}s5)<_6KY@yYgWatl+0H{Ao##AyZ9g%=3X%_> z{{Men*xkD3A2`WdPo5|#%zpP1$Te#w-<6P^d_vOS#_H4m|0fUg%eR0s4})X4W0+^> zb;nT05T9PvIw1vyP>)_+5FPB;`PZ}an~&yGkLEWV9tZz2zeu0#Cl$x2uz9T%598#E z(khdgWZGCj#!POPF|~4d|Ns9C1_lO&kN^K4U|?V{`1t>S1_J{F$if>83=DNY{{R2M zz`!u!@BjZ2peXtG|9=7_1B1Z7$=_tO7!OQVl+|ZkFgZ|G-7@0C|NpR(6l6ZAXpUiE zV2Jwo|Gx_x0|SF2pFkUvGcOynJsS@@2LnjH24uzLjk5BL1(Pqzx=YUZ^Z!2+NHY|J z;`9&5`pt%N{d|)jFbYgQpd%o71C)S4u7(!m5tAS4=rbPJEU3GjW%30>F=hdV3zIJz zic7)j1*magikU%(;e*U(CZl_di~*A$8tXH5Ocpem&ge3ErHMMD&g6?G`ivVUGn&RT zE|{EX3i91VQ;^6()9Z`}HqSIOXJouE`J%ZyqrqfJi+)DA%_}Xwb1{CHywF*n^8nOg q2PWTiHW$1A<-zE)lNDX`Ibm*EFgeo2oa+N97#J8pE}G@?j0pfSa<M@G delta 1862 zcmZqZXKd(aoN$5DL5=|o946k}FStPl%w~YolUFj{7TJ|NWiG?VrjSLe7x(m9F5M$M zXWq5VGni(uGM<=h$RRE%APv#=Kt}=0-~f{h3?7>kIT~5{SMe|~c=YlbgDG42%^!LF z85u1mJMxQ)>hUlz>;S2LA@leDe=zH1|Kx0bE2jV4lb7=wGG3f~lV4AVm79T~yH)1< z|NkDH=Q@wSQ2q1&zenqVN;!{S+a7KPh8HYw-Nz>z3+UB*bRP5Qwe{nMna&N;(B10r z{r`XdZ45RF{H<0j3=GYCRlfiK&%od6%LsB|>j#hpy{7uy3=AHf$6tH{X=*)CBID7^ zssR>bt(I3{@aVNQ1lbw>`~Uyfd>*~51`xS;kX$!wguDWSiAV3$1dw5!*FXlX<78m) z=$<+OB+|=!0>tZuSk`&Yqw_e}+b<#~%L}TSGXIA7Ow6O#Hj9ga;l-ohuy9$*3^IlF zrkn!9K2VUsb*`UWDX7GlGkK1nTu>rNPsQ*5|GQglzW@K<dHlucUoZpom_eZk72fje z|Nocb%&<UU<Zs=`gd7NpT#!JRGnq$7vfk*||Not>Cf`Bkg2?6rOdc~lI$HxkBCJ<r z6&RX-{4eE$#8D^fVOa%+*W%r*`=Js%Fo|`tpzvee1`2{s)*~QZH|t&yg%V)G93Zbk z0<60=;Jg0+{~nANJUUw=AVDYtk%#awLUP%!$qIrhrU5?@LAjlSf#HQdJS0AW;=7ww zO%^>U|4h~qR&<E^3G%JM_y7N!_ku`<N@b5;TLq9A=YN8NzycDqN<U#i+sX(ETBtDh z<X+*&jMFC<ipbXQ1Ub0%KxGcd0Con37c+i9^}LSr=w_{wR$%bxJh)4Wfq`KkBLgS` zY^y=aF8=uc|F!uJU64@n1&?0d3O0}ph%5k3Uabczg*|$0kFzl_ys(EG%(???Qn&Aq z6dn&_9#stn28I&W7ygqaMV&;?NP%L&^eY=UdLc<KVse3~0i*cjg`%PYTR>*jeE<J{ zKgf_5hbA8rHIR1v_WytDfl5%KEC9(H!sW{+3yKN5DS!X}Kkazyfq(!1GckB{w@&!? z|G!7`0S=FDa7HTm1`5w3AVIjC091|xlqI(x=sf;{Z*rEHl5RJ`s;8_B3@>JXgE{5l zH&D=T`1k++K2`<>hR)+J>^JWeOJJ1V_XX~{SQZ9`7kpn~T0$n9Nc74~`vS6l&p%Lf zf=Gr+L62VBjm!)TFQO;km6+h%^$Aq49PDld$#x#{=sf4qYs<?FD?EOG`v3oRVR!4A zf8Y$|_Vxe&<`0Z52TEe$VlO6dkSsEH{q+C;$;15e436QBVV<4W9YY;Me0o*;gcKM; zJ$iLPbg*ORU(e2OKAKNGn%{7E9Q@1tqI`0kR2-wh=DkupjN+aOj=l;Z9<B<`p+P~e zej!#0s>NJfT$4{otMYJhafSN_d3*Y~b8$_6Bi%l^LdL|(;QjyqGZ+{c1U~-%e}I93 zLE+>7{}~Jn3|gQ5|G&Y&z>xgo|NkEh3=9Q-|Noa@WMFvk_y7L{Mh1ote<wea(PG>% zSx{D=al&LrS#?W~5C8weif&K=1F8#R7#JA5KK}o2$;QCI;K(P?#^lV)#%#jI!_L6~ zlCJ?-F?pe^JY&G*gR<_D6@NfU0Hhm&1sE6@{(!9CtSHydH~D~$fZz#GVh6bxT5EVr zeyF3*xM8!P?s68!4U;b#iZTl@9GHC3P@HkYWJV)V79j=(+09Hw_ZS%+CO<URXRMek zXfmDAa`H+Obw-=X7ftjT7ffa}jc432Infm4mx-nzk%Ok!88>X6X=cvIcwq8Hb9Y9C z$&wcRjKZ5&T72hXd@y;Tvp(krs8cpfzUgc(cmT?S(QhX!y6AHvs=`PYb1nv1h`$(Q KH_vi;#smOK#Pdo3 -- GitLab