From acfe3a0b12b5801f8b8a33e625b249c82919b274 Mon Sep 17 00:00:00 2001 From: Tobias Eidelpes Date: Wed, 23 Dec 2020 11:56:50 +0100 Subject: [PATCH] Add implementation from Assignment 1 --- .../main/dslab/mailbox/MailboxServer.class | Bin 1191 -> 5578 bytes .../dslab/monitoring/MonitoringServer.class | Bin 1337 -> 4689 bytes .../main/dslab/transfer/TransferServer.class | Bin 1203 -> 4747 bytes ...dslab.client.MessageClientMailboxTest.html | 318 +++++------------- ...dslab.client.MessageClientStartupTest.html | 157 +++------ ...lab.mailbox.MailboxServerProtocolTest.html | 243 +++++++------ .../dslab.mailbox.MailboxServerTest.html | 74 ++-- .../dslab.mailbox.MailboxStartsecureTest.html | 100 +++++- ...nitoring.MonitoringServerProtocolTest.html | 121 +++---- ...dslab.monitoring.MonitoringServerTest.html | 66 ++-- .../classes/dslab.naming.NameserverTest.html | 132 +++++--- ...b.transfer.TransferServerProtocolTest.html | 163 +++++---- .../dslab.transfer.TransferServerTest.html | 74 ++-- build/reports/tests/test/index.html | 134 +++----- .../tests/test/packages/dslab.client.html | 8 +- .../tests/test/packages/dslab.mailbox.html | 46 +-- .../tests/test/packages/dslab.monitoring.html | 48 +-- .../tests/test/packages/dslab.naming.html | 6 +- .../tests/test/packages/dslab.transfer.html | 48 +-- ...-dslab.client.MessageClientMailboxTest.xml | 312 +++++------------ ...-dslab.client.MessageClientStartupTest.xml | 146 ++------ ...slab.mailbox.MailboxServerProtocolTest.xml | 188 +++++------ .../TEST-dslab.mailbox.MailboxServerTest.xml | 46 ++- ...T-dslab.mailbox.MailboxStartsecureTest.xml | 87 ++++- ...onitoring.MonitoringServerProtocolTest.xml | 84 ++--- ...-dslab.monitoring.MonitoringServerTest.xml | 38 +-- .../test/TEST-dslab.naming.NameserverTest.xml | 158 ++++++--- ...ab.transfer.TransferServerProtocolTest.xml | 126 ++++--- ...TEST-dslab.transfer.TransferServerTest.xml | 46 ++- build/test-results/test/binary/output.bin | Bin 2107 -> 23648 bytes build/test-results/test/binary/output.bin.idx | Bin 203 -> 681 bytes build/test-results/test/binary/results.bin | Bin 58271 -> 24884 bytes .../compileJava/source-classes-mapping.txt | 58 +++- .../source-classes-mapping.txt | 4 +- src/main/java/dslab/Email.java | 62 ++++ src/main/java/dslab/Message.java | 93 +++++ .../exception/MalformedInputException.java | 7 + .../exception/MessageNotFoundException.java | 7 + .../exception/MissingInputException.java | 7 + .../exception/UnknownDomainException.java | 7 + .../exception/UnknownRecipientException.java | 7 + .../java/dslab/mailbox/DMAPConnection.java | 194 +++++++++++ src/main/java/dslab/mailbox/DMAPListener.java | 73 ++++ .../java/dslab/mailbox/DMTPConnection.java | 166 +++++++++ src/main/java/dslab/mailbox/DMTPListener.java | 75 +++++ .../java/dslab/mailbox/MailboxServer.java | 80 ++++- .../dslab/monitoring/MonitoringListener.java | 64 ++++ .../dslab/monitoring/MonitoringServer.java | 48 ++- .../java/dslab/transfer/ClientConnection.java | 129 +++++++ .../java/dslab/transfer/ClientListener.java | 64 ++++ .../java/dslab/transfer/TransferServer.java | 261 +++++++++++++- src/main/resources/client-arthur.properties | 6 +- src/main/resources/client-trillian.properties | 6 +- src/main/resources/client-zaphod.properties | 6 +- src/main/resources/domains.properties | 5 +- .../resources/mailbox-earth-planet.properties | 9 +- .../resources/mailbox-univer-ze.properties | 9 +- src/main/resources/monitoring.properties | 3 +- src/main/resources/ns-earth-planet.properties | 3 +- src/main/resources/ns-planet.properties | 3 +- src/main/resources/ns-root.properties | 3 +- src/main/resources/ns-ze.properties | 3 +- src/main/resources/transfer-1.properties | 9 +- src/main/resources/transfer-2.properties | 9 +- 64 files changed, 2723 insertions(+), 1726 deletions(-) create mode 100644 src/main/java/dslab/Email.java create mode 100644 src/main/java/dslab/Message.java create mode 100644 src/main/java/dslab/exception/MalformedInputException.java create mode 100644 src/main/java/dslab/exception/MessageNotFoundException.java create mode 100644 src/main/java/dslab/exception/MissingInputException.java create mode 100644 src/main/java/dslab/exception/UnknownDomainException.java create mode 100644 src/main/java/dslab/exception/UnknownRecipientException.java create mode 100644 src/main/java/dslab/mailbox/DMAPConnection.java create mode 100644 src/main/java/dslab/mailbox/DMAPListener.java create mode 100644 src/main/java/dslab/mailbox/DMTPConnection.java create mode 100644 src/main/java/dslab/mailbox/DMTPListener.java create mode 100644 src/main/java/dslab/monitoring/MonitoringListener.java create mode 100644 src/main/java/dslab/transfer/ClientConnection.java create mode 100644 src/main/java/dslab/transfer/ClientListener.java diff --git a/build/classes/java/main/dslab/mailbox/MailboxServer.class b/build/classes/java/main/dslab/mailbox/MailboxServer.class index cd8ea00df80ee92676c451cc79151e47452ccb26..123311846d095892132a608ce6589e248bf31ff1 100644 GIT binary patch literal 5578 zcmcgwd3+pI9sj;uv)N42Hc3NMT3Db!o2FT4X$wuMl=NCi+Srtq6htSRNixl5XWf}? z8$rPnj|$!#inmrpQ3~1gkV8SlinpkEfZ~0Ew*rFS-^^@wHc1Qq<7Yqn-kbM+@ArPk z_xF3hnWN7hz8krqr4Ihl63Hze>5I!udKBD2HQOw21AFS{0>I32#18=urxmgvn1l`%>EHK(_?0Lo7o;aIc&NLC-`(} z(~XB0d}3n~aiue4rcw$gcN%WoNXFgV9?ML}`<=nKO{S?-yhjMQxvqFpx1HrV4Iz0F zY1gDGK3U-mpG=p1otER8Y0-6FXTOs&`r_0n)o1UGuj|^@U0CIIQX9vmUK^&a8!;Wn z7&LoaJIhXCVaSq6JDtpBvu4_jcT5a78O~6bk>N?zJ=S2_aC2F1yW$0ITOA0$UZigi zZR)hr!)CweQ6TB^C2L>9pF&N}p@RxiZVv4{o|LP7y0FKm&ItQ5tDitwZKW-Djl$Nz z3MKn|t9uZmH3qD~Kzz%NC(@amOGKH*NO7{804q!`+OAO1VfWKgGpMP#IXBX0X15uA zDbCb)+DRj|-N;(<988uEo1+R^V1I?$62p<3J7hTu^Cy9!%Lj!ITQOVG9?95gx-cOM z(pD5)kT+EuF#>~Rwr`+GS}By;kLRouUBRNcvc)DnKM8gj?{D?fV zIi66yP|TsId68RU%lf@ZGviuzno>ucp`6=q?;&yX)?C`PM$GM&W6?Tm(`nl^gpA6! z9y8>O2{IygWW-4KlWT>a1)3IKHWdS&gN*DTxi(C*Ow&<6rU-?TCRsc&+2qj)O&kqB zrZTIOsQ_2e9y^y!nj0+7?Ij!AB!TJZ$CV0a6qDKUz^&sYxI%{^%}?;CjxFd`m^H<- z%n9Nhr_J}i9P*fspW;ohCX@5Nu9PaHh^k!2i?LNl54I8}9<78)5xRur`fS$D#*$10F7KBZ zLoa3z#M~h>=I*g$zCJO>yJ#F;RnQZv5?AVYl{kK`Z(QPZN@kbyt90~Yr>?YVX^VMX zXd^lQzGtoVN7sGLuXp^GbJ@#t*Y$5r7Q+w4Wl2#x7>skPAY&sKCI>(+Sti z8oVi+^aDV!PB zC8*d!x&$+lyJrP-fkn6Gq(&VG%ZYo6)x6VOM(L?-FE&NoD2c0U5<%l%|R)| zh^S>@*(R)d%-9NQz-q^IyR*EL>8UEBkD?p{Q3;;r+68o$x;#)ksv6a7g;gDeY$K&$ zjF(+(UDw*~AldjutrHtyS}KXu*y5OCtvg~2n;op~40ng+4sqnTM%tyL=M)`QT2d2- zR(ik|2&dicVq*`V6u5$Rrj>YC@~V_tC*#*ZtOmAajU;ET3amCc#|CB7^J40Mqzm0+ zp8qPToK)Vs{$FB1os4248zGSW z+{v28FX}cJNv1aziVfb4W0p8r;qov>OXBAR0si?aof*ZT^U?!Dj*#ALjEJ%v`EOtf zZPSPmPLQSWYS&Z~?`74ju%LK=mELU+o55?FkJmtXO`S-{b=vlDE~9W`_^e=)f9G#v zV5CfEflnC#DGZQMW+~aYZ8T#}Lw;F^ej@&-2;5<$Qaw!d)M}o>=~LFHlZ{2@@#%01 zU#c(SSAdJr37xOitaSL=UN03O`!Xq0yq=YcH_yt->sc##Jm@?t&(&7Fxd_O>Ty0-bN0!Waj2FfDC-?Z`4}pS!^)P{`l>v% zF+`4_y0^7H%7<~(tg39T%tJqfS|+io=Bh)eQ@9DI$%tjfy_mU5Yq=AZ%~~`6+>^(w z9s8eqMCS6S&!Zu9xF((QYe=2?@^57+%cTTr}Oey#cp06?YC3B8B}ovze)LSS%o@^xsJ0N zyntE8U|E4pG=745UxW^Z&qjt$A022hbgrQZuVv_5$Dk1xG*Qi!n2D?KO3$>{2j&*z z(FD6Sw9VuKD|Zq~BuM0mWdjQ{Nm&a;$)Z+a8{7NMz^Cs6ErUKQjT4Hmp~}Fe6tb5l*ooPU;yHXBXeO!_^QAG) zxL!fE&u2WZBZ4Jqd=Q?1wHYVNF} zA+BLxjaTC}zGZ0Ga!=aEmhzINdZ-~{j! z=WFpg($!L@*W(R5;aWabuzw?C;!Oo?GU_A-0KI-=9-9s#aR*Kp{>tMok_oSJyqSF& iW9g6V>p8lG|39EwouKBbIn-PB)N$?rciiE%U;Qt)d>I=6 delta 551 zcmah_xlRI66g{&s%rKy`skoqk%A$@UXd<;8MiUYfqlp=WAO;7+CLO&oHuD8m7FN=@ z6n+37MZEJM(Za;y-R<3b&pCIHdRFwo@be469(Gm8SXHowxNQ7rt>Y) R8978Kvkw@h7o(WR$~PnzKwJO- diff --git a/build/classes/java/main/dslab/monitoring/MonitoringServer.class b/build/classes/java/main/dslab/monitoring/MonitoringServer.class index 78df94bcfa8e2655c12aa5b69f77267d0b801a52..70508c5b6f242147521a9eade8efd73d140390b2 100644 GIT binary patch literal 4689 zcmb7I2YVFP6+NRi(r7>+2?@1-4 zW~VsCahjdpNl(CNMM>;bCvkeQ(|d1!AYZ;D=g!RTjta8!>DxDN-n;Lv^gvR^uerZ0S;e+^4 zJ$c@z;=>v~g7bpzqbfe8;^PWx($46p=_*(mKW&^bVtLO>$7Ia1M`Lk+ZkGZ*XS!!h zH{m45O;5p!K-MfTUjD3Q+Obq_H0Dr8Ivq=h z0423R>7e6MWmBLsZE)Lu+cSxYB8?fxwmiorn7EbmOk0qyi>GpFV>nixiw(>Y*5Tgu8HXkee0T^;g&=9w5^Kd>hY`Vvc;WS4Y<4)2@4;ii{@8MvTH)avi+W9P-@I!zU>XS|;>)5nk ze@gWEaT5hkZnQBmi(6+CQBYyo3YG;6XAn|Q>Esy?<=H4R&boQ7t?Uwx3h9*P`j6~C zmo&4U<=6zdDB&5&ae6dlsD{Cy;uDPDqj}r2GUkw#vuK1{ZQJn-Sx6i7TsLlwk{IJA zlQHZR_o)f|sh~DDmiJQ5S)!}T7(%e6>*Q?P_`WgRQSQ_<$FzdZ**@qmhj+;dT8V5< z#V5J_?qoWQCoSRR-K2TI5_d0~xwco_rQVW7w|;^_9Y!VL6qx-rh_nfR>OiQt#;ukuOA|Z-z zSMf_7zrwE-te%HS5K$_AqvN-@qT_e?{WPRUhEJPGCghq~I%b6>-CYi-e$R9bmhPgx zecC0U3O0pRZ$|!?ib6E)C24A1b5xE1D%=_^m;t_B8?KwS#p9+fXL^G!OP5rasD`lQ z$|g%^RV!xrsOhnSUuRK27nR)_R(h8CGe$aZ9vP7;(7z#428w3^33*Pivx4TXs7Q!M z!yoWRo}+y%^d3)?j@$PQb_CTXIBYvc9JfPZ;Af0+Q%*9&J8pSn?BzVe_E=%o&qXr= zCfrHE^0MEipZzRmmObJSEsvKW;p7)zvaTX8TC8oq>k>w?2yz-gf@6K;#eu6DvcU<( zs(j2fk{n5g=w_#Ec&z!S-+YB>!E%DMnpTmUM$Nc6k&s)AcF6AxS>{>ZaQbatF8b0& za9`M7^vIK9=qzhtZP{ElKDJmBYBCs8W#tyLpZW)jNQ7fRnyQfhvV9{kPoI>YofsX0qhixTiFDb_8v>WND&2-LIg58EYu^lP8Q%JWE@H(30 z**M`-HADJ$a85-HkQ?M1VrogY5jaSgA;6Ze;vrggtZ~Z_3 z@`fIf>M5Y>DmDnk?(_eBTs#v1Zlo>{T00|X2V>|KUPX(b+DYpq?JxG+839#~ihrYC z#i@Uh<(-_YA-w1CsW80e0$IHvkkwBDvX3D55#)Y?JTML9UH>0QUUfrDp5jxYtBp2l zeH5BJ3fRa8z1(vRo0tK;k5C|LtV8rl9E%yE%NU+wEIm*XF;OLy#nVhv2Lr?5u7gx3 zHf`>%+;S1Ii@5PJHj4+hC@AO5V&BI{v53*$#LI2bD_n;pg9n^ZaTiQ(KEgN2gHh($ zSSc4eeOQFoxV3<7m$CgJED`;RAFARsU@3R8_^iNbJjSQ|hvk0$zJWUY8GplHumUgQ Scr)c*%oQ*3+gJPTgZ~3Ni~XSh literal 1337 zcma)5+fvg|6kVsc&^BBITE!a{P|G!ns1G>4Ff!Abs*H7b;VDgz5T;3(Tu?qsUc5Z` z0e+O@I!U3GW-JdmXP>?I+LyI=e*gLT3&2afC_%&HBI;OH$4UvSSSw=;>l!vR7#f}k z6kge`9ljR$P;VZar>4<0-9w`l`nG$x-RuNivu#A7-8FVR_mfRk>|}dJ!##;Y`bpF2 zEB6SyP%iHaDa<^9k(zi zP)pX}Kl2cn>hu4;eJm}Kw=e`7DwtjOahH|<6RmX?gwi2>Nwl4dsqdN=m*b2Ei#r&~ ztE~yN(>6Lzcdhlk4&SJuz@Loc<{ww!T||jznXd!hdEWVzZxCN8WT5jb@djp)Lj~iM zwh|{yV3IGoV+uD2Rnj#5ly_bY2H9BRbchvdFug>p)GPmiB&rhNcAP*@jJ*Vc+L6Hd zRN$S_z@=2+-O<416krkeaG(7vGWXcMVq$hByLpbxIkMl8Yp(u4UZBtIM9k3|W37|9 fjW}jC!C@W`h#%*$YFHp8i+m{_m-s!ToWY~N=B6Z~ diff --git a/build/classes/java/main/dslab/transfer/TransferServer.class b/build/classes/java/main/dslab/transfer/TransferServer.class index 3c424fe07fdcb02657c79609bddcbc04d2ffda25..7b7105cbfd049b7b1059ad0ce2129e1d586d4ecc 100644 GIT binary patch literal 4747 zcma)AcUau!8UKlK5<&)Z20P$I9GqYboJSiHAa-nO*RGHzG!Vigs5iGr8b5dJa+FBkh)D7Zt+uT=3Wyjn#sUZdc(3SOt+PJ#D& z8E;VVMimXXOYGkyk6`>>6)W*R zfp9{``^APhQh@V86<6RxD$hPF<0C58;G<&rm=MXK2@eSTlW{6Zo((uH+xUB|f zQ4qtFigS3d7F+OujPoj{@o^#i6EYqW2GRP5RrCk)KPlr=LXS_&_>7FtN>B!D%gtvE zM}jtJS%x!^(OuVYWqgi@yB#~7Pl>}=#vUIRiO2*gwa zmb-0-3>O6qGdhJ1TAo3Th*Fo;&CIBMG?3xWp!quP(A|k)Jx8>fq&aTsUfwYz^hT@* zG5RCClb%Dn`XZ2`v`u8RU^GJmiLfVceV`n}) zYB>A!(F`H+Av>jK_Un!*_93v!n=l!&l^3^+O4p|BY|ggm*}-(VU7_N%i=LvsA_3+a zA)&&wBs2vU&oV|rrJZMjl}@8pF$Q_dWMUtu6}5)$coRA1ph)q$tW8(iB3*XaZaE;x z*-9r*v6bz@H4^DdA_jMDJDM_bo@raOZ$Z-2QJ|O>-mf2Tym##SNP0nEnm!qJ-Aj z(HbmIL<&-8Y-25XgdXfqWx}jelXl)o8QV>f6pP9!yG3=OlXn`fH*ARHaW&iss@yOq zq!N~eH@_u%jxWggqJ}Tw%No9duQI($f$yI1BOiqbD%xCPFpQlNt_)1L)a_-dTEC&E zdmaDR3**10VLuK?Sbou3DKNjT;h7lH@C|%Z!os3wgQ#t4)$lDms^RI_q2b$jf*4zE z+jFT-ZrJc9?6g}S!*>*XSHt)4n2hgh_yOp_Ccom(uHqVgh#v`|Kh`jaXE2gJnz&e{ zyjJiN4L=o9e+K&25rJGj%L@Y;mVR%@bUlOpM{xYPhF=KutQdX?OTn)+{94d?VzLS;^Os#6CLN$M;)SP=GZ&3nLO%%yPr5E5s64BINzIf*N{>6e>0BAR4~d z8J94W^Avn>?Q6yjQNmfpn5FaK%&iu@G9+SOya3n1qWhxVT7rC7&*Y6=W1-mMAZmeR|GwTL^;g#w_8KfvIjtfHf$IXNKtqMbYUdnu&z+VtUeOZ&(jnY z#~2qG&KK0ic??@~!75&S2i3TS$LMBrbdBQK#b7nIM?Dbgtl}^DtAwQkY}6iO+8R`V z;91r>W;?ACA7@#8(qMy6>D~d;o8ZdzbjxG$zpRwu}l*tCdE=sEUT<~aM$KwS|5z-QRWpx3U^ypJ#o?9KV z7|=7Br0E%bGX5iB^&Erd(~U*;;&`~6-$I-DX|)Agp`bN2aNFbK>?IZ}{LKCa;iyhxmk(FJI-L?6c(LDBjHUWUCmWfSbP>s2w&1sz-0%-BHmm;%SqqBn>k*M1stzJ z71~kH@6r}@U<20DJ)PK#F5HZ696|!OV;%0~XX!mWy$>643#kqU=Hl77l{*>^9iw!H zSf!Aro5hMP8kPQveVTIWaTiRUR#Vm;Ds5UMxd{n z0(Wby^|4w7iyM524o*zKJKjzN{3 zm;_sWpDd=Ht7(~yobQQ)p?97`PBJReGOlRh0Ut_4WY*wb&cabWLa#@lim8C^6Z{a5 z+L0*P;cLBa8tX@+T%%*Z7jj^HTi7f{b*I8F)A<*thJ^QiyxXCg1;h`-KwPXX7Q!?mZebQ--h zz3(())94>rs7~R!)7UhP&4fy)alMc)`4Nnhqp-A=5oy9wMsYbIFCeS}FT{&D$GB?1 rHav~%7RqX1bO)%xHqP5Q{~iCrKUf&v!ShC*zmuHb<&Pim$5a0Y9Puq= delta 516 zcmaiwxlY4S5Jk_kV;nn=HHniLNCIIA31F50KY;`l4Fw8|KnMkiz2gIrXxviq2atlL zprPZV5Mu`k3M7g*+nbqt@7#>Ho#5m1^$l2I*~MnUVUlWOrd(>&QzV(TnX#F*32f%t z!)8Ne&6D$%!mLhhD3YfK=V!aem#r{wU8(u-&Z?9&F22ozCX1)Zk+)gYG+5FU@WVo~ z>?!&Vn-|UCsM*>N*0vA#cFq*V@KzVY_hc?K9WPAj`)fw%5@LoBafD|ACA(8%wPc&( zE%8?E3H2a>LAO{}Jfx*LOOHg2P7}TKNha;|Ga#c;lqM5*TM<>vxF&pKAfbBwjZ~M9 zXy6x0S6uL81l{@kMon~V}AFVwx m=TXsJ5iMi!QZH7Np-4#
-
0.008s
+
1m6.01s

duration

@@ -76,116 +76,28 @@

inbox_mulipleMails_showsAllInboxDataCorrectly

-
java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientMailboxTest.setUp(MessageClientMailboxTest.java:59)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
- - -
java.lang.NullPointerException
-	at dslab.client.MessageClientMailboxTest.tearDown(MessageClientMailboxTest.java:74)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+
org.junit.runners.model.TestTimedOutException: test timed out after 40000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(AbstractQueuedSynchronizer.java:2123)
+	at java.base@11.0.8/java.util.concurrent.LinkedBlockingQueue.poll(LinkedBlockingQueue.java:458)
+	at app//dslab.StreamListener.poll(StreamListener.java:34)
+	at app//dslab.JunitSocketClient.read(JunitSocketClient.java:82)
+	at app//dslab.JunitSocketClient.sendAndRead(JunitSocketClient.java:108)
+	at app//dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at app//dslab.client.MessageClientMailboxTest.inbox_mulipleMails_showsAllInboxDataCorrectly(MessageClientMailboxTest.java:121)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 

 
 
@@ -193,116 +105,28 @@
 
 
inbox_singleMail_showsAllInboxDataCorrectly

 
-
java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientMailboxTest.setUp(MessageClientMailboxTest.java:59)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-

-
-
-
java.lang.NullPointerException
-	at dslab.client.MessageClientMailboxTest.tearDown(MessageClientMailboxTest.java:74)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+
org.junit.runners.model.TestTimedOutException: test timed out after 20000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(AbstractQueuedSynchronizer.java:2123)
+	at java.base@11.0.8/java.util.concurrent.LinkedBlockingQueue.poll(LinkedBlockingQueue.java:458)
+	at app//dslab.StreamListener.poll(StreamListener.java:34)
+	at app//dslab.JunitSocketClient.read(JunitSocketClient.java:82)
+	at app//dslab.JunitSocketClient.sendAndRead(JunitSocketClient.java:108)
+	at app//dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at app//dslab.client.MessageClientMailboxTest.inbox_singleMail_showsAllInboxDataCorrectly(MessageClientMailboxTest.java:92)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 

 
 
@@ -319,12 +143,12 @@
 
 
 inbox_mulipleMails_showsAllInboxDataCorrectly
-0.004s
+43.009s
 failed
 
 
 inbox_singleMail_showsAllInboxDataCorrectly
-0.004s
+23.005s
 failed
 
 
@@ -332,14 +156,52 @@
 

 
Standard error

 
-
Nov 26, 2020 10:42:20 AM dslab.client.MessageClientMailboxTest setUp
+
Dec 23, 2020 11:54:45 AM dslab.client.MessageClientMailboxTest setUp
 INFO: Creating mailbox server
-Nov 26, 2020 10:42:20 AM dslab.client.MessageClientMailboxTest setUp
+Dec 23, 2020 11:54:45 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@12a79257
+Dec 23, 2020 11:54:45 AM dslab.client.MessageClientMailboxTest setUp
 INFO: Waiting for mailbox server sockets
-Nov 26, 2020 10:42:20 AM dslab.client.MessageClientMailboxTest setUp
+Dec 23, 2020 11:54:45 AM dslab.client.MessageClientMailboxTest setUp
+INFO: Starting message client
+Dec 23, 2020 11:54:45 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@29ceee08
+Dec 23, 2020 11:54:48 AM dslab.mailbox.DMTPConnection run
+INFO: Split EMail addresses: [trillian@earth.planet]
+Dec 23, 2020 11:54:48 AM dslab.mailbox.DMTPConnection run
+INFO: Current email address in msg.getTo(): trillian@earth.planet
+Dec 23, 2020 11:54:48 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain earth.planet
+Dec 23, 2020 11:54:48 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain and user exists. Adding address to msg.To() field
+Dec 23, 2020 11:54:48 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@27090541
+Dec 23, 2020 11:55:28 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@7175fa12
+Dec 23, 2020 11:55:28 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@29ceee08
+Dec 23, 2020 11:55:28 AM dslab.client.MessageClientMailboxTest setUp
 INFO: Creating mailbox server
-Nov 26, 2020 10:42:20 AM dslab.client.MessageClientMailboxTest setUp
+Dec 23, 2020 11:55:28 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@27090541
+Dec 23, 2020 11:55:28 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@1a4b8391
+Dec 23, 2020 11:55:28 AM dslab.client.MessageClientMailboxTest setUp
 INFO: Waiting for mailbox server sockets
+Dec 23, 2020 11:55:28 AM dslab.client.MessageClientMailboxTest setUp
+INFO: Starting message client
+Dec 23, 2020 11:55:28 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@47222a70
+Dec 23, 2020 11:55:31 AM dslab.mailbox.DMTPConnection run
+INFO: Split EMail addresses: [trillian@earth.planet]
+Dec 23, 2020 11:55:31 AM dslab.mailbox.DMTPConnection run
+INFO: Current email address in msg.getTo(): trillian@earth.planet
+Dec 23, 2020 11:55:31 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain earth.planet
+Dec 23, 2020 11:55:31 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain and user exists. Adding address to msg.To() field
+Dec 23, 2020 11:55:31 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@49e5dce4
 

 
 

@@ -351,7 +213,7 @@ INFO: Waiting for mailbox server sockets
 
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM

+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM

 
 
 
diff --git a/build/reports/tests/test/classes/dslab.client.MessageClientStartupTest.html b/build/reports/tests/test/classes/dslab.client.MessageClientStartupTest.html
index 2cea00b..cb6fec2 100644
--- a/build/reports/tests/test/classes/dslab.client.MessageClientStartupTest.html
+++ b/build/reports/tests/test/classes/dslab.client.MessageClientStartupTest.html
@@ -41,7 +41,7 @@
 
 
 

-
0.003s

+
15.017s

 
duration

 

 
@@ -66,6 +66,9 @@
 
  • 
 Tests
 
    • 
+
  • 
+Standard error
+
    • 
 
 
    
 
    Failed tests
    
@@ -73,116 +76,26 @@
 
 
    startClient_shouldConnectToMailboxServerAndSendStartsecure
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientStartupTest.setUp(MessageClientStartupTest.java:37)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
-
    java.lang.NullPointerException
-	at dslab.client.MessageClientStartupTest.tearDown(MessageClientStartupTest.java:48)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+
    org.junit.runners.model.TestTimedOutException: test timed out after 15000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.park(LockSupport.java:194)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.parkAndCheckInterrupt(AbstractQueuedSynchronizer.java:885)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1039)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1345)
+	at java.base@11.0.8/java.util.concurrent.CountDownLatch.await(CountDownLatch.java:232)
+	at app//dslab.client.MessageClientStartupTest.startClient_shouldConnectToMailboxServerAndSendStartsecure(MessageClientStartupTest.java:78)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 
    
 
 
    
@@ -199,11 +112,29 @@
 
 
 startClient_shouldConnectToMailboxServerAndSendStartsecure
-0.003s
+15.017s
 failed
 
 
 
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:54:30 AM dslab.SimpleTcpServer run
+INFO: Starting mock server on 11623
+Dec 23, 2020 11:54:30 AM dslab.SimpleTcpServer run
+INFO: Listening on client connection
+Dec 23, 2020 11:54:30 AM dslab.SimpleTcpServer run
+INFO: Processing client connection Socket[addr=/127.0.0.1,port=47618,localport=11623]
+Dec 23, 2020 11:54:30 AM dslab.SimpleTcpServer run
+INFO: Listening on client connection
+Dec 23, 2020 11:54:45 AM dslab.SimpleTcpServer close
+INFO: Closing server socket
+Dec 23, 2020 11:54:45 AM dslab.SimpleTcpServer close
+INFO: Closing server socket
+
    
+    
+
    
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
 
 
diff --git a/build/reports/tests/test/classes/dslab.mailbox.MailboxServerProtocolTest.html b/build/reports/tests/test/classes/dslab.mailbox.MailboxServerProtocolTest.html
index e5186ce..e09a21c 100644
--- a/build/reports/tests/test/classes/dslab.mailbox.MailboxServerProtocolTest.html
+++ b/build/reports/tests/test/classes/dslab.mailbox.MailboxServerProtocolTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    4
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    12.017s
    
+
    13.092s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,124 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    acceptDmtpMessage_listDmapMessage
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
-
    dmtpMessage_withUnknownRecipient_returnsError
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
-
    loginAndLogout_withValidLogin
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
-
    login_withInvalidLogin_returnsError
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -189,27 +78,121 @@
 
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
    
 
 
 
    acceptDmtpMessage_listDmapMessage3.002sfailedacceptDmtpMessage_listDmapMessage4.043spassed
 
    
 
    dmtpMessage_withUnknownRecipient_returnsError3.012sfaileddmtpMessage_withUnknownRecipient_returnsError3.017spassed
 
    
 
    loginAndLogout_withValidLogin3.002sfailedloginAndLogout_withValidLogin3.018spassed
 
    
 
    login_withInvalidLogin_returnsError3.001sfailedlogin_withInvalidLogin_returnsError3.014spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:54:14 AM dslab.mailbox.MailboxServerProtocolTest setUp
+INFO: Waiting for server sockets to appear
+Dec 23, 2020 11:54:14 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@241b95b7
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@1f3c1728
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection run
+INFO: Split EMail addresses: [trillian@earth.planet]
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection run
+INFO: Current email address in msg.getTo(): trillian@earth.planet
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain earth.planet
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection run
+INFO: Address trillian@earth.planet belongs to this domain and user exists. Adding address to msg.To() field
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection storeMessage
+INFO: Storing message from arthur@earth.planet
+to trillian@earth.planet
+subject hello
+data hello from junit
+
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection storeMessage
+INFO: storeMessage(): checking if msg 0 arthur@earth.planet hello already exists for recipient trillian@earth.planet
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@73c9d031
+Dec 23, 2020 11:54:14 AM dslab.mailbox.DMAPConnection loginLoop
+INFO: User successfully logged in: trillian@earth.planet
+Dec 23, 2020 11:54:15 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@6b871b90
+Dec 23, 2020 11:54:15 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@6540f948
+Dec 23, 2020 11:54:15 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@1f3c1728
+Dec 23, 2020 11:54:15 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@6b871b90
+Dec 23, 2020 11:54:15 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@73c9d031
+Dec 23, 2020 11:54:18 AM dslab.mailbox.MailboxServerProtocolTest setUp
+INFO: Waiting for server sockets to appear
+Dec 23, 2020 11:54:18 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@65f3f723
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@50d35cb5
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMAPConnection loginLoop
+INFO: User successfully logged in: trillian@earth.planet
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@49562a5
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@4fc64790
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@50d35cb5
+Dec 23, 2020 11:54:18 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@49562a5
+Dec 23, 2020 11:54:21 AM dslab.mailbox.MailboxServerProtocolTest setUp
+INFO: Waiting for server sockets to appear
+Dec 23, 2020 11:54:21 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@520788de
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@5873049e
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection run
+INFO: Split EMail addresses: [unknown@earth.planet]
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection run
+INFO: Current email address in msg.getTo(): unknown@earth.planet
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection run
+INFO: Address unknown@earth.planet belongs to this domain earth.planet
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection run
+INFO: Our userStorage in domain earth.planet does not contain user unknown
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@6b58be8b
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@5873049e
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@dc78beb
+Dec 23, 2020 11:54:21 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@6b58be8b
+Dec 23, 2020 11:54:24 AM dslab.mailbox.MailboxServerProtocolTest setUp
+INFO: Waiting for server sockets to appear
+Dec 23, 2020 11:54:24 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@5d7aadb9
+Dec 23, 2020 11:54:24 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@340579b2
+Dec 23, 2020 11:54:24 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@6f10dd9e
+Dec 23, 2020 11:54:24 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@340579b2
+Dec 23, 2020 11:54:24 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@61d72fd4
+Dec 23, 2020 11:54:24 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@6f10dd9e
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/classes/dslab.mailbox.MailboxServerTest.html b/build/reports/tests/test/classes/dslab.mailbox.MailboxServerTest.html
index 17efb53..bef6a14 100644
--- a/build/reports/tests/test/classes/dslab.mailbox.MailboxServerTest.html
+++ b/build/reports/tests/test/classes/dslab.mailbox.MailboxServerTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    1
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    0.003s
    
+
    3.007s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,43 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerTest.runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly(MailboxServerTest.java:33)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -108,12 +78,36 @@
 
-
-
-
+
+
+
    
 
 
 
    runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly0.003sfailedrunAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly3.007spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:54:27 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Starting thread with component dslab.mailbox.MailboxServer@d5e253e
+Dec 23, 2020 11:54:27 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@d5e253e
+Dec 23, 2020 11:54:27 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Waiting for DMTP socket to open on port 11622
+Dec 23, 2020 11:54:27 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Waiting for DMAP socket to open on port 11623
+Dec 23, 2020 11:54:27 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@50c1e13d
+Dec 23, 2020 11:54:27 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Shutting down component dslab.mailbox.MailboxServer@d5e253e
+Dec 23, 2020 11:54:27 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@5f003336
+Dec 23, 2020 11:54:27 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@50c1e13d
+Dec 23, 2020 11:54:30 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Waiting for thread to stop for component dslab.mailbox.MailboxServer@d5e253e
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/classes/dslab.mailbox.MailboxStartsecureTest.html b/build/reports/tests/test/classes/dslab.mailbox.MailboxStartsecureTest.html
index 1bdfddf..79eb0f1 100644
--- a/build/reports/tests/test/classes/dslab.mailbox.MailboxStartsecureTest.html
+++ b/build/reports/tests/test/classes/dslab.mailbox.MailboxStartsecureTest.html
@@ -41,7 +41,7 @@
 
 
 
    
-
    3.003s
    
+
    4.025s
    
 
    duration
    
 
    
 
@@ -66,6 +66,9 @@
 
  • 
 Tests
 
    • 
+
  • 
+Standard error
+
    • 
 
 
    
 
    Failed tests
    
@@ -73,12 +76,18 @@
 
 
    sendStartsecure
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxStartsecureTest.setUp(MailboxStartsecureTest.java:31)
+
    java.lang.AssertionError: 
+Expected: a string containing "ok DMAP2.0"
+     but: was "ok DMAP"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:54)
+	at dslab.JunitSocketClient.assertThat(JunitSocketClient.java:120)
+	at dslab.JunitSocketClient.verify(JunitSocketClient.java:92)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:58)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -86,9 +95,58 @@
 	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
 	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
 	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base/java.lang.Thread.run(Thread.java:834)
+
    
+
+
+
    java.lang.AssertionError: 
+Expected: a string containing "ok mailbox-earth-planet"
+     but: was "error not logged in"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:54)
+	at dslab.JunitSocketClient.assertThat(JunitSocketClient.java:120)
+	at dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:61)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base/java.lang.Thread.run(Thread.java:834)
+
    
+    
+
+
    java.lang.AssertionError: Expected server response to be Base64 encoded
+Expected: a string matching "^(?:[a-zA-Z0-9+/]{4})*(?:[a-zA-Z0-9+/]{2}==|[a-zA-Z0-9+/]{3}=)?$"
+     but: was "error not logged in"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:68)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
@@ -109,11 +167,29 @@
 
 
 sendStartsecure
-3.003s
+4.025s
 failed
 
 
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:54:10 AM dslab.mailbox.MailboxServerProtocolTest setUp
+INFO: Waiting for server sockets to appear
+Dec 23, 2020 11:54:10 AM dslab.mailbox.MailboxServer run
+INFO: Creating DMTP and DMAP serverSockets for MailboxServer + dslab.mailbox.MailboxServer@3fe01346
+Dec 23, 2020 11:54:10 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@3df07a72
+Dec 23, 2020 11:54:11 AM dslab.mailbox.DMTPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMTPConnection@3df07a72
+Dec 23, 2020 11:54:11 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@773ef65c
+Dec 23, 2020 11:54:11 AM dslab.mailbox.DMAPConnection shutdown
+INFO: Shutting down client connection dslab.mailbox.DMAPConnection@139c58dc
+
    
+    
+
    
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
 
 
diff --git a/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerProtocolTest.html b/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerProtocolTest.html
index c6a416f..3a962d7 100644
--- a/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerProtocolTest.html
+++ b/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerProtocolTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    2
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    6.020s
    
+
    22.044s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,70 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    addresses_returnsCorrectStatistics
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerProtocolTest.setUp(MonitoringServerProtocolTest.java:36)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
-
    servers_returnsCorrectStatistics
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerProtocolTest.setUp(MonitoringServerProtocolTest.java:36)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -135,17 +78,55 @@
 
-
-
-
+
+
+
-
-
-
+
+
+
    
 
 
 
    addresses_returnsCorrectStatistics3.002sfailedaddresses_returnsCorrectStatistics11.005spassed
 
    
 
    servers_returnsCorrectStatistics3.018sfailedservers_returnsCorrectStatistics11.039spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:52:57 AM dslab.monitoring.MonitoringServer run
+INFO: Creating UDP serverSocket for dslab.monitoring.MonitoringServer@2f62b3f5
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringServerProtocolTest servers_returnsCorrectStatistics
+INFO: Sending three monitoring packets to monitoring socket
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:42
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: foo@example.com
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:43
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: foo@example.com
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:42
+Dec 23, 2020 11:53:00 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: bar@example.com
+Dec 23, 2020 11:53:08 AM dslab.monitoring.MonitoringServer run
+INFO: Creating UDP serverSocket for dslab.monitoring.MonitoringServer@1e2967a2
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringServerProtocolTest addresses_returnsCorrectStatistics
+INFO: Sending three monitoring packets to monitoring socket
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:42
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: foo@example.com
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:43
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: foo@example.com
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains server: 127.0.0.1:42
+Dec 23, 2020 11:53:11 AM dslab.monitoring.MonitoringListener run
+INFO: Incoming packet contains address: bar@example.com
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerTest.html b/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerTest.html
index e408caf..0291364 100644
--- a/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerTest.html
+++ b/build/reports/tests/test/classes/dslab.monitoring.MonitoringServerTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    1
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    0.002s
    
+
    6.017s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,43 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
    
-
-
    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerTest.runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly(MonitoringServerTest.java:27)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -108,12 +78,28 @@
 
-
-
-
+
+
+
    
 
 
 
    runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly0.002sfailedrunAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly6.017spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:53:19 AM dslab.monitoring.MonitoringServerTest runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
+INFO: Starting thread with component dslab.monitoring.MonitoringServer@7baac9c6
+Dec 23, 2020 11:53:19 AM dslab.monitoring.MonitoringServer run
+INFO: Creating UDP serverSocket for dslab.monitoring.MonitoringServer@7baac9c6
+Dec 23, 2020 11:53:22 AM dslab.monitoring.MonitoringServerTest runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
+INFO: Trying to create socket on port 11628
+Dec 23, 2020 11:53:22 AM dslab.monitoring.MonitoringServerTest runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
+INFO: Shutting down component dslab.monitoring.MonitoringServer@7baac9c6
+Dec 23, 2020 11:53:25 AM dslab.monitoring.MonitoringServerTest runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
+INFO: Waiting for thread to stop for component dslab.monitoring.MonitoringServer@7baac9c6
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/classes/dslab.naming.NameserverTest.html b/build/reports/tests/test/classes/dslab.naming.NameserverTest.html
index be1ee8c..deade60 100644
--- a/build/reports/tests/test/classes/dslab.naming.NameserverTest.html
+++ b/build/reports/tests/test/classes/dslab.naming.NameserverTest.html
@@ -41,7 +41,7 @@
 
 
 
    
-
    36.056s
    
+
    36.035s
    
 
    duration
    
 
    
 
@@ -76,12 +76,8 @@
 
 
    ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:78)
+
    java.lang.AssertionError: Expected root nameserver to start a registry, but it couldn't be located or registry.list() failed
+	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:81)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -94,6 +90,28 @@
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
 	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.list(RegistryImpl_Stub.java:90)
+	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:79)
+	... 12 more
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
 
    
 
 
@@ -101,12 +119,8 @@
 
 
    ns02_startRootNameserver_registersRemoteObjectCorrectly
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns02_startRootNameserver_registersRemoteObjectCorrectly(NameserverTest.java:109)
+
    java.lang.AssertionError: Error while looking up remote object 
+	at dslab.naming.NameserverTest.ns02_startRootNameserver_registersRemoteObjectCorrectly(NameserverTest.java:118)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -126,12 +140,14 @@
 
 
    ns03_startingZoneNameserver_registersNameserverCorrectly
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns03_startingZoneNameserver_registersNameserverCorrectly(NameserverTest.java:141)
+
    java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.list(RegistryImpl_Stub.java:90)
+	at dslab.naming.NameserverTest.ns03_startingZoneNameserver_registersNameserverCorrectly(NameserverTest.java:143)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -144,6 +160,19 @@
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
 	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
 
    
 
 
@@ -151,12 +180,14 @@
 
 
    ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
    
 
-
    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly(NameserverTest.java:185)
+
    java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.lookup(RegistryImpl_Stub.java:116)
+	at dslab.naming.NameserverTest.ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly(NameserverTest.java:189)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -169,6 +200,19 @@
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
 	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
 
    
 
 
@@ -185,22 +229,22 @@
 
 
 ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly
-6.038s
+6.016s
 failed
 
 
 ns02_startRootNameserver_registersRemoteObjectCorrectly
-6.005s
+6.006s
 failed
 
 
 ns03_startingZoneNameserver_registersNameserverCorrectly
-12.007s
+12.005s
 failed
 
 
 ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
-12.006s
+12.008s
 failed
 
 
@@ -208,29 +252,33 @@
 
    
 
    Standard error
    
 
-
    Nov 26, 2020 10:41:23 AM dslab.naming.NameserverTest ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly
+
    Dec 23, 2020 11:53:34 AM dslab.naming.NameserverTest ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly
 INFO: Starting ns-root thread
-Nov 26, 2020 10:41:26 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:53:37 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
-Nov 26, 2020 10:41:29 AM dslab.naming.NameserverTest ns02_startRootNameserver_registersRemoteObjectCorrectly
+Dec 23, 2020 11:53:40 AM dslab.naming.NameserverTest ns02_startRootNameserver_registersRemoteObjectCorrectly
 INFO: Starting ns-root thread
-Nov 26, 2020 10:41:32 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:53:43 AM dslab.naming.NameserverTest ns02_startRootNameserver_registersRemoteObjectCorrectly
+INFO: Looking up root-nameserver in registry
+Dec 23, 2020 11:53:43 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
-Nov 26, 2020 10:41:35 AM dslab.naming.NameserverTest ns03_startingZoneNameserver_registersNameserverCorrectly
+Dec 23, 2020 11:53:46 AM dslab.naming.NameserverTest ns03_startingZoneNameserver_registersNameserverCorrectly
 INFO: Starting ns-root thread
-Nov 26, 2020 10:41:38 AM dslab.naming.NameserverTest ns03_startingZoneNameserver_registersNameserverCorrectly
+Dec 23, 2020 11:53:49 AM dslab.naming.NameserverTest ns03_startingZoneNameserver_registersNameserverCorrectly
 INFO: Starting ns-planet thread
-Nov 26, 2020 10:41:41 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:53:52 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
-Nov 26, 2020 10:41:44 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:53:55 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
-Nov 26, 2020 10:41:47 AM dslab.naming.NameserverTest ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
+Dec 23, 2020 11:53:58 AM dslab.naming.NameserverTest ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
 INFO: Starting ns-root thread
-Nov 26, 2020 10:41:50 AM dslab.naming.NameserverTest ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
+Dec 23, 2020 11:54:01 AM dslab.naming.NameserverTest ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
 INFO: Starting ns-planet thread
-Nov 26, 2020 10:41:53 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:54:04 AM dslab.naming.NameserverTest ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
+INFO: Looking up root-nameserver in registry
+Dec 23, 2020 11:54:04 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
-Nov 26, 2020 10:41:56 AM dslab.naming.NameserverTest sendShutdown
+Dec 23, 2020 11:54:07 AM dslab.naming.NameserverTest sendShutdown
 INFO: Sending shutdown to component component
 
    
 
@@ -243,7 +291,7 @@ INFO: Sending shutdown to component component
 
 
 
    Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
 
 
diff --git a/build/reports/tests/test/classes/dslab.transfer.TransferServerProtocolTest.html b/build/reports/tests/test/classes/dslab.transfer.TransferServerProtocolTest.html
index 4067809..5a0dd22 100644
--- a/build/reports/tests/test/classes/dslab.transfer.TransferServerProtocolTest.html
+++ b/build/reports/tests/test/classes/dslab.transfer.TransferServerProtocolTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    2
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    6.005s
    
+
    6.037s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,70 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    defaultDmtpInteractionTest
    
-
-
    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerProtocolTest.setUp(TransferServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
-
    sendWithoutRecipient_returnsErrorOnSend
    
-
-
    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerProtocolTest.setUp(TransferServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -135,17 +78,97 @@
 
-
-
-
+
+
+
-
-
-
+
+
+
    
 
 
 
    defaultDmtpInteractionTest3.004sfaileddefaultDmtpInteractionTest3.015spassed
 
    
 
    sendWithoutRecipient_returnsErrorOnSend3.001sfailedsendWithoutRecipient_returnsErrorOnSend3.022spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:53:28 AM dslab.transfer.TransferServer run
+INFO: Creating serverSocket for dslab.transfer.TransferServer@4f2780a4
+Dec 23, 2020 11:53:28 AM dslab.transfer.TransferServerProtocolTest setUp
+INFO: Waiting for server socket to appear
+Dec 23, 2020 11:53:28 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Queue currently empty. Waiting for messages to appear...
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@230cb815
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection run
+INFO: Setting subject to: hello
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection run
+INFO: Setting data to: hello from junit
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@13137acb
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@230cb815
+Dec 23, 2020 11:53:28 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@13137acb
+Dec 23, 2020 11:53:28 AM dslab.transfer.TransferServer$Producer produce
+INFO: Added message from trillian@earth.planet
+to arthur@earth.planet
+subject hello
+data hello from junit
+ to queue
+Dec 23, 2020 11:53:28 AM dslab.transfer.TransferServer$Consumer run
+INFO: Consumer thread has been interrupted. Exiting...Thread[Thread-12,5,FailOnTimeoutGroup]
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServerProtocolTest setUp
+INFO: Waiting for server socket to appear
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer run
+INFO: Creating serverSocket for dslab.transfer.TransferServer@7f9374ad
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Queue not empty. Processing message...
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Took message from trillian@earth.planet
+to arthur@earth.planet
+subject hello
+data hello from junit
+ from queue
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: msg.getTo() contains: [arthur@earth.planet]
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Trying to send message to arthur@earth.planet
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer domainLookup
+INFO: Performing domain lookup for address arthur@earth.planet
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Domain lookup successful. Port is: 11622
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer replayMessage
+INFO: Replaying message for message: from trillian@earth.planet
+to arthur@earth.planet
+subject hello
+data hello from junit
+ on port 11622
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer sendErrorMail
+INFO: Trying to send error mail to address trillian@earth.planet
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer domainLookup
+INFO: Performing domain lookup for address trillian@earth.planet
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer sendErrorMail
+SEVERE: Sending error mail failed because socket communication failed
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Queue currently empty. Waiting for messages to appear...
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@395b40fd
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection run
+INFO: Setting subject to: hello
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection run
+INFO: Setting data to: hello from junit
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@69536688
+Dec 23, 2020 11:53:31 AM dslab.transfer.TransferServer$Consumer run
+INFO: Consumer thread has been interrupted. Exiting...Thread[Thread-18,5,FailOnTimeoutGroup]
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@395b40fd
+Dec 23, 2020 11:53:31 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@69536688
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/classes/dslab.transfer.TransferServerTest.html b/build/reports/tests/test/classes/dslab.transfer.TransferServerTest.html
index bd2f319..72889fc 100644
--- a/build/reports/tests/test/classes/dslab.transfer.TransferServerTest.html
+++ b/build/reports/tests/test/classes/dslab.transfer.TransferServerTest.html
@@ -29,7 +29,7 @@
 
 
 
    
-
    1
    
+
    0
    
 
    failures
    
 
    
 
@@ -41,7 +41,7 @@
 
 
 
    
-
    0s
    
+
    3.046s
    
 
    duration
    
 
    
 
@@ -50,8 +50,8 @@
 
 
 
-
    
-
    0%
    
+
    
+
    100%
    
 
    successful
    
 
    
 
@@ -61,43 +61,13 @@
 
    
 
 
    
-
    Failed tests
    
-
    
-
-
    runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
    
-
-
    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerTest.runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly(TransferServerTest.java:30)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
    
-    
-
    
-
    
-
    
 
    Tests
    
 
@@ -108,12 +78,36 @@
 
-
-
-
+
+
+
    
 
 
 
    runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly0sfailedrunAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly3.046spassed
 
    
 
    
 
    
+
    
+
    Standard error
    
+
+
    Dec 23, 2020 11:53:25 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Starting thread with component dslab.transfer.TransferServer@986eb44
+Dec 23, 2020 11:53:25 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Waiting for socket to open on port 11620
+Dec 23, 2020 11:53:25 AM dslab.transfer.TransferServer run
+INFO: Creating serverSocket for dslab.transfer.TransferServer@986eb44
+Dec 23, 2020 11:53:25 AM dslab.transfer.TransferServer$Consumer consume
+INFO: Queue currently empty. Waiting for messages to appear...
+Dec 23, 2020 11:53:25 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Shutting down component dslab.transfer.TransferServer@986eb44
+Dec 23, 2020 11:53:25 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@47f8f420
+Dec 23, 2020 11:53:25 AM dslab.transfer.TransferServer$Consumer run
+INFO: Consumer thread has been interrupted. Exiting...Thread[Thread-9,5,FailOnTimeoutGroup]
+Dec 23, 2020 11:53:25 AM dslab.transfer.ClientConnection shutdown
+INFO: Shutting down client connection dslab.transfer.ClientConnection@47f8f420
+Dec 23, 2020 11:53:28 AM dslab.monitoring.MonitoringServerTest runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
+INFO: Waiting for thread to stop for component dslab.transfer.TransferServer@986eb44
+
    
+    
+
    
 
    
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
    
 
 
diff --git a/build/reports/tests/test/index.html b/build/reports/tests/test/index.html
index 997a5ff..4259acb 100644
--- a/build/reports/tests/test/index.html
+++ b/build/reports/tests/test/index.html
@@ -26,7 +26,7 @@
 
 
 
    
-
    19
    
+
    8
    
 
    failures
    
 
    
 
@@ -38,7 +38,7 @@
 
 
 
    
-
    1m3.12s
    
+
    2m54.33s
    
 
    duration
    
 
    
 
@@ -48,7 +48,7 @@
 
 
 
    
-
    0%
    
+
    57%
    
 
    successful
    
 
    
 
@@ -83,42 +83,10 @@
 startClient_shouldConnectToMailboxServerAndSendStartsecure
 
 
  • 
-MailboxServerProtocolTest.
-acceptDmtpMessage_listDmapMessage
-
    • 
-
  • 
-MailboxServerProtocolTest.
-dmtpMessage_withUnknownRecipient_returnsError
-
    • 
-
  • 
-MailboxServerProtocolTest.
-loginAndLogout_withValidLogin
-
    • 
-
  • 
-MailboxServerProtocolTest.
-login_withInvalidLogin_returnsError
-
    • 
-
  • 
-MailboxServerTest.
-runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
-
    • 
-
  • 
 MailboxStartsecureTest.
 sendStartsecure
 
    • 
 
  • 
-MonitoringServerProtocolTest.
-addresses_returnsCorrectStatistics
-
    • 
-
  • 
-MonitoringServerProtocolTest.
-servers_returnsCorrectStatistics
-
    • 
-
  • 
-MonitoringServerTest.
-runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly
-
    • 
-
  • 
 NameserverTest.
 ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly
 
    • 
@@ -134,18 +102,6 @@
 NameserverTest.
 ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly
 
-
  • 
-TransferServerProtocolTest.
-defaultDmtpInteractionTest
-
    • 
-
  • 
-TransferServerProtocolTest.
-sendWithoutRecipient_returnsErrorOnSend
-
    • 
-
  • 
-TransferServerTest.
-runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
-
    • 
 
 
 
    
@@ -169,7 +125,7 @@
 3
 3
 0
-0.011s
+1m21.03s
 0%
 
 
@@ -177,20 +133,20 @@
 dslab.mailbox
 
 6
-6
+1
 0
-15.023s
-0%
+20.124s
+83%
 
 
-
+
 dslab.monitoring
 
 3
-3
 0
-6.022s
-0%
+0
+28.061s
+100%
 
 
 
@@ -199,18 +155,18 @@
 4
 4
 0
-36.056s
+36.035s
 0%
 
 
-
+
 dslab.transfer
 
 3
-3
 0
-6.005s
-0%
+0
+9.083s
+100%
 
 
 
@@ -236,7 +192,7 @@
 2
 2
 0
-0.008s
+1m6.01s
 0%
 
 
@@ -246,28 +202,28 @@
 1
 1
 0
-0.003s
+15.017s
 0%
 
 
-
+
 dslab.mailbox.MailboxServerProtocolTest
 
 4
-4
 0
-12.017s
-0%
+0
+13.092s
+100%
 
 
-
+
 dslab.mailbox.MailboxServerTest
 
 1
-1
 0
-0.003s
-0%
+0
+3.007s
+100%
 
 
 
@@ -276,28 +232,28 @@
 1
 1
 0
-3.003s
+4.025s
 0%
 
 
-
+
 dslab.monitoring.MonitoringServerProtocolTest
 
 2
-2
 0
-6.020s
-0%
+0
+22.044s
+100%
 
 
-
+
 dslab.monitoring.MonitoringServerTest
 
 1
-1
 0
-0.002s
-0%
+0
+6.017s
+100%
 
 
 
@@ -306,28 +262,28 @@
 4
 4
 0
-36.056s
+36.035s
 0%
 
 
-
+
 dslab.transfer.TransferServerProtocolTest
 
 2
-2
 0
-6.005s
-0%
+0
+6.037s
+100%
 
 
-
+
 dslab.transfer.TransferServerTest
 
 1
-1
 0
-0s
-0%
+0
+3.046s
+100%
 
 
 
@@ -340,7 +296,7 @@
 
 
 
    Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
 
 
diff --git a/build/reports/tests/test/packages/dslab.client.html b/build/reports/tests/test/packages/dslab.client.html
index b870fb7..1cb83bc 100644
--- a/build/reports/tests/test/packages/dslab.client.html
+++ b/build/reports/tests/test/packages/dslab.client.html
@@ -40,7 +40,7 @@
 
 
 
    
-
    0.011s
    
+
    1m21.03s
    
 
    duration
    
 
    
 
@@ -103,7 +103,7 @@
 2
 2
 0
-0.008s
+1m6.01s
 0%
 
 
@@ -113,7 +113,7 @@
 1
 1
 0
-0.003s
+15.017s
 0%
 
 
@@ -126,7 +126,7 @@
 
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
    
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
    
 
 
 
diff --git a/build/reports/tests/test/packages/dslab.mailbox.html b/build/reports/tests/test/packages/dslab.mailbox.html
index f057b0f..5410671 100644
--- a/build/reports/tests/test/packages/dslab.mailbox.html
+++ b/build/reports/tests/test/packages/dslab.mailbox.html
@@ -28,7 +28,7 @@
 
 
 
    
-
    6
    
+
    1
    
 
    failures
    
 
    
 
@@ -40,7 +40,7 @@
 
 
 
    
-
    15.023s
    
+
    20.124s
    
 
    duration
    
 
    
 
@@ -50,7 +50,7 @@
 
 
 
    
-
    0%
    
+
    83%
    
 
    successful
    
 
    
 
@@ -70,26 +70,6 @@
 
    Failed tests
    
 
      
 
    • 
-MailboxServerProtocolTest.
-acceptDmtpMessage_listDmapMessage
-
      • 
-
    • 
-MailboxServerProtocolTest.
-dmtpMessage_withUnknownRecipient_returnsError
-
      • 
-
    • 
-MailboxServerProtocolTest.
-loginAndLogout_withValidLogin
-
      • 
-
    • 
-MailboxServerProtocolTest.
-login_withInvalidLogin_returnsError
-
      • 
-
    • 
-MailboxServerTest.
-runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly
-
      • 
-
    • 
 MailboxStartsecureTest.
 sendStartsecure
 
      • 
@@ -109,24 +89,24 @@
 
 
 
-
+
 MailboxServerProtocolTest
 
 4
-4
 0
-12.017s
-0%
+0
+13.092s
+100%
 
 
-
+
 MailboxServerTest
 
 1
-1
 0
-0.003s
-0%
+0
+3.007s
+100%
 
 
 
@@ -135,7 +115,7 @@
 1
 1
 0
-3.003s
+4.025s
 0%
 
 
@@ -148,7 +128,7 @@
 
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
      
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
      
 
 
 
diff --git a/build/reports/tests/test/packages/dslab.monitoring.html b/build/reports/tests/test/packages/dslab.monitoring.html
index cc47d67..1375432 100644
--- a/build/reports/tests/test/packages/dslab.monitoring.html
+++ b/build/reports/tests/test/packages/dslab.monitoring.html
@@ -28,7 +28,7 @@
 
 
 
      
-
      3
      
+
      0
      
 
      failures
      
 
      
 
@@ -40,7 +40,7 @@
 
 
 
      
-
      6.022s
      
+
      28.061s
      
 
      duration
      
 
      
 
@@ -49,8 +49,8 @@
 
 
 
-
      
-
      0%
      
+
      
+
      100%
      
 
      successful
      
 
      
 
@@ -60,30 +60,10 @@
 
      
 
 
-
      
 
      Classes
      
 
@@ -97,24 +77,24 @@
 
 
-
-
-
-
+
+
+
-
-
-
-
+
+
+
      
 
 
      
+
 MonitoringServerProtocolTest
 
 22
 06.020s0%022.044s100%
 
      
 
      
+
 MonitoringServerTest
 
 11
 00.002s0%06.017s100%
 
      
 
      
 
      
@@ -126,7 +106,7 @@
 
 
 
      Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
      
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
      
 
      
 
 
diff --git a/build/reports/tests/test/packages/dslab.naming.html b/build/reports/tests/test/packages/dslab.naming.html
index 0716044..89ef970 100644
--- a/build/reports/tests/test/packages/dslab.naming.html
+++ b/build/reports/tests/test/packages/dslab.naming.html
@@ -40,7 +40,7 @@
 
 
 
      
-
      36.056s
      
+
      36.035s
      
 
      duration
      
 
      
 
@@ -107,7 +107,7 @@
 4
 4
 0
-36.056s
+36.035s
 0%
 
 
@@ -120,7 +120,7 @@
 
 
 Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
      
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
      
 
 
 
diff --git a/build/reports/tests/test/packages/dslab.transfer.html b/build/reports/tests/test/packages/dslab.transfer.html
index b2c61c4..12a3a31 100644
--- a/build/reports/tests/test/packages/dslab.transfer.html
+++ b/build/reports/tests/test/packages/dslab.transfer.html
@@ -28,7 +28,7 @@
 
 
 
      
-
      3
      
+
      0
      
 
      failures
      
 
      
 
@@ -40,7 +40,7 @@
 
 
 
      
-
      6.005s
      
+
      9.083s
      
 
      duration
      
 
      
 
@@ -49,8 +49,8 @@
 
 
 
-
      
-
      0%
      
+
      
+
      100%
      
 
      successful
      
 
      
 
@@ -60,30 +60,10 @@
 
      
 
 
-
      
 
      Classes
      
 
@@ -97,24 +77,24 @@
 
 
-
-
-
-
+
+
+
-
-
-
-
+
+
+
      
 
 
      
+
 TransferServerProtocolTest
 
 22
 06.005s0%06.037s100%
 
      
 
      
+
 TransferServerTest
 
 11
 00s0%03.046s100%
 
      
 
      
 
      
@@ -126,7 +106,7 @@
 
 
 
      Generated by 
-Gradle 6.6.1 at Nov 26, 2020, 10:42:20 AM
      
+Gradle 6.6.1 at Dec 23, 2020, 11:55:51 AM
      
 
      
 
 
diff --git a/build/test-results/test/TEST-dslab.client.MessageClientMailboxTest.xml b/build/test-results/test/TEST-dslab.client.MessageClientMailboxTest.xml
index ca85dac..3fa324b 100644
--- a/build/test-results/test/TEST-dslab.client.MessageClientMailboxTest.xml
+++ b/build/test-results/test/TEST-dslab.client.MessageClientMailboxTest.xml
@@ -1,236 +1,102 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientMailboxTest.setUp(MessageClientMailboxTest.java:59)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-    java.lang.NullPointerException
-	at dslab.client.MessageClientMailboxTest.tearDown(MessageClientMailboxTest.java:74)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+  
+    org.junit.runners.model.TestTimedOutException: test timed out after 40000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(AbstractQueuedSynchronizer.java:2123)
+	at java.base@11.0.8/java.util.concurrent.LinkedBlockingQueue.poll(LinkedBlockingQueue.java:458)
+	at app//dslab.StreamListener.poll(StreamListener.java:34)
+	at app//dslab.JunitSocketClient.read(JunitSocketClient.java:82)
+	at app//dslab.JunitSocketClient.sendAndRead(JunitSocketClient.java:108)
+	at app//dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at app//dslab.client.MessageClientMailboxTest.inbox_mulipleMails_showsAllInboxDataCorrectly(MessageClientMailboxTest.java:121)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientMailboxTest.setUp(MessageClientMailboxTest.java:59)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-    java.lang.NullPointerException
-	at dslab.client.MessageClientMailboxTest.tearDown(MessageClientMailboxTest.java:74)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+  
+    org.junit.runners.model.TestTimedOutException: test timed out after 20000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.parkNanos(LockSupport.java:234)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer$ConditionObject.awaitNanos(AbstractQueuedSynchronizer.java:2123)
+	at java.base@11.0.8/java.util.concurrent.LinkedBlockingQueue.poll(LinkedBlockingQueue.java:458)
+	at app//dslab.StreamListener.poll(StreamListener.java:34)
+	at app//dslab.JunitSocketClient.read(JunitSocketClient.java:82)
+	at app//dslab.JunitSocketClient.sendAndRead(JunitSocketClient.java:108)
+	at app//dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at app//dslab.client.MessageClientMailboxTest.inbox_singleMail_showsAllInboxDataCorrectly(MessageClientMailboxTest.java:92)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 
   
   
-  
 
diff --git a/build/test-results/test/TEST-dslab.client.MessageClientStartupTest.xml b/build/test-results/test/TEST-dslab.client.MessageClientStartupTest.xml
index 4efd15f..7c4c29a 100644
--- a/build/test-results/test/TEST-dslab.client.MessageClientStartupTest.xml
+++ b/build/test-results/test/TEST-dslab.client.MessageClientStartupTest.xml
@@ -1,117 +1,41 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.client.MessageClientStartupTest.setUp(MessageClientStartupTest.java:37)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-    java.lang.NullPointerException
-	at dslab.client.MessageClientStartupTest.tearDown(MessageClientStartupTest.java:48)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.rules.RunRules.evaluate(RunRules.java:20)
-	at org.junit.runners.ParentRunner.runLeaf(ParentRunner.java:325)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:78)
-	at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:57)
-	at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290)
-	at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71)
-	at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288)
-	at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58)
-	at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268)
-	at org.junit.runners.ParentRunner.run(ParentRunner.java:363)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.runTestClass(JUnitTestClassExecutor.java:110)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:58)
-	at org.gradle.api.internal.tasks.testing.junit.JUnitTestClassExecutor.execute(JUnitTestClassExecutor.java:38)
-	at org.gradle.api.internal.tasks.testing.junit.AbstractJUnitTestClassProcessor.processTestClass(AbstractJUnitTestClassProcessor.java:62)
-	at org.gradle.api.internal.tasks.testing.SuiteTestClassProcessor.processTestClass(SuiteTestClassProcessor.java:51)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.dispatch.ContextClassLoaderDispatch.dispatch(ContextClassLoaderDispatch.java:33)
-	at org.gradle.internal.dispatch.ProxyDispatchAdapter$DispatchingInvocationHandler.invoke(ProxyDispatchAdapter.java:94)
-	at com.sun.proxy.$Proxy2.processTestClass(Unknown Source)
-	at org.gradle.api.internal.tasks.testing.worker.TestWorker.processTestClass(TestWorker.java:119)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:36)
-	at org.gradle.internal.dispatch.ReflectionDispatch.dispatch(ReflectionDispatch.java:24)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:182)
-	at org.gradle.internal.remote.internal.hub.MessageHubBackedObjectConnection$DispatchWrapper.dispatch(MessageHubBackedObjectConnection.java:164)
-	at org.gradle.internal.remote.internal.hub.MessageHub$Handler.run(MessageHub.java:414)
-	at org.gradle.internal.concurrent.ExecutorPolicy$CatchAndRecordFailures.onExecute(ExecutorPolicy.java:64)
-	at org.gradle.internal.concurrent.ManagedExecutorImpl$1.run(ManagedExecutorImpl.java:48)
-	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
-	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
-	at org.gradle.internal.concurrent.ThreadFactoryImpl$ManagedThreadRunnable.run(ThreadFactoryImpl.java:56)
-	at java.base/java.lang.Thread.run(Thread.java:834)
+  
+    org.junit.runners.model.TestTimedOutException: test timed out after 15000 milliseconds
+	at java.base@11.0.8/jdk.internal.misc.Unsafe.park(Native Method)
+	at java.base@11.0.8/java.util.concurrent.locks.LockSupport.park(LockSupport.java:194)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.parkAndCheckInterrupt(AbstractQueuedSynchronizer.java:885)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.doAcquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1039)
+	at java.base@11.0.8/java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireSharedInterruptibly(AbstractQueuedSynchronizer.java:1345)
+	at java.base@11.0.8/java.util.concurrent.CountDownLatch.await(CountDownLatch.java:232)
+	at app//dslab.client.MessageClientStartupTest.startClient_shouldConnectToMailboxServerAndSendStartsecure(MessageClientStartupTest.java:78)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base@11.0.8/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base@11.0.8/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base@11.0.8/java.lang.reflect.Method.invoke(Method.java:566)
+	at app//org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at app//org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at app//org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at app//org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at app//org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base@11.0.8/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base@11.0.8/java.lang.Thread.run(Thread.java:834)
 
   
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.mailbox.MailboxServerProtocolTest.xml b/build/test-results/test/TEST-dslab.mailbox.MailboxServerProtocolTest.xml
index ccb00cb..644f8a1 100644
--- a/build/test-results/test/TEST-dslab.mailbox.MailboxServerProtocolTest.xml
+++ b/build/test-results/test/TEST-dslab.mailbox.MailboxServerProtocolTest.xml
@@ -1,98 +1,98 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerProtocolTest.setUp(MailboxServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
+  
+  
+  
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.mailbox.MailboxServerTest.xml b/build/test-results/test/TEST-dslab.mailbox.MailboxServerTest.xml
index 47993fd..f70286a 100644
--- a/build/test-results/test/TEST-dslab.mailbox.MailboxServerTest.xml
+++ b/build/test-results/test/TEST-dslab.mailbox.MailboxServerTest.xml
@@ -1,29 +1,25 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+2"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxServerTest.runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly(MailboxServerTest.java:33)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.mailbox.MailboxStartsecureTest.xml b/build/test-results/test/TEST-dslab.mailbox.MailboxStartsecureTest.xml
index 88afd87..c390d81 100644
--- a/build/test-results/test/TEST-dslab.mailbox.MailboxStartsecureTest.xml
+++ b/build/test-results/test/TEST-dslab.mailbox.MailboxStartsecureTest.xml
@@ -1,13 +1,19 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+3"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.mailbox.MailboxStartsecureTest.setUp(MailboxStartsecureTest.java:31)
+  
+    java.lang.AssertionError: 
+Expected: a string containing "ok DMAP2.0"
+     but: was "ok DMAP"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:54)
+	at dslab.JunitSocketClient.assertThat(JunitSocketClient.java:120)
+	at dslab.JunitSocketClient.verify(JunitSocketClient.java:92)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:58)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -15,9 +21,54 @@
 	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
 	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
 	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base/java.lang.Thread.run(Thread.java:834)
+
+    java.lang.AssertionError: 
+Expected: a string containing "ok mailbox-earth-planet"
+     but: was "error not logged in"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:54)
+	at dslab.JunitSocketClient.assertThat(JunitSocketClient.java:120)
+	at dslab.JunitSocketClient.sendAndVerify(JunitSocketClient.java:103)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:61)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base/java.lang.Thread.run(Thread.java:834)
+
+    java.lang.AssertionError: Expected server response to be Base64 encoded
+Expected: a string matching "^(?:[a-zA-Z0-9+/]{4})*(?:[a-zA-Z0-9+/]{2}==|[a-zA-Z0-9+/]{3}=)?$"
+     but: was "error not logged in"
+	at org.hamcrest.MatcherAssert.assertThat(MatcherAssert.java:20)
+	at org.junit.Assert.assertThat(Assert.java:956)
+	at org.junit.rules.ErrorCollector$1.call(ErrorCollector.java:65)
+	at org.junit.rules.ErrorCollector.checkSucceeds(ErrorCollector.java:78)
+	at org.junit.rules.ErrorCollector.checkThat(ErrorCollector.java:63)
+	at dslab.mailbox.MailboxStartsecureTest.sendStartsecure(MailboxStartsecureTest.java:68)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
@@ -25,5 +76,17 @@
 
   
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.monitoring.MonitoringServerProtocolTest.xml b/build/test-results/test/TEST-dslab.monitoring.MonitoringServerProtocolTest.xml
index 9880941..a4007a8 100644
--- a/build/test-results/test/TEST-dslab.monitoring.MonitoringServerProtocolTest.xml
+++ b/build/test-results/test/TEST-dslab.monitoring.MonitoringServerProtocolTest.xml
@@ -1,52 +1,40 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerProtocolTest.setUp(MonitoringServerProtocolTest.java:36)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerProtocolTest.setUp(MonitoringServerProtocolTest.java:36)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
+  
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.monitoring.MonitoringServerTest.xml b/build/test-results/test/TEST-dslab.monitoring.MonitoringServerTest.xml
index abf1198..cf727bb 100644
--- a/build/test-results/test/TEST-dslab.monitoring.MonitoringServerTest.xml
+++ b/build/test-results/test/TEST-dslab.monitoring.MonitoringServerTest.xml
@@ -1,29 +1,17 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+8"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.monitoring.MonitoringServerTest.runAndShutdownMonitoringServer_createsAndStopsUdpSocketCorrectly(MonitoringServerTest.java:27)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.naming.NameserverTest.xml b/build/test-results/test/TEST-dslab.naming.NameserverTest.xml
index be4f811..282122b 100644
--- a/build/test-results/test/TEST-dslab.naming.NameserverTest.xml
+++ b/build/test-results/test/TEST-dslab.naming.NameserverTest.xml
@@ -1,13 +1,48 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:78)
+  
+    java.lang.AssertionError: Expected root nameserver to start a registry, but it couldn't be located or registry.list() failed
+	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:81)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
+	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
+	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
+	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
+	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
+	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
+	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
+	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
+	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
+	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
+	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.list(RegistryImpl_Stub.java:90)
+	at dslab.naming.NameserverTest.ns01_startAndShutdownRootNameserver_createsAndUnexportsRegistryCorrectly(NameserverTest.java:79)
+	... 12 more
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
+
+  
+  
+    java.lang.AssertionError: Error while looking up remote object 
+	at dslab.naming.NameserverTest.ns02_startRootNameserver_registersRemoteObjectCorrectly(NameserverTest.java:118)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -22,13 +57,15 @@
 	at java.base/java.lang.Thread.run(Thread.java:834)
 
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns02_startRootNameserver_registersRemoteObjectCorrectly(NameserverTest.java:109)
+  
+    java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.list(RegistryImpl_Stub.java:90)
+	at dslab.naming.NameserverTest.ns03_startingZoneNameserver_registersNameserverCorrectly(NameserverTest.java:143)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -41,36 +78,30 @@
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
 	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
 
   
-  
-    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns03_startingZoneNameserver_registersNameserverCorrectly(NameserverTest.java:141)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range+9"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.naming.NameserverTest.ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly(NameserverTest.java:185)
+  
+    java.rmi.ConnectException: Connection refused to host: localhost; nested exception is: 
+	java.net.ConnectException: Connection refused (Connection refused)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:623)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.createConnection(TCPChannel.java:209)
+	at java.rmi/sun.rmi.transport.tcp.TCPChannel.newConnection(TCPChannel.java:196)
+	at java.rmi/sun.rmi.server.UnicastRef.newCall(UnicastRef.java:343)
+	at java.rmi/sun.rmi.registry.RegistryImpl_Stub.lookup(RegistryImpl_Stub.java:116)
+	at dslab.naming.NameserverTest.ns04_registerAndLookupMailboxServer_registersAndReturnsAddressCorrectly(NameserverTest.java:189)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -83,32 +114,49 @@
 	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
 	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
 	at java.base/java.lang.Thread.run(Thread.java:834)
+Caused by: java.net.ConnectException: Connection refused (Connection refused)
+	at java.base/java.net.PlainSocketImpl.socketConnect(Native Method)
+	at java.base/java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:399)
+	at java.base/java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:242)
+	at java.base/java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:224)
+	at java.base/java.net.SocksSocketImpl.connect(SocksSocketImpl.java:403)
+	at java.base/java.net.Socket.connect(Socket.java:609)
+	at java.base/java.net.Socket.connect(Socket.java:558)
+	at java.base/java.net.Socket.<init>(Socket.java:454)
+	at java.base/java.net.Socket.<init>(Socket.java:231)
+	at java.rmi/sun.rmi.transport.tcp.TCPDirectSocketFactory.createSocket(TCPDirectSocketFactory.java:40)
+	at java.rmi/sun.rmi.transport.tcp.TCPEndpoint.newSocket(TCPEndpoint.java:617)
+	... 17 more
 
   
   
-  
 
diff --git a/build/test-results/test/TEST-dslab.transfer.TransferServerProtocolTest.xml b/build/test-results/test/TEST-dslab.transfer.TransferServerProtocolTest.xml
index 317aee5..7b47e51 100644
--- a/build/test-results/test/TEST-dslab.transfer.TransferServerProtocolTest.xml
+++ b/build/test-results/test/TEST-dslab.transfer.TransferServerProtocolTest.xml
@@ -1,52 +1,82 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerProtocolTest.setUp(TransferServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
-  
-    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerProtocolTest.setUp(TransferServerProtocolTest.java:31)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24)
-	at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
+  
   
-  
+  
 
diff --git a/build/test-results/test/TEST-dslab.transfer.TransferServerTest.xml b/build/test-results/test/TEST-dslab.transfer.TransferServerTest.xml
index 89b3e5f..5e1ab30 100644
--- a/build/test-results/test/TEST-dslab.transfer.TransferServerTest.xml
+++ b/build/test-results/test/TEST-dslab.transfer.TransferServerTest.xml
@@ -1,29 +1,25 @@
 
-
+
   
-  
-    java.lang.NumberFormatException: For input string: "port_range"
-	at java.base/java.lang.NumberFormatException.forInputString(NumberFormatException.java:65)
-	at java.base/java.lang.Integer.parseInt(Integer.java:652)
-	at java.base/java.lang.Integer.parseInt(Integer.java:770)
-	at dslab.util.Config.getInt(Config.java:52)
-	at dslab.transfer.TransferServerTest.runAndShutdownTransferServer_createsAndStopsTcpSocketCorrectly(TransferServerTest.java:30)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
-	at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
-	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
-	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
-	at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50)
-	at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
-	at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47)
-	at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:17)
-	at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:26)
-	at org.junit.rules.Verifier$1.evaluate(Verifier.java:35)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:298)
-	at org.junit.internal.runners.statements.FailOnTimeout$CallableStatement.call(FailOnTimeout.java:292)
-	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
-	at java.base/java.lang.Thread.run(Thread.java:834)
-
-  
+  
   
-  
+  
 
diff --git a/build/test-results/test/binary/output.bin b/build/test-results/test/binary/output.bin
index 27ec9b4f61ce0797afe5ffec234c751627f7c95d..637fb925bef3192cb818bbb5d2b97efeef992f68 100644
GIT binary patch
literal 23648
zcmeHP>2urG5trk{mJpw!4m*}Q_>j&djm_XBNVb_!kz~iyD0VG5or#;tfWV`~galXs
zZ0ry1^iS`;1LOm_FhLTsnVF71SO@iX-yXj`fwd2=e0@Yb)i58bhGuB0t~YI?X*=q{
ziR#Baw_WXrK{pAbZg5^b8GU(5qJNP{jfR1;_Q92BPrrZstf?MG#7*FH>dT|&YRo=y
z8hXEyMD2vp?9*CCr)IRxj!loenBvN8YFZ(#o=0I4dSUO3#ED=d{y8GaFbd+sFp7wm
zoF>3%oOHdI()tT$|C9ti0qJUKk{9H;BbWnyPL%RSo{>P0J{aczp(O*Y_h5$4yXV*dnjp{-8&yz-Va<
zEO2|XG~&O<+rJ0hx7}z$_gAN}1H80e$V&xwTrCMZbYe7Wj!VUI^%uk+b-fT*8SD^N
zPu_|iSC>SOs~CFBDLD`ziGJ=)?bB!5pi68zJOlBuPdo&**G5tsq4&s;ofTtrO3Fy61);{|1xd{G=8?oGl
zMt|2=f9oa}5PbWCFd#uvAbD}xuIn|t8a)$(MZMU)I4pkjVM(wkbA^iAFy5`WA98V@
zMQ>QD6{=iGD$l0WFi;0!lt3Cb4jqG=;h9CKj{_b|!
zg=l^*3?Gu*7`%n0?2Fm|^=tn@{MuOfhG&r*#2pgxnq$(d&%9}`zJBemb9i+k&aY+(
zwHoyrXTAx`--cvJRBs5?T#)qMsH8tg-c(iDp8HU+xaWkGZSG(|
z+^AZuu7)y?gmu0ZPYMY3o1%g}>~%p-AkP4b-!6b`EMg{=hX^$^j7sRn{(?$A{S)2|
z7;!auWXp0o^^RpQ(>p54*jdK6#~Npih3nV;A#5-;1c6Z(ZmhNm*nBrgNE8hR3Gu7y
z@oNTVpye|b!(Z|L9yK1?4Fqp&1hE$0XhOB?G?gh`~mra58B>KIO4a{<*i)}LZlI-8SB
zjTn>U<$xacr)ha{*3#4laGJvq{WJ=Rvq_H~WCV#D>q|r8#yaW;7(0_*F9FHMdPzWH
zn3~tF>(B<=SpTZ1il!K22(q!Razs-zUB*QWtJH
zN!0E2x^B>d3?{j#4tj1tm?iB}M1da-p)EJ@t6Qm^k8FI0872F6!XOpe*ZwEXrzjt2
z#
z5#uuDAs%|v&^yCkReesIP+b^!(MA+>OE;A7mla7w0J`6t@T!!a*y85#g8f`_FD4A(
zYA|u5*+X6oD9a0OXSxUF+?Sf#aTJBo3DjQnz6Zj`N3B0*j8MNp^9ih_N8?ax1GyJ2
z-7*DNg)B3dtEG)&N?4CikAFCRaoki-#Z+37QwM|vSwfq5?l2~4eF4q7J|vkQOtzuG
z=bxcsFEd6gUuq~=HitsXR7OAUS!^gJl^SNlZd+Q1#Zs))D8?91d6WXBhO#t~IZBPy
z5_PR%o3&aUn)(|GmSm!$etVLsl#^uE^OMY#HP)44Y^>TFA7hOx(;5#q0+&Yr>h~@L
zIJP0g+EqcU=|9JG1Sie&UW8#X{+!gcdKr+{bV?MzAm^|}6TOiJdN)4)0}nH>;=>1e
zLHsC!lf-;OS-bHuDm-c93FnbQbUJFJr-+m_#pe{AXcQaIO-5hAU)<~?DTF2MG~skX
zHU^i?gg_#8dlG>d`e8zzvCf7pikmY5P}ia?i7JC;hBW0F4pgd~M{spv575(9
z`OPAj&)&F+Da)G4;e@ho&aJFl0j8{40m+zLS#Y}_VRkGT@JL_dpUK*~HB(zSPtsgD
z*MJu0DUE58Gw}w**qv@+8nUIaGS1b6hHlNTA(XB(WxOQ1xBrb;hAp*7aJt~e7HlC>
zz#Uyx_hE)Trn$CkG~#
z&Afq0W%Ejj_ZV{d%h&tt^QP)u5RX-d-42zZs$nAmKE7Ao9$nXk1u&)s7S7=TpYDL}
zJLO+^Mc~9Sy@s!uIu&WFuxZFK1ZEfKY|a8x7Jzat&zICJ$I}d0kAqL0L&vxqyv3S>MU$wXB9+Gh8N;;#!hVko{^=Ey?G#td3W+9EQh%#$?w7A<|j;dH?I4o4$VLU9)g4k_KYdefc!P0I?
zSqKMyHjG%6MoT4l7=)I%NF@nBgXcu(&YRfJ;+37?euXTw*0$?yQipxrm2{foek_L*
zITmb}0ldEFfRt8ANRr-m&{%-{a;G(UK%l<$@U{!HQjfNjt>v`
ztf1oV?N0BDjkq~h6LD@PA0$y!*n
z@_8-0qiLpT!XW&2qis`OT^PN}?6Pq7l%t#M^aUQEO`}>4;(l`9MCJtY#ZJ5Q5Oa
z!XgT$h1_7h_n?emZ8SVWhz4V}y$4t$%tCwrau+zYj0Kk~mL*%pa>cSdl($^5EGO@H
zxgy7mXWPtpTvL)6J6c1tEg0(WtxbED-84{^x*xN78
zQpU3+DeW)Fl6+oEa`ye{fRmL{(SWl*GvKVu?Z-Bk1hu!nXbfDEY$-8tNghg!
aflG4ou45o-#szGqY;=bqs_lEkQvL^j$lx#l

literal 2107
zcmchYPfx-?5XCtm^egx$do@u~N2xnly2!@K*c5<>^!6YSL&O!_O<#~f9!1TFqNYR9a!i&AC~Boq)R_iFt8LOn6s-&e
z5`RL%xp=H;Y@X#=)Qv3kp3ZmaiTsXg98w0ku-0`Qa+@Ysg$~urcSx)2?p)XU)Fi__
zGwEV7+{sS_a75g4{8jzT3YvD|LRw6oGxyl_2Tiu00(kofbFI;=%?RS`AAog1oaSG
zm4p3N|NF_hNd|kAg@|P9Dmk$=spIVb|44&W>6wdy8j;+41tn4Sa9gT}#tUvw>hBl)
E27{8b{r~^~

diff --git a/build/test-results/test/binary/output.bin.idx b/build/test-results/test/binary/output.bin.idx
index 76f18bbe0ecfea653ca6cd397777351b6b80d844..d27a5f39b25cfe6d81317fbd3bd2278fd734e436 100644
GIT binary patch
literal 681
zcmd;LVq*M{1{hEP3j;Hn{C|i%iw%V4uw!Lp!LEd(3ZjJjD?1|_b|pN)5G6w5oJ<_p
zl?W9;lt_eeVOJor9il+_HxCOpb|or)5GAS>yx0|}W|o$KwTW7K;u6@b_JS-
z5Cz&V1sMgfE76gLDA6|)W)Z@!M86H9#A3P#b_EvCAqs3oMX@WeO@SzIRuIFkz!@5z
z?s5{0;@FkA=RwTyjgVrL#ID45Jw%EBM;T^m>`DRzAxc7d7_ch{je#ndFN;ILdx(M<
F0RT)qShxTH

literal 203
zcmZQ#XJPw~1{hGmD-JaI{}6db87Tdg6T1Q?b%+8MelF|^SR5e=*xY59q_HbutAr?F
P*OkStfISMLfP)VJH?(9L

diff --git a/build/test-results/test/binary/results.bin b/build/test-results/test/binary/results.bin
index a918611c89d6226940b4b5835c4a02f9b7f4691d..98f8643e990b119fdf764a628da42206bf25eac5 100644
GIT binary patch
literal 24884
zcmeHPON<;x8Sb_nz{@*4k`N*{mLSy0A>sfhOZ@fdo_#`s@4deGVB0Zqua}ZJ)-3piR7HTLgZi;CJs9%Jl<+;3MBqKKgyz-L#wq$6R(d
zU7xP)ShRTo*%te4Ir(pu-`yt&J^lsdW7o_GPmIcWXUlPSoE2=mQPqXZkihuLx!Y9u6b
z;2!lu-y+yC8yynK-|EY99rR!A{q`lajdUA1oB9GF*rS%~a6$c5?e=C~8#{5ijSY&;
zc@1fVdX}@P8LmT-<*+{wx?9@P>4kGOee&R##{RAQbY9y*Bz$%7`hz!>{Mdd(HP_qJ
zo2X@YAVSy+)M#Q)Oj1XDuB%N%EAbbMtNGgG;gG;3-?6BaO|+XN#M{qJ&m=o|zKw~_
zCAsL@Hb~3$4pnsn*>)xVROcjSri)O}VG71p!-u_yO_E9I$ZT;!eEyl-OpSoZbX^b;
zU-;upjt$q?!gSGQ+cGN5^h++3YOoO9NPt?iHg+pry3f_33?!9eXMeCQrYH6cd=^}X
zMz#@e#`&6-GG;&Ybwu#QC38!+9Ev>$*}8`}*n;b45Vf}PX-u20xd2N>i0hqdwQXp*
z?QY@8ifEvT7J}E|NJ@$sLvp@nq(FKMvV?8C3A{U-8H5DymE1Obu)6$)B7=phCXkSz
zFXd5@zj*KInT##vIM^e4%QdmBpY%`*@3`KU=mmSr^Filx$%E7v*+xsW5j$-n;8jGn_(Dd0a+%a-q{3pq9j8!9!{I0k2+Io<{%jcLlDV&>Ioj!QLgPd2fsS)lrzr()#M9^)0P$V8e-i$64R&
zd$}Rch;8S!Ab`~%ArLe)nm#oFosSb+1B@2H1i~6nw@p@!wuA~@2;B{8?+)2r`Mbc}k6w9R`Q%T;
z#0&vL%5;VRB_-;|CRePLK;5rCx#z)amIFDLwU%#NZ5uN}WQ{c49kO8Cr`W3{MA2d}
zpZ;2_&-`HzAL;nHFRIs~<|B$QF|HX%W1jWtiOVcq17QB2)V`X}Yp@Jdql}COXpe?A
z0M*p$lkiV#SvDknFhD9MdE>y%q07Ak?(8sN^>fv#KB>>f@zs_^4E?-A&<57q$lJ=r
zQ9}w@h>#6|?XB
z>ljVXb*wAcJG2O5wAd1zUBATOVzh%SD#q^KORAu1Es3t?&U4vvwy^man=bgQoENCDMF|qoDm__LxBLo+lN8`^qZ$uQ+i0Oc(s;9J;DVadFo*p%Kc^_a>vSb
z#|BSCgky&2ZXfvwzW&`*Un1eqe^MerJ%yHw+($+VqDW>UL42g?i3IHw<3r>q`XD_x
zh7na1oz=~o#^7TmvlX%Lap8}h`MA6GOm;MSw0YO=iEC-3WLWBDdcdNg$=bFU5A&7>OI`CTb)8U`#Lf8IU
z3$#joXpj0MkryICai_#>Sjh{7zm`FIHc)a+=B>xYy
zx>U`gP`m2ert@jaQh$Jv01^q<7fT9?dFrgvxpG+B089^?e;nr~EkCVz(?;jMX3o;<
zqgqoijDhUfCnZpb*(3-N2j)g%%?BdcuNluCg_0v&?p980IO(UYfyh(n91~GPH;|EUEea(b%aS-*LAI0(^{^F
z$C4lKh`up#9DpIqjNmyN&cukXiC6v;aR5T>5oxqEVGJT4L7YaA3`){6UHK7Iy0s8X
zIT!uDijg)1gRAa>@LTgosMV8*rm%QS0Nq%VBlI9#OJ>|UgqcuDM6vV8Ha)fs}pB>t0I5$ZZom185dnnx9K2v)_t^Na8ims5*w@@oR{gVS8Xcll0`Ra
zO2I8zER`5a@rc-s@BcYCt~C*i
zBq9)@ap2^~3U0X+i)?8adkor7{jV+}jn}5SM;gD*i!^xQ{Z12N0x)APORQ>s8%!Ky
zQgeAuSG#d97g%<%P=r7ce}53MWxDs(YFPr78v}@~kW9Uo{(bZ$764xC3{vUe-~Rsn
z2VMrHJSCJesJACv2X{~bfW{a+0(!agEY!*acU1rOlu*lW->-frFg7XQ|Id56zPk1C
z#@m&5Fms(;EBE{g_*jg2B*0J1^U?$HF<`$PSP!E6+@oXQoQS
zK9c-hcEmh%@lV7R&8zw;v5%g}M2UTLhmA_?V;BrMg?)VRO_qtRhYmF)W0wI?@Z0h<
zf=FwJuh}Vy6>+7Jgy%xHdt`*ve+oDJ*a78sb;EyixOBtecXkS&(J#novw85=ohqq&zztR9lcStcuN6qUwL8Ad%kPp4dmPWQq@zeN*I!|uzy*(UCt}z
zxAG|S*SD0htLzlyMY!}7j_PJ#czV`pK$D{Fl;2C@&(10L$P>`5u)a1`YRgzH)=JF!
z;!$kFS9CnD~#9iprHqAysudhwQ=B&$v*55K=Tl9OaLCxYLm`rW@p?UxUU4iBx`3(uGbrs0}i+qfQgc1XD5
zhaHn%J7RZneD94~p9TwKaK)J81u-3qXy|zDg|YF#59xLYos!2}j_rjBbY`QEP6Hrj-;JIP=CM$_^>6-CO32)!B93q?*mcdL;ZyuEKY@Wi2Kx<*KL
zU1Cw=x=Eb_vQFrpZ!d!2MG?$wCvc(Vfxk~C>!QJ!XfcW|Wsf|Q&kBQf@RX&ZjCsaEERl8;5rkmz5|M_v9B?`>vAT<(W$vLqFUXS4}k7`3*7iFzZXE>(+bPh?h4l#i!eG_r;~|knYUfaS6LcJ?AhVaYIgS
zx8KqM%ZI*p6u5o_19p$|hdVXfI}e%RM%1LFLp&N88?kqlzz0ksgB+M{3@7T^F+R}d
z)CqfB+y%i-cPI~u{xTyBV;2VSGzpzuhlKEIlCh{`@;j32M|aA~o^1ti;3;p*=@37r
z6YK@Ece1G--mv&9*BgnuH0S3|^1y@NCi`_Uf#(a9<$G2fhVYJzm6*mM*)pSjE>7A{
zF`F~;^{`(?&w{lL{kG#RdiI*%h8fyEbm-pGrt7fZj#qv*
z0kv;Fil8Q>C2#&$5!4XWigr^7YBqwJxzIvTtB(xSKJ$vL>1qtoZhHHke+WB0%LyF7
z)9sJ|o_f)>F!aNdwXXeEYI5KHD}o+^p4@EZX+#Km2zrI8CxRY=9y1J#4D=rSG1ug{
z0=Mdc8ZTA26x3B|Q+rhc+_TRjz#+gPz-3Lb+{aZ+K
z%k#C5z7Cr>@cwP?#nc81X}Ys*3p|IEM63bzgJ{bNHhpWK&?O(-k`{H3hrGOYUow(@
zte9U9$%+~O^CR3jSIoQVL#r7tWUb_rUG8E=Oo{9a2Wo-El7PYAp>S}c
z%~fLu@kv6J^bV+`U~B_kmZTvioR!p3{&E@_#!DG*WupowCx`8XhvU%0qk7dJY@)>(s`??t
z#H}=2Kp2j!Jz~SW=S#892ubZGd92E(Q}Dn+ZZlX
z*N(v8PJJ$-$-#O-8$RSlLwk!u-jwjWlhXU?(|iWEYiTc}>g^VHAb7{LXnNWpR!Ja{
z5s3e~^V{zNKG8E;L_zA{j1N`_WF??Qo0^Kv6%`5hyQJ@&yK9UBw;f@b#f
zl_b=$O+OAT(%o$J|4LcJ60`Ke@_S4C3%6pcM0ah_&ha^EG;oiP-y}%05^=ei()P~1
z-(*NSJ|*34z+Swgj2TbHJ6BCG{M%3MJOg%r_#i#_1HC6-(5=u60+3N#t~(Hy$3tZc
zuN32H%w^#!`F8KffK()vwmGUepb52bz%EjIeDR=Djgpzy0=?AE>W1$+)-eRE!Lkna
zbYQOgq0OSqfaeeyz9-s|db+*1SJ@+Iw^}znh-J1_4=l)31Vln4Yvzo63c1Z;ONNzLniq#yn_X)WwvWYM1en$14_hPkK5!bK4zRVAg`JBkv
z5GOW3HA|v8Gi}8zO-n@WnI&%j5|{9ux%`(uJP*cuo?jr%WUhO|=Yp5Sh4(rA-b(r9
z+8PzZc^_`&6
zCuM5l3mO`I7*fE7NX&+29#GOI@)GFA9W?r|j16gXNV0(-X!LPtqVIu@DXm0YzR>8S
zrAWC;^O^LjYf95XqmMFTCwf{kHQW@VG+;FPsAK~enL47#)QkU3-VqxM8hs$)mu7QN
zn;bOy6q2`uu|zj1-6ck!M}H=GUJ>{p1kJ02<#m#_3CF9A9Ip)BDM>1~dLENA^TSZ;Y4k95@v
z}Q!Ro+&k3Z)DK`+BGn$nZWzhWEu+Fca$45(f6kw^dxbhjoz&=%mF3ZBgz&=^Zwan;q=@k)o*YP31
z!Dj_qjrHW;Y>C>FwdR?;-ue0Kmuf$Zc(vO|m3)xN!C0|Fs8{P)QQro&KZtbK@4WV{
z(@%FjH~#No(_PPDVz4AJSViGd%2V3y%_+s
zvPR5Prv2n%)Kr@>ZE;B`xn)Rt`A4R0Lk5J16r)^)CaQAnJ8v!_&RsBaG~%4VXBG3Q
zeL{J*xpSvar%9(+mt7{^%lB|$UG}7SyO8>Oq%Qjho)a3QXLgvjc-`y}q1>?u@UnA4
z8+>#9%KLv`^P6(<4WL4~396NE_6}@HojWJ-VK1-+e+1
z@GpNmecYWN|Kme^aU4AH^gQa9iGGMS1xvl#^9ELOZ_~??Yv@)tA
z`DDZihEnAnk}S`uqfBTQPFD1R<#$W)4syS_E=x7W?02NYN()$Uq@HSYPl4hGe*vpa
zQy^LojD;MtpxW{VPhzOj6v`?^gI-trk0Iddy|0`FT>bY!gew(~%fFsss{a+j)gS_t
zi%yM6OtD(3UGjH`HHnmFm#gZYPX4<7~$@^agcxnlF0;TP1zDK&7
zTJXs+tqKsTdn{3~2EMTN_BS{{z5Cb~&jO(ShX6IY^0b8jHINA9Bh(Zo=0}7&AWD-E
z+QPZ;;UPk4v505oJ$vAH%qBRMU=f%F*L;6J4rG}+K}AVUv%0SvgvOy4Eefw&f>InAoK6dKi5{nCfNXOmqscIk452Fx(U
zs&zrp6V_eHsoJjuiSpg;zxRc-p{ttzYe)(uI=B)CR|O%GTbM5n7m=_V}bSlX`#S(en?Y_ZwOo6M`O3**v
zyjHvNn;Hnc#-r>F;M16to74}Yn|81XmDmXs%akmX;d`iElH>VOU%-8%#_?!y>f_w_
zTaOIgMP8^#@sNyNNbKnaG2NsrMzVfA?(C3o#Sc3sO{yRYS)R$-0Ta^Oxdh#ks0AjC
z%wjc^aMgR|k@w0MWVQe1Zxd~%Xfx%+M6K>_g@}xcL{q7R{aVp;_4tG4gGZfo;BdZA
zydbd}b}Kvnk&*I4vK6e~d10&Ff3f!Q*V8L#+CN3aV&xp%zZ{E*z`Mvk1qq#}k1Gi`FUT)Kbg4NFbR@!W3oC
z(+X{UC4`6+mY^w>tMhJFnooz5gK&I;IF5XS;90p-KP#2uy!ulRg%Z*@VCz`5Rss-j
zf3^0=Ydi)~6p?4e&0^Pv>~J2j=$4;aB$);T255e(h(OXIGQ_0{l5cxBqxyENB&d_8%P6Twuz7{O+2L!Rwffhm_?X{AUYuwXqz5E`kF9inlixp2LC4s
zFG-HDPi~=^*(rg7#&dYu=6f>VyeUp76}HL|Pm6n)~Nr6*|I~ZvuCaZE%)SX`OjajU?FZsy3;s{;hcn7Afd
z1vZN2d?gbZI42`(kJw;r%Q1A!%1|Ty9cRbDM!>7Yg(S~f(wwViYcaW>c4BgJGG`=c
z^cmXHRHY!9KFvcKwyN9?>!0=5GxBmQqtT~lk`gZN2@_CWd<7GYK4|pGXBc19precb
sO`_2U>z_4*#me-6F=DF to = new ArrayList<>();
+    private Email from;
+    private String subject = "";
+    private String data = "";
+    private Integer id;
+
+    public Message() {
+    }
+
+    public Message(ArrayList to, Email from, String subject, String data) {
+        this.to = to;
+        this.from = from;
+        this.subject = subject;
+        this.data = data;
+    }
+
+    public void allFieldsSet() throws MissingInputException {
+        if (this.subject == null) this.subject = "";
+        if (this.data == null) this.data = "";
+        if (this.to.isEmpty()) throw new MissingInputException("error no receiver");
+        if (this.from == null) throw new MissingInputException("error no sender");
+    }
+
+    public void addTo(Email email) {
+        to.add(email);
+    }
+
+    public String printTo() {
+        if (this.to.isEmpty())
+            return null;
+        return this.to.stream().map(Object::toString).collect(Collectors.joining(","));
+    }
+
+    public ArrayList getTo() {
+        return to;
+    }
+
+    public void setTo(ArrayList to) {
+        this.to = to;
+    }
+
+    public Email getFrom() {
+        return from;
+    }
+
+    public void setFrom(Email from) {
+        this.from = from;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String listMessage() {
+        return getId() + " " + getFrom() + " " + getSubject();
+    }
+
+    @Override
+    public String toString() {
+        return "from " + getFrom().toString() + "\n" +
+                "to " + printTo() + "\n" +
+                "subject " + getSubject() + "\n" +
+                "data " + getData() + "\n";
+    }
+}
diff --git a/src/main/java/dslab/exception/MalformedInputException.java b/src/main/java/dslab/exception/MalformedInputException.java
new file mode 100644
index 0000000..aef62d9
--- /dev/null
+++ b/src/main/java/dslab/exception/MalformedInputException.java
@@ -0,0 +1,7 @@
+package dslab.exception;
+
+public class MalformedInputException extends Exception {
+    public MalformedInputException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/dslab/exception/MessageNotFoundException.java b/src/main/java/dslab/exception/MessageNotFoundException.java
new file mode 100644
index 0000000..860d6ff
--- /dev/null
+++ b/src/main/java/dslab/exception/MessageNotFoundException.java
@@ -0,0 +1,7 @@
+package dslab.exception;
+
+public class MessageNotFoundException extends Exception {
+    public MessageNotFoundException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/dslab/exception/MissingInputException.java b/src/main/java/dslab/exception/MissingInputException.java
new file mode 100644
index 0000000..a10a133
--- /dev/null
+++ b/src/main/java/dslab/exception/MissingInputException.java
@@ -0,0 +1,7 @@
+package dslab.exception;
+
+public class MissingInputException extends Exception {
+    public MissingInputException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/dslab/exception/UnknownDomainException.java b/src/main/java/dslab/exception/UnknownDomainException.java
new file mode 100644
index 0000000..3636cd4
--- /dev/null
+++ b/src/main/java/dslab/exception/UnknownDomainException.java
@@ -0,0 +1,7 @@
+package dslab.exception;
+
+public class UnknownDomainException extends Exception {
+    public UnknownDomainException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/dslab/exception/UnknownRecipientException.java b/src/main/java/dslab/exception/UnknownRecipientException.java
new file mode 100644
index 0000000..f101d67
--- /dev/null
+++ b/src/main/java/dslab/exception/UnknownRecipientException.java
@@ -0,0 +1,7 @@
+package dslab.exception;
+
+public class UnknownRecipientException extends Exception {
+    public UnknownRecipientException(String errorMessage) {
+        super(errorMessage);
+    }
+}
diff --git a/src/main/java/dslab/mailbox/DMAPConnection.java b/src/main/java/dslab/mailbox/DMAPConnection.java
new file mode 100644
index 0000000..6e6fcbd
--- /dev/null
+++ b/src/main/java/dslab/mailbox/DMAPConnection.java
@@ -0,0 +1,194 @@
+package dslab.mailbox;
+
+import dslab.Email;
+import dslab.Message;
+import dslab.exception.MessageNotFoundException;
+
+import java.io.*;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+public class DMAPConnection implements Runnable {
+    Logger logger = Logger.getLogger(DMAPConnection.class.getName());
+    private final Socket socket;
+    private PrintWriter out;
+    private BufferedReader in;
+    private Email currentUser = null;
+    private final ConcurrentHashMap> storage;
+    private final ConcurrentHashMap userStorage;
+
+    public DMAPConnection(Socket connection, ConcurrentHashMap> storage, ConcurrentHashMap userStorage) {
+        this.socket = connection;
+        this.storage = storage;
+        this.userStorage = userStorage;
+    }
+
+    @Override
+    public void run() {
+        logger.finer("Preparing for DMAP communication in " + this.toString());
+        try {
+            this.out = new PrintWriter(socket.getOutputStream(), true);
+            this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            out.println("ok DMAP");
+            loginLoop();
+
+            String userInput;
+            while (!Thread.currentThread().isInterrupted() && (userInput = in.readLine()) != null) {
+                if ("quit".equals(userInput)) {
+                    out.println("ok bye");
+                    shutdown();
+                } else if ("logout".equals(userInput)) {
+                    out.println("ok");
+                    currentUser = null;
+                    loginLoop();
+                } else if ("list".equals(userInput)) {
+                    listMessages();
+                } else if ("delete".equals(userInput.split("\\s+")[0])) {
+                    if (userInput.split("\\s+").length == 2) {
+                        try {
+                            deleteMessage(userInput.split("\\s+")[1]);
+                        } catch (MessageNotFoundException e) {
+                            out.println(e.getMessage());
+                        }
+                    } else {
+                        out.println("Please supply a message id to delete!");
+                    }
+                } else if ("show".equals(userInput.split("\\s+")[0])) {
+                    if (userInput.split("\\s+").length == 2) {
+                        try {
+                            showMessage(userInput.split("\\s+")[1]);
+                        } catch (MessageNotFoundException e) {
+                            out.println(e.getMessage());
+                        }
+                    } else {
+                        out.println("Please supply a message id to show!");
+                    }
+                } else {
+                    out.println("error protocol error");
+                    shutdown();
+                }
+            }
+        } catch (InterruptedIOException ioe) {
+            logger.info("Received interrupt from parent. Shutting down...");
+            shutdown();
+        } catch (IOException e) {
+            logger.severe("Failed to get IO-Stream");
+            e.printStackTrace();
+            shutdown();
+        }
+    }
+
+    private void loginLoop() {
+        String userInput;
+
+        try {
+            while (!Thread.currentThread().isInterrupted()) {
+                userInput = in.readLine();
+                if ("quit".equals(userInput.split("\\s+")[0])) {
+                    out.println("ok bye");
+                    shutdown();
+                } else if ("login".equals(userInput.split("\\s+")[0])) {
+                    String[] args = userInput.split("\\s+");
+                    if (args.length != 3)
+                        out.println("Please specify a username and password to login!");
+                    if (this.userStorage.containsKey(args[1])) {
+                        // Check if username exists
+                        if (args[2].equals(this.userStorage.get(args[1]))) {
+                            // Check if password matches
+                            for (Email email : this.storage.keySet()) {
+                                if (args[1].equals(email.getUsername())) {
+                                    // Set current user if login successful
+                                    currentUser = email;
+                                    logger.info("User successfully logged in: " + currentUser.toString());
+                                    out.println("ok");
+                                    return;
+                                }
+                            }
+                        } else {
+                            out.println("error wrong password");
+                        }
+                    } else {
+                        out.println("error unknown user");
+                    }
+                } else {
+                    out.println("error not logged in");
+                }
+            }
+        } catch (InterruptedIOException ioe) {
+            logger.info("Received interrupt from parent. Shutting down...");
+            shutdown();
+        } catch (SocketException e) {
+            logger.finer("Received interrupt. Exiting " + this.toString());
+            shutdown();
+        } catch (IOException e) {
+            logger.severe("Failed to get IO-Stream");
+            e.printStackTrace();
+            shutdown();
+        }
+    }
+
+    private void showMessage(String id) throws MessageNotFoundException {
+        int i;
+        try {
+            i = Integer.parseInt(id);
+        } catch (NumberFormatException e) {
+            throw new MessageNotFoundException("error unknown message id");
+        }
+
+        for (Message m : storage.get(currentUser)) {
+            if (m.getId() == i) {
+                out.println(m);
+                return;
+            }
+        }
+
+        throw new MessageNotFoundException("error unknown message id");
+    }
+
+    private void listMessages() {
+        if (storage.get(currentUser).isEmpty()) {
+            out.println("You do not have any messages at the moment!");
+            return;
+        }
+
+        for (Message m : storage.get(currentUser)) {
+            out.println(m.listMessage());
+        }
+    }
+
+    public void deleteMessage (String id) throws MessageNotFoundException {
+        int i;
+        try {
+            i = Integer.parseInt(id);
+        } catch (NumberFormatException e) {
+            throw new MessageNotFoundException("error unknown message id");
+        }
+
+        for (Message m : storage.get(currentUser)) {
+            if (m.getId() == i) {
+                storage.get(currentUser).remove(m);
+                out.println("ok");
+                return;
+            }
+        }
+
+        throw new MessageNotFoundException("error unknown message id");
+    }
+
+    public void shutdown() {
+        logger.info("Shutting down client connection " + this.toString());
+        try {
+            if (socket != null)
+                socket.close();
+            in.close();
+            out.close();
+        } catch (IOException e) {
+            logger.severe("Error closing socket and/or IO-streams");
+            e.printStackTrace();
+        }
+        Thread.currentThread().interrupt();
+    }
+}
diff --git a/src/main/java/dslab/mailbox/DMAPListener.java b/src/main/java/dslab/mailbox/DMAPListener.java
new file mode 100644
index 0000000..7b686b5
--- /dev/null
+++ b/src/main/java/dslab/mailbox/DMAPListener.java
@@ -0,0 +1,73 @@
+package dslab.mailbox;
+
+import dslab.Email;
+import dslab.Message;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+public class DMAPListener extends Thread {
+    private final ServerSocket serverSocket;
+    private final Logger logger = Logger.getLogger(DMAPListener.class.getName());
+    private final ConcurrentHashMap> storage;
+    private final ConcurrentHashMap userStorage;
+    private final ArrayList clients = new ArrayList<>();
+    private final ExecutorService executorService = Executors.newCachedThreadPool();
+
+    public DMAPListener(ServerSocket serverSocket, ConcurrentHashMap> storage, ConcurrentHashMap userStorage) {
+        this.serverSocket = serverSocket;
+        this.storage = storage;
+        this.userStorage = userStorage;
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            logger.finer("Waiting for request on serverSocket " + serverSocket.toString());
+            try {
+                Socket s = serverSocket.accept();
+                logger.fine("Processing incoming socket " + s.toString());
+                DMAPConnection dmapConnection = new DMAPConnection(s, storage, userStorage);
+                clients.add(dmapConnection);
+                executorService.submit(dmapConnection);
+            } catch (InterruptedIOException | SocketException e) {
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                this.shutdown();
+            } catch (IOException e) {
+                logger.severe("Error starting serverSocket " + serverSocket.toString());
+                e.printStackTrace();
+                this.shutdown();
+            }
+        }
+    }
+
+    public void shutdown() {
+        logger.finer("Shutting down DMAPListener " + this.toString());
+        for (DMAPConnection client : clients) {
+            if (client != null)
+                client.shutdown();
+        }
+        executorService.shutdown();
+        try {
+            if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                executorService.shutdownNow();
+                if (!executorService.awaitTermination(60, TimeUnit.SECONDS))
+                    System.err.println("Pool did not terminate");
+            }
+        } catch (InterruptedException ie) {
+            executorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+        this.interrupt();
+    }
+}
diff --git a/src/main/java/dslab/mailbox/DMTPConnection.java b/src/main/java/dslab/mailbox/DMTPConnection.java
new file mode 100644
index 0000000..da4d009
--- /dev/null
+++ b/src/main/java/dslab/mailbox/DMTPConnection.java
@@ -0,0 +1,166 @@
+package dslab.mailbox;
+
+import dslab.Email;
+import dslab.Message;
+import dslab.exception.MalformedInputException;
+
+import java.io.*;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+public class DMTPConnection implements Runnable {
+    Logger logger = Logger.getLogger(DMTPConnection.class.getName());
+    private final Socket socket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    private Message msg = new Message();
+
+    private final String domain;
+
+    private final ConcurrentHashMap> messageStorage;
+    private final ConcurrentHashMap userStorage;
+
+    public DMTPConnection(Socket connection, ConcurrentHashMap> messageStorage, ConcurrentHashMap userStorage, String domain) {
+        this.socket = connection;
+        this.messageStorage = messageStorage;
+        this.userStorage = userStorage;
+        this.domain = domain;
+    }
+
+    @Override
+    public void run() {
+        logger.finer("Preparing for DMTP communication in " + this.toString());
+        try {
+            this.out = new PrintWriter(socket.getOutputStream(), true);
+            this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            out.println("ok DMTP");
+
+            String userInput;
+
+            try {
+                if (!("begin".equals(in.readLine()))) {
+                    out.println("error protocol error");
+                    shutdown();
+                }
+            } catch (SocketException e) {
+                // Thrown if socket has already been closed by shutdown() method
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                shutdown();
+            }
+            out.println("ok");
+
+            while (!Thread.currentThread().isInterrupted() && (userInput = in.readLine()) != null) {
+                if ("quit".equals(userInput)) {
+                    out.println("ok bye");
+                    shutdown();
+                } else if ("send".equals(userInput)) {
+                    storeMessage();
+                    out.println("ok");
+                } else if ("to".equals(userInput.split("\\s+")[0])) {
+                    msg.setTo(new ArrayList<>());
+                    String[] emailAddresses = userInput.split("\\s+")[1].split(",");
+                    logger.info("Split EMail addresses: " + Arrays.toString(emailAddresses));
+                    int count = 0;
+                    try {
+                        for (String emailAddress : emailAddresses) {
+                            logger.info("Current email address in msg.getTo(): " + emailAddress);
+                            Email add = new Email(emailAddress);
+                            if (this.domain.equals(add.getDomain())) {
+                                logger.info("Address " + emailAddress + " belongs to this domain " + this.domain);
+                                if (!this.userStorage.containsKey(add.getUsername())) {
+                                    logger.info("Our userStorage in domain " + this.domain + " does not contain user " + add.getUsername());
+                                    out.println("error unknown recipient " + add.toString());
+                                } else {
+                                    logger.info("Address " + add.toString() + " belongs to this domain and user exists. Adding address to msg.To() field");
+                                    msg.addTo(add);
+                                    count++;
+                                }
+                            } else {
+                                logger.info("Address " + emailAddress + " does not belong to this domain. Adding anyway...");
+                                msg.addTo(add);
+                                count++;
+                            }
+                        }
+                        if (count != 0)
+                            out.println("ok " + count);
+                    } catch (MalformedInputException e) {
+                        out.println(e.getMessage());
+                    }
+                } else if ("from".equals(userInput.split("\\s+")[0])) {
+                    try {
+                        Email from = new Email(userInput.split("\\s+")[1]);
+                        this.msg.setFrom(from);
+                        out.println("ok");
+                    } catch (MalformedInputException mie) {
+                        out.println(mie.getMessage());
+                    }
+                } else if ("subject".equals(userInput.split("\\s+")[0])) {
+                    String subject = "";
+                    if (userInput.split("\\s+").length > 1)
+                        subject = userInput.split("\\s+", 2)[1];
+                    msg.setSubject(subject);
+                    out.println("ok");
+                } else if ("data".equals(userInput.split("\\s+")[0])) {
+                    String data = userInput.split("\\s+", 2)[1];
+                    msg.setData(data);
+                    out.println("ok");
+                } else {
+                    out.println("error protocol error");
+                    shutdown();
+                }
+            }
+        } catch (InterruptedIOException ioe) {
+            logger.info("Received interrupt from parent. Shutting down...");
+            shutdown();
+        } catch (IOException e) {
+            logger.severe("Failed to get IO-Stream");
+            e.printStackTrace();
+            shutdown();
+        }
+    }
+
+    private synchronized void storeMessage() {
+        logger.info("Storing message " + msg.toString());
+        this.msg.setId(MailboxServer.id++);
+        boolean alreadyPresent;
+        for (Email recipient : this.msg.getTo()) {
+            alreadyPresent = false;
+            logger.info("storeMessage(): checking if msg " + msg.listMessage() + " already exists for recipient " + recipient.toString());
+            if (this.messageStorage.containsKey(recipient)) {
+                // Check if message already exists for user
+                for (Message m : this.messageStorage.get(recipient)) {
+                    if (this.msg.getId().equals(m.getId())) {
+                        logger.info("storeMessage(): msg " + msg.listMessage() + " already exists for recipient " + recipient.toString());
+                        alreadyPresent = true;
+                        break;
+                    }
+                }
+                // Save only if message doesn't already exist
+                if (!alreadyPresent) {
+                    this.messageStorage.get(recipient).add(this.msg);
+                }
+            }
+        }
+        this.msg = new Message();
+    }
+
+    public void shutdown() {
+        logger.info("Shutting down client connection " + this.toString());
+        try {
+            if (socket != null)
+                socket.close();
+            in.close();
+            out.close();
+        } catch (IOException e) {
+            logger.severe("Error closing socket and/or IO-streams");
+            e.printStackTrace();
+        }
+        Thread.currentThread().interrupt();
+    }
+}
diff --git a/src/main/java/dslab/mailbox/DMTPListener.java b/src/main/java/dslab/mailbox/DMTPListener.java
new file mode 100644
index 0000000..7db83fa
--- /dev/null
+++ b/src/main/java/dslab/mailbox/DMTPListener.java
@@ -0,0 +1,75 @@
+package dslab.mailbox;
+
+import dslab.Email;
+import dslab.Message;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+public class DMTPListener extends Thread {
+    private final ServerSocket serverSocket;
+    private final Logger logger = Logger.getLogger(DMTPListener.class.getName());
+    private final ArrayList clients = new ArrayList<>();
+    private final ExecutorService executorService = Executors.newCachedThreadPool();
+    private final ConcurrentHashMap> messageStorage;
+    private final ConcurrentHashMap userStorage;
+    private final String domain;
+
+    public DMTPListener(ServerSocket serverSocket, ConcurrentHashMap> storage, ConcurrentHashMap userStorage, String domain) {
+        this.serverSocket = serverSocket;
+        this.messageStorage = storage;
+        this.userStorage = userStorage;
+        this.domain = domain;
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            logger.finer("Waiting for request on serverSocket " + serverSocket.toString());
+            try {
+                Socket s = serverSocket.accept();
+                logger.fine("Processing incoming socket " + s.toString());
+                DMTPConnection dmtpConnection = new DMTPConnection(s, messageStorage, userStorage, domain);
+                clients.add(dmtpConnection);
+                executorService.submit(dmtpConnection);
+            } catch (InterruptedIOException | SocketException e) {
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                this.shutdown();
+            } catch (IOException e) {
+                logger.severe("Error starting serverSocket " + serverSocket.toString());
+                e.printStackTrace();
+                this.shutdown();
+            }
+        }
+    }
+
+    public void shutdown() {
+        logger.finer("Shutting down DMTPListener " + this.toString());
+        for (DMTPConnection client : clients) {
+            if (client != null)
+                client.shutdown();
+        }
+        executorService.shutdown();
+        try {
+            if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                executorService.shutdownNow();
+                if (!executorService.awaitTermination(60, TimeUnit.SECONDS))
+                    System.err.println("Pool did not terminate");
+            }
+        } catch (InterruptedException ie) {
+            executorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+        this.interrupt();
+    }
+}
diff --git a/src/main/java/dslab/mailbox/MailboxServer.java b/src/main/java/dslab/mailbox/MailboxServer.java
index f422eda..7d89042 100644
--- a/src/main/java/dslab/mailbox/MailboxServer.java
+++ b/src/main/java/dslab/mailbox/MailboxServer.java
@@ -1,12 +1,36 @@
 package dslab.mailbox;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.net.ServerSocket;
+import java.util.LinkedList;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
 
+import at.ac.tuwien.dsg.orvell.Shell;
+import at.ac.tuwien.dsg.orvell.StopShellException;
+import at.ac.tuwien.dsg.orvell.annotation.Command;
 import dslab.ComponentFactory;
+import dslab.Email;
+import dslab.Message;
 import dslab.util.Config;
 
 public class MailboxServer implements IMailboxServer, Runnable {
+    private static final Logger logger = Logger.getLogger(MailboxServer.class.getName());
+    private final String domain;
+    private ServerSocket dmtpServerSocket;
+    private ServerSocket dmapServerSocket;
+    private final Shell shell;
+    private final Integer dmtpServerPort;
+    private final Integer dmapServerPort;
+    private DMTPListener dmtpListener;
+    private DMAPListener dmapListener;
+    private final ConcurrentHashMap> messageStorage = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap userStorage = new ConcurrentHashMap<>();
+
+    public static volatile Integer id;
+
 
     /**
      * Creates a new server instance.
@@ -17,17 +41,67 @@ public class MailboxServer implements IMailboxServer, Runnable {
      * @param out the output stream to write console output to
      */
     public MailboxServer(String componentId, Config config, InputStream in, PrintStream out) {
-        // TODO
+        this.domain = config.getString("domain");
+        Config userConfig = new Config(config.getString("users.config"));
+
+        // Load users from config into userStorage for authentication
+        for (String key : userConfig.listKeys()) {
+            userStorage.put(key, userConfig.getString(key));
+        }
+        // Load Email Addresses into messageStorage
+        for (String key : userStorage.keySet()) {
+            Email current = new Email(key, domain);
+            messageStorage.put(current, new LinkedList<>());
+        }
+
+        id = 0;
+
+        this.shell = new Shell(in, out);
+        this.shell.register(this);
+        this.shell.setPrompt("Mailboxserver> ");
+        this.dmtpServerPort = config.getInt("dmtp.tcp.port");
+        this.dmapServerPort = config.getInt("dmap.tcp.port");
     }
 
     @Override
     public void run() {
-        // TODO
+        logger.info("Creating DMTP and DMAP serverSockets for MailboxServer + " + this.toString());
+        try {
+            this.dmtpServerSocket = new ServerSocket(dmtpServerPort);
+            this.dmapServerSocket = new ServerSocket(dmapServerPort);
+        } catch (IOException e) {
+            logger.severe("Error creating one of the two server sockets");
+            e.printStackTrace();
+            shutdown();
+        }
+        this.dmtpListener = new DMTPListener(this.dmtpServerSocket, this.messageStorage, this.userStorage, this.domain);
+        this.dmtpListener.start();
+        this.dmapListener = new DMAPListener(this.dmapServerSocket, this.messageStorage, this.userStorage);
+        this.dmapListener.start();
+        this.shell.run();
     }
 
+    @Command
     @Override
     public void shutdown() {
-        // TODO
+        try {
+            if (dmtpServerSocket != null)
+                dmtpServerSocket.close();
+            this.dmtpListener.interrupt();
+        } catch (IOException e) {
+            logger.severe("Error closing DMTP serverSocket " + dmtpServerSocket.toString());
+            e.printStackTrace();
+        }
+
+        try {
+            if (dmapServerSocket != null)
+                dmapServerSocket.close();
+            this.dmapListener.interrupt();
+        } catch (IOException e) {
+            logger.severe("Error closing DMTP serverSocket " + dmapServerSocket.toString());
+            e.printStackTrace();
+        }
+        throw new StopShellException();
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/dslab/monitoring/MonitoringListener.java b/src/main/java/dslab/monitoring/MonitoringListener.java
new file mode 100644
index 0000000..06cb935
--- /dev/null
+++ b/src/main/java/dslab/monitoring/MonitoringListener.java
@@ -0,0 +1,64 @@
+package dslab.monitoring;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.SocketException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
+public class MonitoringListener extends Thread {
+    private static final Logger logger = Logger.getLogger(MonitoringListener.class.getName());
+    private final DatagramSocket serverSocket;
+    private final ConcurrentHashMap addresses;
+    private final ConcurrentHashMap servers;
+
+    public MonitoringListener(DatagramSocket serverSocket, ConcurrentHashMap addresses, ConcurrentHashMap servers) {
+        this.serverSocket = serverSocket;
+        this.addresses = addresses;
+        this.servers = servers;
+    }
+
+    @Override
+    public void run() {
+        byte[] recvBuffer = new byte[1024];
+        while (!Thread.currentThread().isInterrupted()) {
+            logger.finer("Waiting for request on UDP serverSocket " + serverSocket.toString());
+            try {
+                DatagramPacket packet = new DatagramPacket(recvBuffer, recvBuffer.length);
+                serverSocket.receive(packet);
+                logger.fine("Processing incoming socket " + serverSocket.toString());
+                String receivedData = new String(packet.getData(), StandardCharsets.UTF_8).trim();
+                String server = receivedData.split("\\s+")[0];
+                String address = receivedData.split("\\s+")[1];
+                logger.info("Incoming packet contains server: " + server);
+                logger.info("Incoming packet contains address: " + address);
+                // Add/Update num of packets sent by server
+                if (!this.servers.containsKey(server))
+                    this.servers.put(server, 1);
+                else
+                    this.servers.put(server, this.servers.get(server) + 1);
+                // Add/Update num of packets sent for address
+                if (!this.addresses.containsKey(address))
+                    this.addresses.put(address, 1);
+                else
+                    this.addresses.put(address, this.addresses.get(address) + 1);
+            } catch (InterruptedIOException | SocketException e) {
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                this.shutdown();
+            } catch (IOException e) {
+                logger.severe("Error starting serverSocket " + serverSocket.toString());
+                e.printStackTrace();
+                this.shutdown();
+            }
+        }
+    }
+
+    public void shutdown() {
+        logger.finer("Shutting down MonitoringListener " + this.toString());
+        this.serverSocket.close();
+        this.interrupt();
+    }
+}
diff --git a/src/main/java/dslab/monitoring/MonitoringServer.java b/src/main/java/dslab/monitoring/MonitoringServer.java
index 12bba90..18d30e5 100644
--- a/src/main/java/dslab/monitoring/MonitoringServer.java
+++ b/src/main/java/dslab/monitoring/MonitoringServer.java
@@ -1,12 +1,27 @@
 package dslab.monitoring;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.net.DatagramSocket;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
 
+import at.ac.tuwien.dsg.orvell.Shell;
+import at.ac.tuwien.dsg.orvell.StopShellException;
+import at.ac.tuwien.dsg.orvell.annotation.Command;
 import dslab.ComponentFactory;
 import dslab.util.Config;
 
 public class MonitoringServer implements IMonitoringServer {
+    private static final Logger logger = Logger.getLogger(MonitoringServer.class.getName());
+    private DatagramSocket serverSocket;
+    private final Shell shell;
+    private final Integer serverPort;
+    private MonitoringListener monitoringListener;
+    private final ConcurrentHashMap addresses = new ConcurrentHashMap<>();
+    private final ConcurrentHashMap servers = new ConcurrentHashMap<>();
+
 
     /**
      * Creates a new server instance.
@@ -17,27 +32,50 @@ public class MonitoringServer implements IMonitoringServer {
      * @param out the output stream to write console output to
      */
     public MonitoringServer(String componentId, Config config, InputStream in, PrintStream out) {
-        // TODO
+        this.shell = new Shell(in, out);
+        this.shell.register(this);
+        this.shell.setPrompt("MonitoringServer> ");
+        this.serverPort = config.getInt("udp.port");
     }
 
     @Override
     public void run() {
-        // TODO
+        logger.info("Creating UDP serverSocket for " + this.toString());
+        try {
+            this.serverSocket = new DatagramSocket(serverPort);
+        } catch (IOException e) {
+            logger.severe("Error creating serverSocket " + serverSocket.toString());
+            e.printStackTrace();
+            shutdown();
+        }
+        this.monitoringListener = new MonitoringListener(serverSocket, addresses, servers);
+        this.monitoringListener.start();
+        this.shell.run();
     }
 
+    @Command
     @Override
     public void addresses() {
-        // TODO
+        for (String address : addresses.keySet()) {
+            this.shell.out().println(address + " " + addresses.get(address));
+        }
     }
 
+    @Command
     @Override
     public void servers() {
-        // TODO
+        for (String server : servers.keySet()) {
+            this.shell.out().println(server + " " + servers.get(server));
+        }
     }
 
+    @Command
     @Override
     public void shutdown() {
-        // TODO
+        if (serverSocket != null)
+            serverSocket.close();
+        this.monitoringListener.interrupt();
+        throw new StopShellException();
     }
 
     public static void main(String[] args) throws Exception {
diff --git a/src/main/java/dslab/transfer/ClientConnection.java b/src/main/java/dslab/transfer/ClientConnection.java
new file mode 100644
index 0000000..7a1ef64
--- /dev/null
+++ b/src/main/java/dslab/transfer/ClientConnection.java
@@ -0,0 +1,129 @@
+package dslab.transfer;
+
+import dslab.Email;
+import dslab.Message;
+import dslab.exception.MalformedInputException;
+import dslab.exception.MissingInputException;
+
+import java.io.*;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.logging.Logger;
+
+public class ClientConnection implements Runnable {
+    Logger logger = Logger.getLogger(ClientConnection.class.getName());
+    private final Socket socket;
+    private PrintWriter out;
+    private BufferedReader in;
+
+    private Message msg = new Message();
+
+    public ClientConnection(Socket connection) {
+        this.socket = connection;
+    }
+
+    @Override
+    public void run() {
+        logger.finer("Preparing for DMTP communication in " + this.toString());
+        try {
+            this.out = new PrintWriter(socket.getOutputStream(), true);
+            this.in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+            out.println("ok DMTP");
+
+            String userInput;
+
+            try {
+                if (!("begin".equals(in.readLine()))) {
+                    out.println("error protocol error");
+                    shutdown();
+                }
+            } catch (SocketException e) {
+                // Thrown if socket has already been closed by shutdown() method
+                // TODO maybe send message that connection has been closed by server?
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                shutdown();
+            }
+            out.println("ok");
+
+            while (!Thread.currentThread().isInterrupted() && (userInput = in.readLine()) != null) {
+                if ("quit".equals(userInput)) {
+                    out.println("ok bye");
+                    shutdown();
+                } else if ("send".equals(userInput)) {
+                    try {
+                        sendMessage();
+                        out.println("ok");
+                    } catch (MissingInputException e) {
+                        out.println(e.getMessage());
+                    }
+                } else if ("to".equals(userInput.split("\\s+")[0])) {
+                    msg.setTo(new ArrayList<>());
+                    String[] emailAddresses = userInput.split("\\s+")[1].split(",");
+                    int count = 0;
+                    try {
+                        for (String emailAddress : emailAddresses) {
+                            msg.addTo(new Email(emailAddress));
+                            count++;
+                        }
+                        out.println("ok " + count);
+                    } catch (MalformedInputException mie) {
+                        out.println(mie.getMessage());
+                    }
+                } else if ("from".equals(userInput.split("\\s+")[0])) {
+                    try {
+                        Email from = new Email(userInput.split("\\s+")[1]);
+                        this.msg.setFrom(from);
+                        out.println("ok");
+                    } catch (MalformedInputException mie) {
+                        out.println(mie.getMessage());
+                    }
+                } else if ("subject".equals(userInput.split("\\s+")[0])) {
+                    String subject = "";
+                    if (userInput.split("\\s+").length > 1)
+                        subject = userInput.split("\\s+", 2)[1];
+                    logger.info("Setting subject to: " + subject);
+                    msg.setSubject(subject);
+                    out.println("ok");
+                } else if ("data".equals(userInput.split("\\s+")[0])) {
+                    String data = "";
+                    if (userInput.split("\\s+").length > 1)
+                        data = userInput.split("\\s+", 2)[1];
+                    logger.info("Setting data to: " + data);
+                    msg.setData(data);
+                    out.println("ok");
+                } else {
+                    out.println("error protocol error");
+                    shutdown();
+                }
+            }
+        } catch (InterruptedIOException ioe) {
+            logger.info("Received interrupt from parent. Shutting down...");
+            shutdown();
+        } catch (IOException e) {
+            logger.severe("Failed to get IO-Stream");
+            shutdown();
+        }
+    }
+
+    public void shutdown() {
+        logger.info("Shutting down client connection " + this.toString());
+        try {
+            if (socket != null)
+                socket.close();
+            in.close();
+            out.close();
+        } catch (IOException e) {
+            logger.severe("Error closing socket and/or IO-streams");
+            e.printStackTrace();
+        }
+        Thread.currentThread().interrupt();
+    }
+
+    public void sendMessage() throws MissingInputException {
+        this.msg.allFieldsSet();
+        TransferServer.Producer producer = new TransferServer.Producer(this.msg);
+        new Thread(producer).start();
+        this.msg = new Message();
+    }
+}
diff --git a/src/main/java/dslab/transfer/ClientListener.java b/src/main/java/dslab/transfer/ClientListener.java
new file mode 100644
index 0000000..7a1e068
--- /dev/null
+++ b/src/main/java/dslab/transfer/ClientListener.java
@@ -0,0 +1,64 @@
+package dslab.transfer;
+
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+
+public class ClientListener extends Thread {
+    private final ServerSocket serverSocket;
+    private final Logger logger = Logger.getLogger(ClientListener.class.getName());
+    private final ArrayList clients = new ArrayList<>();
+    private final ExecutorService executorService = Executors.newCachedThreadPool();
+
+    public ClientListener(ServerSocket serverSocket) {
+        this.serverSocket = serverSocket;
+    }
+
+    @Override
+    public void run() {
+        while (!Thread.currentThread().isInterrupted()) {
+            logger.finer("Waiting for request on serverSocket " + serverSocket.toString());
+            try {
+                Socket s = serverSocket.accept();
+                logger.fine("Processing incoming socket " + s.toString());
+                ClientConnection clientConnection = new ClientConnection(s);
+                clients.add(clientConnection);
+                executorService.submit(clientConnection);
+            } catch (InterruptedIOException | SocketException e) {
+                logger.finer("Received interrupt. Exiting " + this.toString());
+                this.shutdown();
+            } catch (IOException e) {
+                logger.severe("Error starting serverSocket " + serverSocket.toString());
+                e.printStackTrace();
+                this.shutdown();
+            }
+        }
+    }
+
+    public void shutdown() {
+        logger.finer("Shutting down ClientListener " + this.toString());
+        for (ClientConnection client : clients) {
+            if (client != null)
+                client.shutdown();
+        }
+        executorService.shutdown();
+        try {
+            if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                executorService.shutdownNow();
+                if (!executorService.awaitTermination(60, TimeUnit.SECONDS))
+                    System.err.println("Pool did not terminate");
+            }
+        } catch (InterruptedException ie) {
+            executorService.shutdownNow();
+            Thread.currentThread().interrupt();
+        }
+        this.interrupt();
+    }
+}
diff --git a/src/main/java/dslab/transfer/TransferServer.java b/src/main/java/dslab/transfer/TransferServer.java
index e4e9c89..ace2d32 100644
--- a/src/main/java/dslab/transfer/TransferServer.java
+++ b/src/main/java/dslab/transfer/TransferServer.java
@@ -1,12 +1,32 @@
 package dslab.transfer;
 
-import java.io.InputStream;
-import java.io.PrintStream;
+import java.io.*;
+import java.net.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.logging.Logger;
 
+import at.ac.tuwien.dsg.orvell.Shell;
+import at.ac.tuwien.dsg.orvell.StopShellException;
+import at.ac.tuwien.dsg.orvell.annotation.Command;
 import dslab.ComponentFactory;
+import dslab.Email;
+import dslab.Message;
+import dslab.exception.MalformedInputException;
+import dslab.exception.UnknownDomainException;
 import dslab.util.Config;
 
 public class TransferServer implements ITransferServer, Runnable {
+    private static final Logger logger = Logger.getLogger(TransferServer.class.getName());
+    private ServerSocket serverSocket;
+    private final Shell shell;
+    private final Integer serverPort;
+    public static final HashMap mailboxServers = new HashMap<>();
+    public static volatile BlockingQueue blockingQueue = new LinkedBlockingQueue<>(10);
+    private final Consumer consumer;
+    public static final Object lock = new Object();
 
     /**
      * Creates a new server instance.
@@ -17,17 +37,46 @@ public class TransferServer implements ITransferServer, Runnable {
      * @param out the output stream to write console output to
      */
     public TransferServer(String componentId, Config config, InputStream in, PrintStream out) {
-        // TODO
+        Config univerze = new Config("mailbox-univer-ze.properties");
+        Config earthplanet = new Config("mailbox-earth-planet.properties");
+        mailboxServers.put(univerze.getString("domain"), univerze.getInt("dmtp.tcp.port"));
+        mailboxServers.put(earthplanet.getString("domain"), earthplanet.getInt("dmtp.tcp.port"));
+        String monitoringHost = config.getString("monitoring.host");
+        Integer monitoringPort = config.getInt("monitoring.port");
+        this.serverPort = config.getInt("tcp.port");
+        this.consumer = new Consumer(mailboxServers, monitoringHost, monitoringPort, "127.0.0.1", this.serverPort);
+        this.shell = new Shell(in, out);
+        this.shell.register(this);
+        this.shell.setPrompt("Transferserver> ");
     }
 
     @Override
     public void run() {
-        // TODO
+        logger.info("Creating serverSocket for " + this.toString());
+        try {
+            this.serverSocket = new ServerSocket(serverPort);
+        } catch (IOException e) {
+            logger.severe("Error creating serverSocket " + serverSocket.toString());
+            e.printStackTrace();
+            shutdown();
+        }
+        new ClientListener(serverSocket).start();
+        this.consumer.start();
+        this.shell.run();
     }
 
+    @Command
     @Override
     public void shutdown() {
-        // TODO
+        try {
+            if (serverSocket != null)
+                serverSocket.close();
+        } catch (IOException e) {
+            logger.severe("Error closing serverSocket " + serverSocket.toString());
+            e.printStackTrace();
+        }
+        this.consumer.interrupt();
+        throw new StopShellException();
     }
 
     public static void main(String[] args) throws Exception {
@@ -35,4 +84,206 @@ public class TransferServer implements ITransferServer, Runnable {
         server.run();
     }
 
+    static class Producer extends Thread {
+        private final Message msg;
+
+        Producer(Message msg) {
+            this.msg = msg;
+        }
+
+        @Override
+        public void run() {
+            try {
+                produce();
+            } catch (InterruptedException e) {
+                logger.info("Producer thread has been interrupted. Exiting..." + this.toString());
+                shutdown();
+            }
+        }
+
+        private void produce() throws InterruptedException {
+            synchronized (lock) {
+                while (blockingQueue.size() == 10) {
+                    lock.wait();
+                }
+                blockingQueue.put(msg);
+                logger.info("Added message " + msg.toString() + " to queue");
+                lock.notify();
+            }
+        }
+
+        private void shutdown() {
+            Thread.currentThread().interrupt();
+        }
+    }
+
+    static class Consumer extends Thread {
+        private final HashMap mailboxServers;
+        private final String monitoringHost;
+        private final Integer monitoringPort;
+        private final String transferHost;
+        private final Integer transferPort;
+
+        Consumer(HashMap mailboxServers,
+                 String monitoringHost,
+                 Integer monitoringPort,
+                 String transferHost,
+                 Integer transferPort) {
+            this.mailboxServers = mailboxServers;
+            this.monitoringHost = monitoringHost;
+            this.monitoringPort = monitoringPort;
+            this.transferHost = transferHost;
+            this.transferPort = transferPort;
+        }
+
+        @Override
+        public void run() {
+            try {
+                consume();
+            } catch (InterruptedException e) {
+                logger.info("Consumer thread has been interrupted. Exiting..." + this.toString());
+                shutdown();
+            }
+        }
+
+        private void consume() throws InterruptedException {
+            while (!Thread.currentThread().isInterrupted()) {
+                synchronized (lock) {
+                    while (blockingQueue.isEmpty()) {
+                        logger.info("Queue currently empty. Waiting for messages to appear...");
+                        lock.wait();
+                    }
+                    logger.info("Queue not empty. Processing message...");
+                    Message msg = blockingQueue.take();
+                    logger.info("Took message " + msg.toString() + " from queue");
+                    HashMap sent = new HashMap<>();
+                    sent.put("earth.planet", false);
+                    sent.put("univer.ze", false);
+                    for (Email recipient : msg.getTo()) {
+                        logger.info("msg.getTo() contains: " + msg.getTo().toString());
+                        logger.info("Trying to send message to " + recipient.toString());
+                        int port;
+                        try {
+                            port = domainLookup(recipient);
+                            logger.info("Domain lookup successful. Port is: " + port);
+                            if (!sent.get(recipient.getDomain())) {
+                                replayMessage(msg, port);
+                                sent.put(recipient.getDomain(), true);
+                            }
+                        } catch (UnknownDomainException e) {
+                            sendErrorMail(msg, e.getMessage());
+                        }
+                    }
+                    lock.notify();
+                }
+            }
+        }
+
+        private void replayMessage(Message msg, int port) {
+            logger.info("Replaying message for message: " + msg.toString() + " on port " + port);
+            try {
+                Socket socket = new Socket("127.0.0.1", port);
+                PrintWriter socketOut = new PrintWriter(socket.getOutputStream(), true);
+                BufferedReader socketIn = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                socketIn.readLine();
+                socketOut.println("begin");
+                socketIn.readLine();
+                socketOut.println("subject " + msg.getSubject());
+                socketIn.readLine();
+                socketOut.println("data " + msg.getData());
+                socketIn.readLine();
+                socketOut.println("to " + msg.printTo());
+                socketIn.readLine();
+                socketOut.println("from " + msg.getFrom().toString());
+                socketIn.readLine();
+                socketOut.println("send");
+                String result = socketIn.readLine();
+                if (result.startsWith("error"))
+                    sendErrorMail(msg, result);
+                socketIn.close();
+                socketOut.close();
+                socket.close();
+                sendMonitoringMessage(msg);
+            } catch (IOException e) {
+                sendErrorMail(msg, "error failed to connect to server");
+            }
+        }
+
+        private int domainLookup(Email email) throws UnknownDomainException {
+            logger.info("Performing domain lookup for address " + email.toString());
+            if (this.mailboxServers.containsKey(email.getDomain()))
+                return this.mailboxServers.get(email.getDomain());
+            throw new UnknownDomainException("error domain not found: " + email.getDomain());
+        }
+
+        private void sendErrorMail(Message msg, String error) {
+            logger.info("Trying to send error mail to address " + msg.getFrom());
+            Message errorMessage = msg;
+            int port;
+            try {
+                port = domainLookup(errorMessage.getFrom());
+            } catch (UnknownDomainException e) {
+                logger.severe("Sending error mail failed because sender domain is unknown");
+                return;
+            }
+            ArrayList newTo = new ArrayList<>();
+            newTo.add(errorMessage.getFrom());
+            errorMessage.setTo(newTo);
+            try {
+                errorMessage.setFrom(new Email("mailer@127.0.0.1"));
+            } catch (MalformedInputException e) {
+                logger.severe("The server's E-Mail address is wrong. This should not be happening!");
+                e.printStackTrace();
+                return;
+            }
+            try {
+                Socket socket = new Socket("127.0.0.1", port);
+                PrintWriter socketOut = new PrintWriter(socket.getOutputStream(), true);
+                BufferedReader socketIn = new BufferedReader(new InputStreamReader(socket.getInputStream()));
+                socketIn.readLine();
+                socketOut.println("begin");
+                socketIn.readLine();
+                socketOut.println("subject " + errorMessage.getSubject());
+                socketIn.readLine();
+                socketOut.println("data " + error);
+                socketIn.readLine();
+                socketOut.println("to " + errorMessage.printTo());
+                socketIn.readLine();
+                socketOut.println("from " + errorMessage.getFrom().toString());
+                socketIn.readLine();
+                socketOut.println("send");
+                String result = socketIn.readLine();
+                if (result.startsWith("error"))
+                    logger.severe("Sending error mail failed: " + result);
+                socketIn.close();
+                socketOut.close();
+                socket.close();
+                sendMonitoringMessage(errorMessage);
+            } catch (IOException e) {
+                logger.severe("Sending error mail failed because socket communication failed");
+            }
+        }
+
+        private void sendMonitoringMessage(Message msg) {
+            DatagramSocket socket;
+            try {
+                socket = new DatagramSocket();
+            } catch (SocketException e) {
+                logger.severe("Failed to create DatagramSocket!");
+                return;
+            }
+            byte[] sendBuffer = (transferHost + ":" + transferPort + " " + msg.getFrom().toString()).getBytes();
+            try {
+                DatagramPacket packet = new DatagramPacket(sendBuffer, sendBuffer.length, Inet4Address.getByName(monitoringHost), monitoringPort);
+                socket.send(packet);
+            } catch (IOException e) {
+                logger.severe("Failed to send packet to " + monitoringHost + " on port " + monitoringPort);
+            }
+            socket.close();
+        }
+
+        private void shutdown() {
+            Thread.currentThread().interrupt();
+        }
+    }
 }
diff --git a/src/main/resources/client-arthur.properties b/src/main/resources/client-arthur.properties
index fdcde1f..7b4bd8b 100644
--- a/src/main/resources/client-arthur.properties
+++ b/src/main/resources/client-arthur.properties
@@ -1,10 +1,8 @@
-# TODO: replace host and port with that of your server
 transfer.host=127.0.0.1
-transfer.port=port_range
+transfer.port=11620
 transfer.email=arthur@earth.planet
 
-# TODO: replace host and port with that of your server
 mailbox.host=127.0.0.1
-mailbox.port=port_range+3
+mailbox.port=11623
 mailbox.user=arthur
 mailbox.password=23456
diff --git a/src/main/resources/client-trillian.properties b/src/main/resources/client-trillian.properties
index 0b757d7..818d9ed 100644
--- a/src/main/resources/client-trillian.properties
+++ b/src/main/resources/client-trillian.properties
@@ -1,10 +1,8 @@
-# TODO: replace host and port with that of your server
 transfer.host=127.0.0.1
-transfer.port=port_range
+transfer.port=11620
 transfer.email=trillian@earth.planet
 
-# TODO: replace host and port with that of your server
 mailbox.host=127.0.0.1
-mailbox.port=port_range+3
+mailbox.port=11623
 mailbox.user=trillian
 mailbox.password=12345
diff --git a/src/main/resources/client-zaphod.properties b/src/main/resources/client-zaphod.properties
index f4f6aa7..513d1a4 100644
--- a/src/main/resources/client-zaphod.properties
+++ b/src/main/resources/client-zaphod.properties
@@ -1,10 +1,8 @@
-# TODO: replace host and port with that of your server
 transfer.host=127.0.0.1
-transfer.port=port_range+1
+transfer.port=11621
 transfer.email=zaphod@univer.ze
 
-# TODO: replace host and port with that of your server
 mailbox.host=127.0.0.1
-mailbox.port=port_range+5
+mailbox.port=11625
 mailbox.user=zaphod
 mailbox.password=12345
diff --git a/src/main/resources/domains.properties b/src/main/resources/domains.properties
index 622fcaa..d0447cb 100644
--- a/src/main/resources/domains.properties
+++ b/src/main/resources/domains.properties
@@ -1,4 +1,3 @@
 # =
-# TODO: replace ports with the ports that your mailbox servers use
-earth.planet=127.0.0.1:port_range+2
-univer.ze=127.0.0.1:port_range+4
+earth.planet=127.0.0.1:11622
+univer.ze=127.0.0.1:11624
diff --git a/src/main/resources/mailbox-earth-planet.properties b/src/main/resources/mailbox-earth-planet.properties
index acf1724..aa22a1b 100644
--- a/src/main/resources/mailbox-earth-planet.properties
+++ b/src/main/resources/mailbox-earth-planet.properties
@@ -1,10 +1,8 @@
 # TCP port used for the DMTP server socket
-# TODO: REPLACE with real value such as 16502 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-dmtp.tcp.port=port_range+2
+dmtp.tcp.port=11622
 
 # TCP port used for the DMAP server socket
-# TODO: REPLACE with real value such as 16503 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-dmap.tcp.port=port_range+3
+dmap.tcp.port=11623
 
 # mail domain managed by the mailbox server
 domain=earth.planet
@@ -21,5 +19,4 @@ root_id=root-nameserver
 registry.host=localhost
 
 # RMI registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
diff --git a/src/main/resources/mailbox-univer-ze.properties b/src/main/resources/mailbox-univer-ze.properties
index f07c01d..db4fbf5 100644
--- a/src/main/resources/mailbox-univer-ze.properties
+++ b/src/main/resources/mailbox-univer-ze.properties
@@ -1,10 +1,8 @@
 # TCP port used for the DMTP server socket
-# TODO: REPLACE with real value such as 16504 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-dmtp.tcp.port=port_range+4
+dmtp.tcp.port=11624
 
 # TCP port used for the DMAP server socket
-# TODO: REPLACE with real value such as 16505 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-dmap.tcp.port=port_range+5
+dmap.tcp.port=11625
 
 # mail domain managed by the mailbox server
 domain=univer.ze
@@ -21,5 +19,4 @@ root_id=root-nameserver
 registry.host=localhost
 
 # RMI registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
diff --git a/src/main/resources/monitoring.properties b/src/main/resources/monitoring.properties
index 8aff76c..b8a7ee2 100644
--- a/src/main/resources/monitoring.properties
+++ b/src/main/resources/monitoring.properties
@@ -1,3 +1,2 @@
 # UDP port used for accepting monitoring packets
-# TODO: REPLACE with real value such as 16508 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-udp.port=port_range+8
+udp.port=11628
diff --git a/src/main/resources/ns-earth-planet.properties b/src/main/resources/ns-earth-planet.properties
index fae2722..870b7b5 100644
--- a/src/main/resources/ns-earth-planet.properties
+++ b/src/main/resources/ns-earth-planet.properties
@@ -5,8 +5,7 @@ root_id=root-nameserver
 registry.host=localhost
 
 # registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
 
 
 # managed domain
diff --git a/src/main/resources/ns-planet.properties b/src/main/resources/ns-planet.properties
index bb5b73b..5acd6e8 100644
--- a/src/main/resources/ns-planet.properties
+++ b/src/main/resources/ns-planet.properties
@@ -5,8 +5,7 @@ root_id=root-nameserver
 registry.host=localhost
 
 # registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
 
 
 # managed domain
diff --git a/src/main/resources/ns-root.properties b/src/main/resources/ns-root.properties
index c8ca59e..896f7f6 100644
--- a/src/main/resources/ns-root.properties
+++ b/src/main/resources/ns-root.properties
@@ -5,5 +5,4 @@ root_id=root-nameserver
 registry.host=localhost
 
 # registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
diff --git a/src/main/resources/ns-ze.properties b/src/main/resources/ns-ze.properties
index 1dee980..5972e75 100644
--- a/src/main/resources/ns-ze.properties
+++ b/src/main/resources/ns-ze.properties
@@ -5,8 +5,7 @@ root_id=root-nameserver
 registry.host=localhost
 
 # registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
 
 
 # managed domain
diff --git a/src/main/resources/transfer-1.properties b/src/main/resources/transfer-1.properties
index 0b87450..ec15c27 100644
--- a/src/main/resources/transfer-1.properties
+++ b/src/main/resources/transfer-1.properties
@@ -1,11 +1,9 @@
 # TCP port used for the DMTP server socket
-# TODO: REPLACE with real value such as 16500 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-tcp.port=port_range
+tcp.port=11620
 
 # UDP socket address of the monitoring server
 monitoring.host=127.0.0.1
-# TODO: REPLACE with the real value of the monitoring server port
-monitoring.port=port_range+8
+monitoring.port=11628
 
 # ============================================= Required for Assignment 2
 
@@ -16,5 +14,4 @@ root_id=root-nameserver
 registry.host=localhost
 
 # RMI registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629
diff --git a/src/main/resources/transfer-2.properties b/src/main/resources/transfer-2.properties
index 11757ab..7b8e1a5 100644
--- a/src/main/resources/transfer-2.properties
+++ b/src/main/resources/transfer-2.properties
@@ -1,11 +1,9 @@
 # TCP port used for the DMTP server socket
-# TODO: REPLACE with real value such as 16501 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-tcp.port=port_range+1
+tcp.port=11621
 
 # UDP socket address of the monitoring server
 monitoring.host=127.0.0.1
-# TODO: REPLACE with the real value of the monitoring server port
-monitoring.port=port_range+8
+monitoring.port=11628
 
 # ============================================= Required for Assignment 2
 
@@ -16,5 +14,4 @@ root_id=root-nameserver
 registry.host=localhost
 
 # RMI registry port
-# TODO: REPLACE with real value such as 16509 - considering the port range associated with your account - you have received after Lab 0 a port range (beginning_of_the_range, end_of_the_range)
-registry.port=port_range+9
+registry.port=11629