From 548537dafc31f4624ecb940d650ab5b0db371501 Mon Sep 17 00:00:00 2001 From: raghav Date: Fri, 11 Feb 2022 21:33:24 +0530 Subject: [PATCH] Minor bug fixes --- .idea/sonarlint/issuestore/index.pb | 22 +++++++++++++++++- .../com/mercurys/TextClient.class | Bin 3660 -> 3658 bytes .../com/mercurys/TextServer.class | Bin 3667 -> 3673 bytes .../com/mercurys/encryption/Decryption.class | Bin 5105 -> 5105 bytes .../mercurys/threads/ReadMediaThread.class | Bin 5255 -> 5251 bytes .../com/mercurys/unfinished/MediaClient.class | Bin 5121 -> 4973 bytes src/com/mercurys/TextClient.java | 6 ++--- src/com/mercurys/TextServer.java | 4 ++-- 8 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb index 6c60869..5d41a82 100644 --- a/.idea/sonarlint/issuestore/index.pb +++ b/.idea/sonarlint/issuestore/index.pb @@ -1,3 +1,23 @@ D -project-mercurys.iml,1/c/1c3eb49b6844e2134ee9434a8a0c6cd160905cd4 \ No newline at end of file +project-mercurys.iml,1/c/1c3eb49b6844e2134ee9434a8a0c6cd160905cd4 +W +'src/com/mercurys/unfinished/ImagePixels,2/5/25ea4ac3533974b717c6c78a6993cdfb5ef3d110 +T +$.idea/codeStyles/codeStyleConfig.xml,d/d/dd7b3350c29c49497756c7f32c69a3bed18b1cba +[ ++src/com/mercurys/encryption/Decryption.java,6/f/6fd714eaba41a31dc0a7a23c9218cd342fb1b0ea +[ ++src/com/mercurys/encryption/Encryption.java,9/6/96a1e0b4ba9cb3e7c1682f3a3f3038c902a29072 +X +(src/com/mercurys/threads/ReadThread.java,e/1/e1cf1f9bdccfcc3052f34139833d66e98633d38f +_ +/src/com/mercurys/unfinished/DownloadTester.java,c/a/ca77d54aa53f3886622b47530a1eae49c028bf5f +Z +*src/com/mercurys/unfinished/Imagician.java,c/8/c8b5c95619e65336547807e233f212b8a1f0b8e6 +\ +,src/com/mercurys/unfinished/MediaClient.java,c/4/c48c1856d9364d5b6c27e22f156263f0568140dd +\ +,src/com/mercurys/unfinished/MediaServer.java,d/5/d577b04b028cd178c9d75cb6c1d40cd2676af835 +] +-src/com/mercurys/threads/ReadMediaThread.java,6/c/6c75ccca6577cb75856893189874dba222abb778 \ No newline at end of file diff --git a/out/production/project-mercurys/com/mercurys/TextClient.class b/out/production/project-mercurys/com/mercurys/TextClient.class index 4cda367a16d6f64b458e70ad93fb68f2e11b070d..9cb67e0dc1295b3af80c61b754f3a52589218da4 100644 GIT binary patch delta 116 zcmX>jb4q5z3}zb}*SwO{B8B4AqB0lb4F&v3}y=p*SwO{B8B4AqB0g{<90OwsN?EnA( diff --git a/out/production/project-mercurys/com/mercurys/TextServer.class b/out/production/project-mercurys/com/mercurys/TextServer.class index 420f68fdb7c33130789827dd549c55cd1f7acb19..e321fa04f89621b30e85532b189bcda65787adfe 100644 GIT binary patch delta 57 zcmcaCb5mwQ9UrfurIDVYnT4K#o}sDX#*Qpz4!-o%63@KUlFh%FAF=XqNBcVGWTxho N7&69ge#V*00ssdX5`F*x delta 51 zcmca9b6I9W9T#U#esW??Mt*V0#-1!@PX6@N5+9Jr=6}qOSUEY8b23x&N(>n{zv0Yf F0RRHa6EXk* diff --git a/out/production/project-mercurys/com/mercurys/encryption/Decryption.class b/out/production/project-mercurys/com/mercurys/encryption/Decryption.class index 9cc61ee6378f6fa467d36d62d1f00a806d507a87..af1e3b0e970b416f96e46c4c3dd74ab26f8f5054 100644 GIT binary patch delta 403 zcmWNM+baWL7{-5u*x1ZMbDqpBMvmEq#GE3hn+-{7VhioUh&yL1t>lYDZj@t@a_LIB zQLfzhJNyTpoA3R;=Y8Mjdwzf3KksXs#bG6bTyn_6j*UX>rr)yaDUw=D7A4ZlD59KF zDyX88TAdBJX{OrzT8ch19hs6G?}>dwy;%do78qqcHq~&mB5=XHz%#VhfI29 z8h6%w zo{0BFbs&mEb&vEzl1b@dj`iO*3#81foKyK35uf4Vf)+06RPY|I1$1M^3qH#4 Yk@DmZ$n6x-A#_#<62bbYU761SM delta 403 zcmWNM*((H47{z~t7~2fl*TERuSZ8b{+4t}?c4^cY(Y#pVZDcJ(S4!kXvL(u+C*?(X z^5XCCA2{8I?|$dp&ON_B=b!V{ZL!4>K|C=ekf@V_)pS{w9cfb2i6Tp04yokomPfu$ zF?K2_poT*8YuU4v5v@HN7bTjNRGVPzZHil}M{2!ZH^}o)NAp{0Tuhj!ok%(q+o|9# z+1-@W!w|hJ(Z`nNJ_8&v$cemjhPh9ml_KXLe^Z`?^gxDM^~9Y?adNX17Um^hiRRmZlhOlC~)g+k$l2PSUj7 zP1tN`s+EY? z&gei+KRP(u(Q|3Zd`5Q8j08A zT6MS48cAwt*HKz^M`Wjky+l0^+R@!UnsSD61A`eq`c$!b(V~3<@MFJ#5g(1)NaLV| zjKm;@RGYcVUx%#3Fmmcf^ODjVXqDQ5gUNnJFC3LPj5nyf8Sx#FcoS|^&zc*2ZZ^JQ_^{)2aB5^BjQ}=p%5Lryk#*pGLs247R1BDPDAPG4IZSP58zG<$0hE< z2i2XvwSf=ggoTetd=wv3Py3SoG(I8mNqkDRTh$zlOMC{ORU=j;c#DmD@OcYgkhm8U z>K^NAai1#kM*}Bu%0gaZ3I(;!e^cEwjWm?$w{TiOo;T@cqS%qyx=l1?8M@K*2M7};s#Dg4;NPb8kkPt|U_ z#s3tZk@z`&p-$M5$gl8g3(soA-w1?U^%;hKM<%y%q_5A(lC3(@Vd1yxMSJPu=kR;Y z^MvMkUgD4V6IJOe1)5Z?C{vpPVez7J0?(*@@~H5t=jCWHXp8xx*b)l}B|<7Y@4=E% zZWGO6;TIPPcm(@$)e&qlD+QLR6Z4iCmZ(w_!G>)XLI`3$^EiYmEOC3Lq1!X(*n6-7 zwQkSEb9?3*dmm^4{F&eX!qKA~8|)J*HotLf26c%U)F+}R5t~Be6q-(9O*D22tx@9? z+H|vNlB*5;m2DI@+j5vFrjiBJQGrXa2n|?_4vxC0s|Oe3DunSjt_;uJgumk@j(8{j zfqznse$$#gWB3;bA&6O?!NL@<5Vq(~;NN^qE=}?IkBgwiKR^f%`$p<*I}R(F$7`Z| zUz5k{_})E^#ar&fj?h(k>@o`2GY;vF9gZj6on@4}ohOtLCWWy%u6jsLErW$iS$rbQ zwkQ{@)7moe+|HJ)SEcoJry%fj|< z3n@QEu(Gk$IFFB!(d5h4P=9AEG?2%EyRf+?kLx>Q%!qL`$3i1{96F9-(!H@O8qZ^F zeD+Bq#z@4D?5%uk4v$XbW`NVuAa}3BcNEdK7yU7B+*jp3&(hO!2@hO}s;LE+^u$#>aGmnR8qxdww z;TmR=I_j~9eos-n4rnzLS~I3;8!61;qy48Ha_9o>A=d(|y9~>-E^R&9g~2z&z>gW}0(>j0!eeI)VSoG)MX%fRdxmU;MBXkqpR+-1Qw_I5h`d%JCIF9w!X@4hY zV+4IHR=|^a{49@Op7wX?NxJ^A89b*Ee^#8}jF1*?gs)#=oGj<%Tp<|2{_m#hSySsv$c({c_e$WQzmpF?Wp zW}VD-)YP?txv1mL<61VzE4G1uNiT*_gzMdyl5@+?-DU_~O*|qXboQ0P5c3#pC2qUW SZOcT3KAy9S#A2}o6|Vq;)!#Y* delta 2237 zcmYL~4}4oy6~})!?CI`8Ciz1h5l)dCf2wNc@-uvVZ_Efi&Hm&aea29-9NutCC$ zjp~r6!qyhvA<>M>)NEr}<7SB#ZOqm_w|D29#9j+q1g7mz98T1woqSzert^T4-_Y0T zWb?^Px&&p|Ch;z`sXL6CS(gh;9@nTz_SAHyGCj^-8|`?vg}6iqcB-e172zv1*_9-l z-yGgyVUIwWYd@K(Yu<9fv>#WgRc6KXy#nxKpMVkTi`nQ#(!zd;14yZ~xy0Xuv_uA3 zb+0+QJSX6*OCC&gIa)C<(Tl_CWi#ySlQ@d^s50*w-_;WD!~0c-ceU>W64&6Ey32d1 z?^=oL@Im#Qw>|bDf#AMm%309kWD~hWK9jRa`C*A0aZDi4<>a^KGFc~=KkCOvRKmBo z{$^sk1gS*2t8U9x`<>3bA0KB?dV8GQg6_;g#-nhnh1(=<$0yVyzGZCUFO#W=BPpcoKhQu z7_xA`#5ZtKrTo{_7nrGRy30aQK)#vRjpVU0j1gV>oishq@gy^%dun5EDs@!AJAdce@D3YK;indUCh>DT zt!}Uz{ZHXpiC^G3^_U$FyntU?cu|x8>Xty2cv)2kW`$nDZ#2l08sxVUzr*j*VMN;poX?qvF!LQm5$8PQZ#3uwoQV@lmXab16EEb;DS{IZ|7|Chom+05dn=kFBBY1?(`2*fjv@ z&J&yuxt8W3f>v6b$NOsc1mY5ug8ttQi(~;3S7SbBVJg*Ay_UZy1CBA5_59lc=CY1N z3ti?2!>(qI{*C`I^jb)~hX3-dk(a~k_#fXG{zOJJy@VOK(n9MN3%mUciB}xQS2h1D zG-XnDggRTIA*X<@JF%5$2V0`&;2XgDXy{M@Jtr`otVdcSu>#(!x7*!eVC-?CM@dS- zI)j)`0tXea!eRS&>?UDv$3{B1QjPXpuC_UKEGN$O|0 z#VqE`%dI1|=U@(nt}o(-me5VUGx%uS2z`vRwzwH>i+dySlUUke?qQ=AaZ6hfceKWg z7+F74z~`eQ_!67<47!ULpt!GyueaBRPK{zX9vj93MU1u&z+P@vngu+>T*XH4FfUTK zMFjhF4?4$NLnT9v{hGCbQ8|2cJ#~SOTwp!o^7HmZignkli?Bfm-QI4mPlw?h!xb=f zvkMRLb-xSN-bYfQ=JmePwTvRUs@) zp%2<3lnWo<3~XY1Xj*;v+9zlyV-o|vgqCz4m%%eeb421P9!Cmti=XKUq!s+LZhkvr z>RW{;S9hPsy;Op9u?_q@dXeSXIplVf99N(4W(dDl7bU``EQcWi5Mqiumbv3aVyZUJ M)oEh7n2E~&15BXe4gdfE diff --git a/out/production/project-mercurys/com/mercurys/unfinished/MediaClient.class b/out/production/project-mercurys/com/mercurys/unfinished/MediaClient.class index 1abb2037bab84feae2eac03b7f49e5d6f52e6bd5..fed9899b07e15dc566b87f19577134a2d96ca8bb 100644 GIT binary patch delta 2262 zcmZuyc~n$Y9R4m0yy5X!L{Ny-fey$rfF3MUasv z`!-o=D`ipHhRaA|w%KN>?VFXhuU58iYTtbW44(R9=G}YWZ~2zromriCFjw7mWZMn^ zS)nb zEW)K4F2m(PTWn5-++L~SDqJlP=j&+n`MoYri$GfNfH`$VnTiBltKm9aFED0>!_(x} z?Xt?Ec6XbjNuVIFYNcb9qr}x#GM|b5II$=gee7hjU6QI+~kxqBAnf%y^VmwtHG+ zn|=)&u}L7NQ>rasA1W3}uBAYchTs@49&dayU`cG^4p@sfsJGBn=bHsX|uWq3uyZo~?xdY8+; zaD~)ag@U~rUX{l&PIsG+e&u4X8E*(otmK}PWpTE7Ji62G+O#KbzX&9_##sneT4|xHCqz?QE?bY6dctsQ6RWh z+i8lT)SRm3XfO*CU2q!Lf2!a}+DXA%>2~;hx=#^`Ku++8Ha@r`Az8!)_a@AV zHzSHe8V`XtgOd`MH@wB4kzB;_I|U}BVhqx70>5@F#wi?y?j z%Hx;;cKrmO@|nnM{uwLNM$AIFQK30$Ms1`*4q4=4EG83W-bjUbOu*;(f)&z{j4usD z`?*U()M4Z*n5|&Zsr;~+4Y5YqLrG@@A~F<_TrpuxA;hVaqLjr?LLsKXN>Qd@y3xu) z@|lGA6~1N-D=B?LK_vO9LxRYr3Zl+cP-*mo0 zDSXt=($SE7iYX8<6K0gr)LE3foPwP~4yW?e20JRTfW|JvX=ujj0fX4IFt#BQW-Q0I z_>RQVP>X~3o=hwZ|A7ievzQG(QehJ$*-V&@@+d|@f`U#3Jz=qd>^M1e{O6ErGq8`T zas-MChZIP;MM4i?O@TFpbsLeAa(f7tJ|tJm^_^Uk=k$I<-U;kqIz%v=)PO4bJdgOQ z>3l8U)^MigBOhm?i1dbMHjB1Oi{#7}kIZbb!ATfr0ZD~J%ME=yhrVgt@_&Zk67~k> zO5bdQ=%sJ>%p1h|C52mY-vI8fE=qaCI)KOOlmToeiESb52;u3Orh?7V#}J;A3%+=f zOX*OQ;m|~O0v3}-9Z~~0i+5}(hiMrHt$`+;J<1W=2xc1&8B=ZMJ^Tqjvs5aX{(@hL z&q^J(<2TCtI}4krSSjCkVAT+Z<$M~qtT2R^2}uiKk3<&2Ya7p_)~{3R2)uCyUkB?n za+I9BtxdeGx`Ar=whrI^%%Q6g=^Kqd45EMHFFq65_iqUPM#=AJA(d3QiWO#|BI94@ C+Zm1k delta 2287 zcmZ`)X>=1+6#ibb%ru>}5GXVt7{p?sOGLl}ttiN%#nMwLE#d-H?~x{J8)`>wd6;=XV3dy}xJ$CGpB-MR0*@80jb_fB>XTT_8 z0~jxQulLRJcpD9?)3EF|&*oAUX9z&WnF6lLu1XbW3wXnk1$vv|Lle%`a30RL8@#21 zR9qmC7b=(Ti!@w}O9VWLcr=m}IK-ak?JG{QmwEf8F4M3K5rM)sBUvkPCMISYUC99Q z(C))x9Hin(fnJS<*%~q1LQbfvswy8Q<7y4dnIu$`7wRG=Q&@97_h!U?M-Oqd3TM?<8`h$a-=B+&mf zy;BcIb+awpn6yaa=#EIV)v$b61D6cdt>ISOCJ<C{ zS;6fBngbV!g{MZM`N^-Zf)(P}3tK0uj&G2R!YlDW3*u;wI@i_GqsFa1U ze{%Oui%vw~*?2JJ6IeJnXO)?v0z>1r|JvK>@BM?I$aEh}aX@!@2= zpy5SZ&+n7J-G^b=uHw~=7vz5@CLH(=LH~nO!?Yr1ydx=VQm-#C1oCCCI^85NwC*46 z#nW1n`t3Vh;52r&_XUFgtDpT_!O=x5jSwPF5iSjbh1)((+dj=JP@L;>c6TxsN;p$H zM5z2hmA!5zN7DB3EjzIx!8B?)7}lhyPAL$Lv%Wq!qu`t#k4H8|%eFHks? z9uz>}HG7ADZt8V@B!(fM&my?do4){tqA$iEh_UF0ap;eUD8UpAz#BX@f~Uqo!<%>u zF1}C2+jxhowBE&g#Ff_j_<(VC((a4A41rt<{0f@bHws2+jQ1fva&ow-uwuN-AwXPU z5DGDv_JNERa^m$P4locO;}foh@Z(d)qk1?3;~fNl(YP`D5QdW5!RUih<~(dKLIIIK z!!9C}pcg)O^4w{kUUYzX&0bzKZ9f&t$*qF%s+dEVN{mDqMxz{u(K`xvn|uyFPkEUN3lVq5Q3oC>6> z-9dL?Ng6X(VgjwR(l}=YhE~vAn#P6h!?xnmZMYmr!`^^E;EFUt-I?bq)3~bIT~Qu% zr?G-t-I;qU$^+MCU)D2{3sRoLnJ!ofmE|i&H7V3ksPQCvB)vx=H60W9ou7ykFbQ)w z*7I4%4jkj~9i2@%$4!NaukbYq6+_22_?84iXvTL`*hSD8_?`;8o%#=eD?^vZssBO+ zixo^}BLJfUtReq4avG}h0O#^x0$c0Bi_abMs;>F&<#qCO8-d*uEjLC?CJ)eWuM8}tOd zX*?eEJW%cKNoC6sc$UJgWAYUwG>2cTc`(qL~Ybk?k@)oe*%8dW`xjW?Z* zSI?6TynQ?spFwRK`PM|NX5Me&?FQa%Mki)D!XC-KsKBw5F13q6J6WXN_<ic> z{!^chpYStvDnJ*0p)ZeN;`kN6QEl004e(|djT$#8Smiv|P-Y-FUBQkFr_KAXExP3- z?ocxXb32=<+(qesn%)j3lP5bCbGbT0Sf0l7BQ`-x<0UTPG+vf%_zK%lwppIjX8oK_ zIhhPjVZL)X%X2BnyuFhsXL-*TV_#5d0gsx*VAR diff --git a/src/com/mercurys/TextClient.java b/src/com/mercurys/TextClient.java index 20ef5c4..2b25d11 100644 --- a/src/com/mercurys/TextClient.java +++ b/src/com/mercurys/TextClient.java @@ -33,15 +33,15 @@ public static void main(final String[] args) { private static String getHostAddress() { final Scanner sc = new Scanner(System.in); - System.out.println("Enter server host address [IP] or press 1 for localhost:"); + System.out.println("Enter server host IP address or press 1 for default address:"); final String hostAddress = sc.next(); - return (hostAddress.equals("1"))? "localhost" : hostAddress; + return (hostAddress.equals("1"))? "192.168.0.151" : hostAddress; } private void talk() { try { final ReadThread readThread = new ReadThread(this.socket, - "client1" + this.socket.getLocalAddress().toString()); + "[MHost" + this.socket.getLocalAddress().toString() + "]"); readThread.start(); this.writeToServer(); diff --git a/src/com/mercurys/TextServer.java b/src/com/mercurys/TextServer.java index f87c1f7..4e33947 100644 --- a/src/com/mercurys/TextServer.java +++ b/src/com/mercurys/TextServer.java @@ -14,7 +14,7 @@ public class TextServer { private TextServer(final int port) { try (final ServerSocket serverSocket = new ServerSocket()) { - serverSocket.bind(new InetSocketAddress("localhost", port)); + serverSocket.bind(new InetSocketAddress("192.168.0.151", port)); System.out.println(""" Server initiated. Waiting for client..."""); @@ -39,7 +39,7 @@ public static void main(final String[] args) { private void talk() { try { final ReadThread readThread = new ReadThread(this.socket, - "client1" + this.socket.getLocalAddress().toString()); + "[MClient1" + this.socket.getInetAddress().toString() + "]"); readThread.start(); this.writeToClient();