From 25aaee5a663cbd597df76ac0a8bfa18f5cc2b502 Mon Sep 17 00:00:00 2001
From: jonnosan <jonnosan@93682198-c243-4bdb-bd91-e943c89aac3b>
Date: Mon, 9 Aug 2010 12:05:15 +0000
Subject: [PATCH] git-svn-id: http://svn.code.sf.net/p/netboot65/code@265
 93682198-c243-4bdb-bd91-e943c89aac3b

---
 client/Makefile            |  14 +-
 client/basic/kipperbas.d64 | Bin 174848 -> 174848 bytes
 client/basic/kipperbas.s   | 298 +++++++++++++++++++++++++++++++++----
 client/ip65/tcp.s          |   6 +
 client/ip65/telnet.s       |   2 +-
 doc/CHANGES.txt            |   3 +
 6 files changed, 295 insertions(+), 28 deletions(-)

diff --git a/client/Makefile b/client/Makefile
index a7bbbbe..ff7f533 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,10 +1,10 @@
 TARGET=c64
 
 
-.PHONY: ip65 drivers test clean distclean carts examples
+.PHONY: ip65 drivers test clean distclean carts examples basic kipperterm2
 
 
-all: ip65 drivers test carts  examples
+all: ip65 drivers test carts  examples basic kipperterm2
 
 ip65:
 	make -C ip65 all
@@ -20,16 +20,26 @@ test:
 
 carts:
 	make -C carts all
+
+basic:
+	make -C basic all
+
+kipperterm2:
+	make -C kipperterm2 all
 
 clean:
 	make -C ip65 clean
 	make -C drivers clean
 	make -C test clean
 	make -C carts clean
+	make -C kipperterm2 clean
+	make -C basic clean  	
 
 distclean:
 	make -C ip65 distclean
 	make -C drivers clean
 	make -C test distclean
 	make -C carts distclean
+	make -C kipperterm2 distclean
+	make -C basic distclean  	
 	rm -f *~
diff --git a/client/basic/kipperbas.d64 b/client/basic/kipperbas.d64
index c064736e5065a94a5477a99f4dfe403d444b7bbc..951fc3d5b9c6c549618f9592338e75ae463cf286 100644
GIT binary patch
literal 174848
zcmeI&dw3L8o;UF7bP__sr31LzI<iw<xhNP}E)g9k_ZvkLa^a2^G=*uK2-T?(5fDWK
z7&&biXGdYDF?JH5BGr?qGqbo)&(@6VY&tW^l*sPRJnu_}9Y=^4dP;W`9CzM+f2TS@
zaNR%VkA0r^efG-(-BqXRoI2-o?$rna{y+c%5P$##AOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<
z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##
zAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|
zfB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<
z00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa
z0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bcL|C)eDaAoCWy*=*8yu5{X
zQs(r(jbycU?(NcrNI`4&-lMIH_U7|rb~vj;I4jtb`Z^DG_gkNx>pFLI!1~xYoMmS_
zLBBYhWqqpeh-8V0!bnCe-5ox=e!z2)4nJ8RPIuFxI7#Zw&;|B}D%KW?B}XN#YxeBf
zqPV28wzjlR6pIS$D~rWD=jMqbh0mUtEePWIURikD)BJFrdE8ZyOeO{Tc8wX*c`{4<
z&H9dvr~1St1-&`qLj~3!4*kicC*`Ak;m=(oCqH-5mwmq9^M{Dg)fYRz!S=?__FnVr
z&s|n}|A>_s@wg~3ezyJ6i1lw?xvQ_AqS)8RpS3)?(E6%#HtEe*txxT9anb&5{6_nI
zneP5(Jkfji&6D#M<-hlvo~J51gaJFJ|70qme(Pg?bkG{F*NCT*dbO27=XsfQ+;6>0
zPaoG+IV-vOx9htqCE=LZB4ov%vC{Ojl<aks>|e|jKP!-;$12Ze_rw<aDq?r}Dx?-+
zW?YcY9}|xl;&vhaw4I?J6O&OoKDyp=OLyzNZmHvVQxgS9?-W$DRp_T$OZ7Ke%S54|
zLufi!-cSD=di_nhaLT!$3&#(Zd(!%iH`IgWa%<n-S2~2gKJocNeXe+JeTVCc<FqS|
z-OjOG!Fqj{D9Jt_d&L*Yn$+tv`h3lF*5@-`@io7~g9ogUUp3`r#k2FSk8jM&q3~Ig
zz5YB(o$jroKbKF&!Y^mT&LOXJeb&F9d&T;_%**|((RJ;C7N0I0n!j;>-*x=cb4lv_
zVe6}VUlY@d^!bsE;@j1|8Decs`#AkTWP{XOqz^>YNczbE_28@h1J*^k<Fy0l*LV01
zjI5VMsYraFQ1`e6%8ve8#3v;Rd04PWT33|9c%g!v7t`gY<5cEQQNNjKeIQp<@SOL=
zK3~tT%$huQ<fItlv8e~>R%8Qx5v_QvNK|EN@%b{<4i)Q9yxQz^@yL&4DeL?CH0MTr
zO~gm{)1CTFser{1MfCHi`n*&?0R^mZ0t!<BC6@zgQvns11MW`+NS6a1N(Izj4%n3n
zXz-+u1xZT^#Y(AtB6U;Bt^Pv?kOF0WS;VB?+3u1fZn3{8^r}zKNyR4JRF=da-`{(!
zIG?wiQ_1e1$G>T3487{JMkxCdrFDbUQ>;_|C9z1SJn=8eEB~T0@UI5vivy%8venod
z<%%NjKr{IV-9eAiXVEbw8ga)OlyE?!QAO5Yq|BTv*7rwBL~kRt$oYz1z+Us|i`fr+
z9m)Qa^EV#)q0hS5->=_(=rv!zUh90Oj#qdx_!$fO#GfvsX46M$^%jXOB|O_{;u}d>
zj3xE7qpx?QiLWOmGs#<qQ%YmLVr3gaU*xq8pSZmwk|xHJ#um-WFt%#;^bX!*oCchB
z?iC6i+M>k;>o-GNHL1HKB1rM1e%#5n(c+8D@7PEw^rm;W+ZmB`X;GK{N2e^}-!GFk
zmhe&7c_I~UtB<KZdeqO7;xCgO!oluy-B#MUqlv9P%biethU$x_*%{)GlJ;*R0^Mb7
z^+i=5Z+N54E=O!L#EU=bo_6#ar}b5NGRG=c{6?wx^_67s_o=S)zf*NAumy@&)_)Z#
zWwXrCY*SobN-aVBOm6dwY@tF2A1+j^Oi{Q`Vx{5?$ylJ+S^BS?$g)`Uk$ooO3e7MF
zLNiS^f1}e&|85lxSB%Cd=RwAuW;|(S>MnYaY|J&IcbL3O8+j&Mq|il{uh6*kD%X6K
z3j3Oouh^4}MT+Gf%2$RKDbnYq^l7{4TPC7>MPC>xOXXEsUYekD8W}j^XxcQnQQFZv
zO*{K+((;T;r(0w_S)o_b$T&1MWLD6asn6#h8xNK@QN0LaR~g+FN%CgSA0w_S<HdbL
zrAOBmQm&|4=NGcOD7RlRPu``B&69U2)~B*g-J4X?X_DoWEuA^lEK(X>Wi);hD_f<6
zRx3?CP5BpADQy>4E3z1;0*ZH3oSkGXF@09K?&2qcb+6tQY3vZhf(m_4B%@;@KR6Lx
ztem)8;fF@_9_7S0oWp4JUgg9$ox`UiZ}TXgtO~E3FY7n6v|*|O_pp&MJZqwrmM<IQ
zhmEXZ`ebXB9y(%c6n$OmF<ogr?v!vUg&jQBPdCt~_3^pm1J(s&jZ)<oY!AQx^0fi$
zBPwc~O&BJ(iNnT{0Gl*yNC7r^IG&j|PJfD41eAmPD{>G`AFk@n6z5b(@0ROJBZ1aq
zd+DK3DPT|SJI1nx`{{H1@YqwMO9J*3Cw#!p9=$YRCA@MrPg0morJ@8+WDH*s5K13D
zKmifY_zXQ6UK$wi{86U0%3>v4PsbN!wmP6^u~h*QkJN<ARJyJw*%6gSo)V=pNiEi$
zIHHEXt4^;_!iVYd2<hFe%0`hor&yg+qRuH*>89*RX80Z+*(*nnsIek-`ghechgB<M
z!1Hll4kbphi|G1Aaam<=PDe(ce&`;R<~7;4TaCNy9OFeb+M$XgWxb8!vI=o+g;-NX
zit7XPv<-n&hJ68D2scx%Kc@5wl(0WQ&k46sz(@LQwuG)SDImUHuBTB3sbP8jBkV=B
z&F^L%YQ861*2^MltG>4<lGTyfr`y-}>A${5wZ`?E+14Mta<}gFXSeF@Y3F(dtYK;v
zs$%6BL4|UcNrTPmd_EXIshlZLENQ^=iQYm3b#4{qtVJPK$`?2FQDzcX=01(*-W}Vn
zP(D+6{&H@;4ndmr;%JH~-W1dLllQ0xb<U*UGn)7Du{~<|fEs&54ewE752@it)YwKf
z{E!-3t%f(Mv062}T8)*d;abvuyJI{-mvLxMj;v>jO%;T+hNG_K)xM6K-51a^+5G`M
zoyoivuozWtOtr7+8HoKr9o(Z>S+SGq;1krZ2Rs+_{Z1o}87lMnVtp#x=o2^iyfXW-
z8u|zI1jW1FOt<qogp(Ba$EuZelH&e@YX4RLFJh|oej=tG`hnVZ=%i}Aq#iO<BcdMa
zQ>oYN<H_b<k<7IHUrHfkzvn`}{6b~Y+e}ZH-gEMYJgJkftCZNuC{OI<D?Bk;|NL$!
zMrk?&&Nk{(d`NuRGeM1>P-$$V+UQin4>+~KtLr1<n98;WjN>ZX5-@a?1p`Kp%G7|K
z%QkbLZw1)H0Tu}8K1%ERdwY$SRj)sbX#w_7;J9%@^$V;ez?uU+FL?bE+Fc{!T`MR~
z=wV*(^rQei<D%HT+|UBimVnnkjcy_H5ZTX<Od<G?%pbKeAe~xHjkft~rz@I&qK?n%
z*|kpDMg7&f*wfT(s!M-Li>tS2om<|Xskf4rES{1@wL<)PqgNJJmG^oKzY@=~#v2bR
zc1}FgcFBpKsM7Ar#7|Y}oyLe~qMLe8fx`Q@i~XajcSM%5m();1rL~D5zFb9<9ToOX
zRa~>wcvJPe*gvUs-p@Ny=w~X;0OGXu^yt0((Yi3$uUZr7(uY4&?RSR$NwwZiys1*W
zc#dbb@sGSqPo_?j6L;Ga;~Dm3Ns}mD{<*E1KAlH?TqWyIP-@~oOEfCFm>i^!^+9Tk
z8-ny?UohhKw)tJ*jX?sWfTkex2ib!`76?Wrhc{E`A5-JPPJTngq~bjj9I*bV`<T?C
z?_o<@^m<m^LZ>w?dWmOJL}16%&~a5SrXyVq^-wvugm_-kAE$I9<73Y+4cE5t#N0Gi
zcJkp&|BP;aSq+^~bvY6g?_I)~(kPa^z~x%xcDXZ?#y*9L%Jl}HS1ejQrpKOF9O;V@
zA+~K3A3~)K)$s+^B&o4FwtbUxHyy@Z*4OBil_;@CH?dMBwqp}3Q(`+ev2ul9cBd{^
zIF~D(%T><hCC=r{)Md%Jywtf|?Od*LE-y@7u5~UiQ#_M-@^#J)_56l5uRm?qBb$2D
zd!*P>aYqHOwG7$^xT$dD(oYSHU>3027CKwjLg95S`aD+O5=jp=v<&dUtdU#k3)w0j
zwwl6fmGGLDQM!-W{Vg=7xUSOc&D1kEp4|HK-V<WUvff-ud=1rfY;7<+z~=|KgW?=m
z6Fgw42i{T-tP1wMY-h#qu+!s<t&GH~pp_n<YfW#fFf29tmKuJWH&RP&>IuE28mof#
zc<G)R3QSmP|45!k`crl6lxk;E)9`rSR!3-{Nln7WnxLJ=hn-06XeU^Zh^x`KI@%Fj
zte&^QQ>ys88sil24UPPKd64&phTzq`!Ke>XJD(X(x93nBSRPDujE127tD(lA)lW$z
zPN|eie4J;3w6jKEz@Nig|LB3!3uwX_Qlr0ANBjaCQbWH~sXv6MH@K+%Z3u>Z^mww|
z7z`==NMM_Sp$CH0Cqho22vMI9VsER|Ek-<9P9de%T3U&JKt<mi3_ld~kaV~?7~T@3
ziuYV@)I1BRZb5Y*DNdums4t-FP7fJv^i*wWBtq*aqfMDLIWE`}*oq)q8Kg;rf{g<T
zTOFi6@0Px?%m~qnmA)erV*3<(g12qgKE?0q>D|%(`;pjwnoeVF^kHotp+9to$46fj
zoMGKT8O!eJ5O}nlyz358ef8&+dTctN70HTVh#u#nDv;^+9_jsBN@Ru;g(9#4l|tFi
z)!5St`-Mu6V1p_(S*k@Ig<^ZAP<)wf@`WDoMT9oCHYk2)85Lx~tljas_Koqy_HES4
zX5_z@*FH0z-FvgQBYW4{VDI(&txMsxL8*4x$k}vz5@|XoXWbSxAKK|EzQiWJCwagp
z>;DpIppBXFlooB(*j_EPPopODl*U@=JCY{-V%gX!RpcHm^rS|4`xd_@u<cstQO)pc
z(FZlwqJ=a~|8}H4)iNXgM3ZJTX}o1-(m=(B-)y!`qn6k<>k@mIKjab3_?AW<nc`D*
z(uz95%#QeZoR6#W<#@U^Nwhsv>w3qJ1<EwGWQytabT7piZOvKE*e=bjGak{b&Q$V)
z4{P?>p>3M=oYP3@qLXK1j~0DWOSRC5t0PGjCG{C$IcR;tPfj-a`0=MBZDZ}sdGO_S
z7SKl9S?O1`vu|lKjo!{uS%}c0#OVg<bf>C?f?9ODW<08;y2KT!8oM;ssTz-ItV=a^
zYph!}9@p4WHM&DHc52j^J=18wH&iVe)UFzlWMjLQ*sf6(KB`fJq59ysR7x`4twbMJ
z*bXhUQ!}<H(MJ@vOA9@w8QYcUqYB%tg&x;r!)d!YG^|n7CwcAASm2f_8mL;H(7aTq
z%@1nU^~PqO^_RvoN|d^aUkhEXW*6NQZBqt5+^$iq_6D)O-grWzS^Oy_|Gf#)rF!RJ
z65FB~Pb%-x##rN*$LY_|i-f5SI-~s*-&bvj1f6Bh7A?AUv|ebb<Mdv?PqgcdCvydw
zrK~ziE<V9pVi(b9#h*vd9(%ODktR65j~*4;s(JnCe4XNuQww#cs)2Gxt%f%Kl+?IH
zt44oi+VoQ+=Pv`?bV>sP)gMhQ6r1PFXwjmY_C?+(S6+(I+``*AMQYYGrfITsL+VzF
z<Tdtb_ANA?+%U9HqrbfSq_RcP6PiYUDGe$qt)2I3(S4e9sewJ{3k7_M&D0MCw%Mn5
zM;atAZ5I2w-|Doc_V?ww_`!sJ=RCvtlHcsK+-+}m$!xzCdRoix?!2&HYwhgry708t
z+9i8=WVQ2PC*Ay?zxZV*w9Wa{Qzxk}xyKf}J1N!fF7~uGU{CROcQ&VzZsti#y^XXw
zrAJU!zpb(7H1-{h{f#CT-Y1?}A+}V>;`rt5v@;dgFYo=#(D-oamdfvoXVTX%*Ti$_
zYddvpBcQ}ft#acb#p|EM4roTR;ujdxXmgr>flk*d7nqhegElfWd*-GUSbs&^8S7d-
zK#hjhvGhhxptUMZ5}CBOrr|8{ZQc!@(`Yp&u#jf#PzGtUbDgnM87x$+DaI~ku!z44
zdQ2HCR-6dVO>=fCb9O0n9#i5;`-8-Hcp87h(<tQ|4S{bo3iv*brZIlRH*rh}uuXh<
zOlyb-`0|)<tpb734Pr+HUt_IFEw)E9NijkcBO`W?N}H{*-Rnp6mY}J^xGzxEK4rFl
zO>3vIF5nNec6A6Z9PG@eaAH{!;DG|mbxQ&1^>Wsxg`S}X#h%qzyJkG2@x6+-@B7Vk
z{;bwd2krbqzxCm{-l1nS>s{knjbcBm8SVVLUF%I4ZCX|Pbtl@i{e9o}rsB0{CE9tp
zpVfxiG;bDNGX?wFnfvLE)D4#t-k&ACv|{F0B-*Z3CVMEnGAYZOXPIn{8JcU-Fyt{Q
zv$ZC>-DLAj_SdHP`z36?8Cqb9zgv0rGDLR`dQAHR>7Q51tilXcI=7aYp>mTZZ%=Oe
zf0Ynjy^UYH$z(U1R1sBX_!=`d&kSE{^4(FH87((it{IwQ8Wm==(qvQ3&@@v#yxOQW
z{VrBx@-<Pld39zCk4a<1t#s+bYLj*dHKz5eM6F3t;^RDSscI!Xkc!6F|J0D_W@>@d
zX68jqXFQ`-kGQXqGDF!|NZGhZJ)LfH+vA*gv~pYc#hqkBH`5-97lY=Bo6OJ^1zBu{
zr&DoqGg1Zm;Lj<L^Gqu=T8acO#XDD&B6ro5rC_(1p<7eg7ml+TCYx#Yb<%#IuhY&<
z%rN_{PmNp5=&fezzEp80=xw7j9o6wznT#1`bf!}zFBK_umMYX}0ymhU8~@yz%FX=G
zb(Q1H_)ZyQy=WAa!_tmfoZD!RRiDKR{^k`0|Ls);AFH*?`KHRc!HnLRvUqZI2Y!<o
zz1d9dzppW`+JEPoeE&Vg<ooZbCf|QgGim=FanoAxTJum#K=<5!n`x!%g6)n?HxF$K
z^bdI6)oa;~fN`72cJlWZv{UDc+FgOrV|;+w9bk`NwP(L6cbrLkZ)eMXv*{PUv|ryH
z2tCdRB+A+4{koH3uYcxO?bkC?`}Hpx?zYj1xatc%{%X-#K{)eZr5UX-#i~Y|2S1@i
z_c#-`QEo=d#)7F;r{8`+v2Pc5uj#$j*rLSe(`dU@iBF*cU$`&T)}E&JLd#)#X?&+C
z4zJ*AZ@NC8qO`lE_&T1WH0wrgck)Rkyx1hFPwBO*nVb5xGu5$Zq2n=mk{)^<B|flr
zEWQ(QAHAzHdGvdEbel(adgZ;B3uo2PtV82%v(nl{s~Y|T7tJQE6U4ekn)vcen)vQC
zt#REn!BXPh?g{<?qv4FtPj~Qak0oh1FQ}>a(rb0ymC8)Px~noXmJO#AU&@9}6U7%6
zDWI{;@{N--Fc`O+_B1_r{MBQN?vc{&({t&A3#Qp_DY?$rqYTb5t<_XNgL6%b*1Cf<
zqGs~!@ZW^SNMqZSaFrut%rT>LP38=;1}zmUOsa8KX*#}RW#n5pK0ZyMXN@H?JykE$
zM`1_rnD*rnj2?6iAN_c$(@g$^sU~HP(NMfcp)r{TVOiEaUyha<!BYd@!qH(bH~YUD
z_@u+DN$v=(<aW~wBzuN&M6)MHk7xt2?`ea(6`Nk+ev&W8UeMS>zSv=nZSjfCKI-Bj
zjkjf*lh^Tg$uS>)4N4OR?fWQTX<+2THH!5I>QhvRKp?gwHPzFU&Aa&%v}DPmKHlz5
zP<LOW@M(IjLa%S>va>k&%K4w(?ef>lnw@(#&AuTbocW$+UpMmM5zYD}aYPG$Pcy!&
zg<sH&=e6)*S{vp&_l_Unw`Jt!40tZ(%WeGqA*Jw_$75k0BX)?#i2W^(F|yx!f9MEB
z>~No4W*!Oz_S4&qEXporYHNUUOG6WX)u#m#%T1c?8%?9pj4n4*Z~Lfqtd#9cJ~~;S
z(5t}f`HNM7zhd2zTFOvZmb2obltMxN4t8UJ-V4%eKf0~a6szxVpFuMXTVaM)^4Zi_
zVMbS){&_V1@b}^u_zjuP&WQgimAXx@ipcD{TIhLN(uf!M5V72ey4;Mr?60R%;2Z6c
zk=zL*PBQN}b1vO|?fo?0@-Ip(|H2BhqV2*;v!{tFwpAHyG_4HE;Br&;Z(X=RoFi&Y
zinwq=-aN6gR&3GM`vQVKQKFwKpW`2snfEk3I^(o%v&_>(=02_GG2yg+J#(Gb3t9SU
zBl8S<QA@n2(ZS%0nsvzur8wTxa)myHe)DRgfBLs6HN!PL-o;$QGVOIIone#D=;vws
zk$xtWafbgY#WK%?#+{);Ogf|ggs#fQxHEj^lu4h?&v2j1d?iA^$6b>7547|$rsyN<
z^X}Y<{MTA)$X@wCL}MLV=q0`k?9#-H^{i8iPqUZCC)$gQE^RQP+3y=2TJ$B_4D6-F
zWOtW6ktXqf8SK>T^nPjGdZSZ2(WM>g)+o=3E=^jro=)u?`o+Fm^U}^k<1b3OXhBF<
zhPwE@&Lw>s-A_Tc-*D56nX_h#i|@GQ)^FZ+^PIw>;*!#`@`}o;CDPLBn%ZS`^$m^7
zSFBvMdhVU`{(Am`g^Tj<$`hp2{{~^nWFqKGoTvW|k)U7qZz_1M;A}zO<@-`;)mB!Q
z(_c}jtZpc+D=RE66>}$v;$l%)T39R=mXy?$(oT*}sW!*X_-S=%!_va~B_jVrr{#qW
zr7H?ojh&WM*NgR~b<6qxVWF!f6~(n<=XBao)^O$NShDn_8mY0NvZh)nFKuXWa#h<n
zdcfm2=?KL&)zziN4MIa*VRik|%KCa9K`gDStEm%j7D_7XM{g)CnJ842ovo}bE-U{x
zo`c`=vc9u)Rb}n(Msxq}XtvK$e$VqKj5L(J^q$bzP)5&vpKdBHZ1|v|xVHEpf8vL=
zHIj5em{|C~iZ&JREdFWnzZP4?@#5j)ua#IOJ4<gWd!nqSxS_N`sH>YpaRn)vG?GbK
z>ZU_MaA^L&_!#@YMEHgP1Rwx`|5*Z4T!q54|C9XsHOW8!-?U_MGS|u!9{+moe<a6E
zO@8&iDaoY!tN!IClddoStE;SCSu54lm3EB%$;<1QSIAHPdnzWmXY#bv|G=gHe>=Cf
zuKda;-SXe_Or#0{2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z
z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=
z5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHaf
zKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_
z009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz
z00bZa0SG_<0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<
z0uX=z1Rwwb2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb
z2tWV=5P$##AOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwwb2tWV=5P$##
rAOHafKmY;|fB*y_009U<00Izz00bZa0SG_<0uX=z1Rwx`QGx#p6u4E3

literal 174848
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
O2tWV=5P-mt!2bYjNETTD

diff --git a/client/basic/kipperbas.s b/client/basic/kipperbas.s
index a67cfcc..b635bad 100644
--- a/client/basic/kipperbas.s
+++ b/client/basic/kipperbas.s
@@ -34,6 +34,8 @@ NEWSTT	= $A7AE
 GETVAR = $B0E7          ;find or create a variable
 FRMEVL = $AD9E    ;evaluate expression
 FRESTR = $B6A3  ;free temporary string
+FRMNUM = $AD8A ;get a number
+GETADR = $B7F7 ;convert number to 16 bit integer
 
 VALTYP=$0D  ;00=number, $FF=string
 
@@ -79,6 +81,9 @@ crunched_line      = $0200          ;Input buffer
 .import tftp_set_callback_vector
 .import tftp_data_block_length
 .import tftp_upload
+.import get_key_if_available
+.import tcp_send_keep_alive
+.import timer_read
 
 .zeropage
 temp:	.res 2
@@ -314,8 +319,18 @@ list:
 	iny
 	bne	@loop
 @done:
+  lda keywords,y
+  cmp #$91    ;is it "ON"?
+  bne @not_on
+  lda #'O'
+  jsr CHROUT
+  lda #'N'
+  bne @skip
+  
+@not_on:  
 	lda	keywords,y
-	bmi	@out
+	bmi	@out  ;is it >=$80?
+@skip:
 	jsr	CHROUT
 	iny
 	bne	@done
@@ -547,10 +562,9 @@ get_ip_parameter:
   jsr dns_resolve
   bcc @ok
 @error:  
-  ldax  #dns_error
-  jsr print
-  sec
-  rts
+  ldax  #address_resolution
+  jmp print_error
+
 @ok:
   ldax #dns_ip
   ldx #4
@@ -562,11 +576,16 @@ get_ip_parameter:
   bne @copy_dns_ip  
   rts
 
-print_dotted_quad:
+
+reset_string:
   ldy #<string_buffer
   sty current_output_ptr  
   ldy #>string_buffer
   sty current_output_ptr+1
+  rts
+  
+print_dotted_quad:
+  jsr reset_string
   jsr emit_dotted_quad
 make_null_terminated_and_print:  
   lda #0
@@ -575,10 +594,7 @@ make_null_terminated_and_print:
   jmp print
 
 print_mac:
-  ldy #<string_buffer
-  sty current_output_ptr  
-  ldy #>string_buffer
-  sty current_output_ptr+1
+  jsr reset_string
   jsr emit_mac
   jmp make_null_terminated_and_print
 
@@ -619,6 +635,22 @@ emit_hex:
   jsr emit_a
   pla
   rts
+
+print_hex:
+  jsr reset_string
+  jsr emit_hex
+  jmp make_null_terminated_and_print
+
+print_error:
+  jsr print
+  ldax #error
+  jsr print
+  lda ip65_error
+  jsr print_hex
+  jsr print_cr
+  jsr set_error
+  sec
+  rts
   
 get_optional_byte:  
   jsr CHRGOT
@@ -631,6 +663,7 @@ get_optional_byte:
   rts
 @eol:
   jmp $AF08 ;SYNTAX ERROR
+  
 ipcfg_keyword:
 
   ldax #interface_type
@@ -692,8 +725,8 @@ dhcp_keyword:
   
 @init_failed:  
   jsr		set_error
-  ldax  #dhcp_error
-  jmp print
+  ldax  #dhcp
+  jmp print_error
 @init_ok:
   jmp		clear_error  
  rts
@@ -819,9 +852,9 @@ tfget_keyword:
   jsr tftp_download
 after_tftp_xfer:  
   bcc @no_error
-  ldax  #tftp_error  
+  ldax  #tftp
 @error_set:  
-  jsr  print
+  jsr  print_error
 @no_error:  
   jsr   close_file
   jmp		set_error
@@ -944,6 +977,198 @@ tftp_upload_callback:
   ldax bytes_read
   rts
 
+skip_comma_get_integer:
+  jsr CHRGOT
+  jsr CHKCOM  ;make sure next char is a comma (and skip it)
+get_integer:  
+  jsr CHRGOT
+  beq @eol 
+  jsr FRMNUM
+  jsr GETADR
+  ldax  LINNUM
+@no_param:
+  rts
+@eol:
+  jmp $AF08 ;SYNTAX ERROR
+
+
+make_tcp_connection:
+   ldax  #tcp_connect_ip
+  jsr get_ip_parameter
+  bcc @no_error
+  rts
+@no_error:  
+  jsr skip_comma_get_integer
+  jsr tcp_connect
+  bcc :+
+@connect_error:
+  ldax #connect
+  jmp print_error
+
+:  
+  ldax #connected_msg
+  jsr print
+  lda #0
+  sta connection_closed
+  clc
+  rts
+  
+netcat_keyword:
+  ldax #netcat_callback
+  stax tcp_callback  
+  jsr make_tcp_connection
+  bcc @main_polling_loop
+  rts
+    
+@main_polling_loop:
+  jsr timer_read
+  txa
+  adc #$20  ;32 x 1/4 = ~ 8seconds
+  sta netcat_timeout
+@wait_for_keypress:  
+  jsr timer_read
+  cpx netcat_timeout
+  bne @no_timeout
+  jsr tcp_send_keep_alive
+  jmp @main_polling_loop
+@no_timeout:  
+  jsr ip65_process
+  lda connection_closed
+  beq @not_disconnected
+  ldax #disconnected
+  jsr print
+  rts
+@not_disconnected:
+  
+  jsr get_key_if_available
+  beq @wait_for_keypress
+
+  ldx #1
+  stx tcp_send_data_len
+  dex
+  stx tcp_send_data_len+1
+  
+  sta transfer_buffer
+  
+@send_char:
+
+  ldax  #transfer_buffer
+  jsr tcp_send
+  bcs @error_on_send
+  jmp @main_polling_loop
+
+@error_on_send:
+  ldax #transmission
+  jmp print_error
+  
+  
+netcat_callback: 
+  lda tcp_inbound_data_length+1
+  cmp #$ff
+  bne @not_eof
+  lda #1
+  sta connection_closed
+  rts
+@not_eof:
+  
+  ldax tcp_inbound_data_ptr
+  stax temp2
+  lda tcp_inbound_data_length
+  sta buffer_length
+  lda tcp_inbound_data_length+1
+  sta buffer_length+1
+  
+@next_byte:
+  ldy #0
+  lda (temp2),y
+  jsr print_a
+  inc temp2
+  bne :+
+  inc temp2+1
+:  
+  lda buffer_length+1
+  beq @last_page
+  lda buffer_length
+  bne @not_end_of_page
+  dec buffer_length+1
+@not_end_of_page:  
+  dec buffer_length  
+  jmp @next_byte
+@last_page:
+  dec buffer_length
+  beq @finished
+  
+  jmp @next_byte
+
+@finished:  
+  
+  rts
+
+
+tcpconnect_keyword:
+  lda #0
+  sta data_arrived_flag  
+  ldax #tcpconnect_callback
+  stax tcp_callback  
+  jmp make_tcp_connection
+
+tcpconnect_callback:
+  inc data_arrived_flag
+  ldax #transfer_buffer
+  stax  copy_dest
+  ldax  tcp_inbound_data_ptr
+  stax  copy_src
+  lda   tcp_inbound_data_length
+  ldx   tcp_inbound_data_length+1  
+  beq @short_packet
+  cpx #$ff
+  bne @not_end_packet
+  inc data_arrived_flag
+  rts
+@not_end_packet:
+  lda #$ff
+@short_packet:
+
+set_input_string:
+  pha
+  lda #'I'
+  sta VARNAM
+  lda #'N'+$80 
+  sta VARNAM+1
+  jsr safe_getvar
+  ldy #0
+  pla
+  pha
+  sta (VARPNT),y
+  iny
+  lda #<transfer_buffer
+  sta (VARPNT),y
+  iny
+  lda #>transfer_buffer
+  sta (VARPNT),y  
+  pla
+  beq :+
+  ldx #0
+  jsr copymem
+:  
+  rts
+
+poll_keyword:
+  ldax #$FFFF
+  jsr set_result_code
+  lda #0
+  sta data_arrived_flag  
+  jsr set_input_string
+  jsr ip65_process
+  lda ip65_error
+  beq @no_error
+  jmp set_error
+@no_error:
+  lda data_arrived_flag
+  ldx #0
+  jmp set_result_code
+  
+  
 .rodata
 vectors:
 	.word crunch	
@@ -984,17 +1209,33 @@ dhcp_server_msg:
 tftp_server_msg:
 .byte "TFTP SERVER : ", 0
 
-dns_error:
-.byte "ADDRESS RESOLUTION ERROR",0
+address_resolution:
+.byte "ADDRESS RESOLUTION",0
+
 get_msg:
 .byte "GETTING ",0
 put_msg:
 .byte "PUTTING ",0
 
-tftp_error:
-.byte "TFTP ERROR",0
-dhcp_error:
-.byte "DHCP INITIALIZATION ERROR",13,0
+tftp:
+.byte "TFTP",0
+dhcp:
+.byte "DHCP",0
+
+connect:
+.byte "CONNECT",0
+
+transmission:
+.byte "TRANSMISSION",0
+
+error:
+.byte " ERROR $",0
+
+disconnected:
+.byte "DIS"
+connected_msg:
+.byte "CONNECTED",13,0
+
 keywords:                    
   .byte "IF",$E0  ;our dummy 'IF' entry takes $E0
 	.byte "IPCFG",$E1
@@ -1005,12 +1246,13 @@ keywords:
   .byte "GATEWAY",$E6
   .byte "DNS",$E7
   .byte "TFTP",$E8
-  .byte "TFGET",$E9
-  .byte "TF",$A1,$E9  ;since BASIC will replace GET with A1
+  .byte "TF",$A1,$E9  ;TFGET - BASIC will replace GET with A1 
   .byte "TFPUT",$EA
-
+  .byte "NETCAT",$EB
+  .byte "TCPC",$91,"NECT",$EC ; TCPCONNECT BASIC will replace ON with 91
+  .byte "POLL",$ED
 	.byte $00					;end of list
-HITOKEN=$EB
+HITOKEN=$EE
 
 ;
 ; Table of token locations-1
@@ -1027,6 +1269,9 @@ E7: .word dns_keyword-1
 E8: .word tftp_keyword-1
 E9: .word tfget_keyword-1
 EA: .word tfput_keyword-1
+EB: .word netcat_keyword-1
+EC: .word tcpconnect_keyword-1
+ED: .word poll_keyword-1
 
 .segment "SELF_MODIFIED_CODE"
 
@@ -1062,4 +1307,7 @@ ping_counter: .res 1
 string_buffer: .res 128
 transfer_buffer: .res 256
 file_opened: .res 1
- 
\ No newline at end of file
+connection_closed: .res 1
+netcat_timeout: .res 1
+buffer_length: .res 1
+data_arrived_flag: .res 1
\ No newline at end of file
diff --git a/client/ip65/tcp.s b/client/ip65/tcp.s
index 2406c7f..f00b92d 100644
--- a/client/ip65/tcp.s
+++ b/client/ip65/tcp.s
@@ -281,6 +281,12 @@ tcp_connect:
   sec             ;signal an error
   rts
 @got_a_response:
+  lda tcp_state  
+  cmp #tcp_cxn_state_closed
+  bne @was_accepted
+  sec     ;if we got here, then the other side sent a RST or FIN, so signal an error to the caller
+  rts
+@was_accepted:
 tcp_connection_established:
 ;inc the sequence number to cover the SYN we have sent
   ldax  #tcp_connect_sequence_number
diff --git a/client/ip65/telnet.s b/client/ip65/telnet.s
index a63dab4..cd28f02 100644
--- a/client/ip65/telnet.s
+++ b/client/ip65/telnet.s
@@ -181,7 +181,7 @@ telnet_connect:
 @error_on_send:
   ldax #transmission_error
   jsr print
-  jsr print_errorcode
+  jmp print_errorcode
  
 
 ;tcp callback - will be executed whenever data arrives on the TCP connection
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 63ec927..f0787c1 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -1,5 +1,8 @@
+
  v1.0.33
   - FIX: gracefully close the TCP connection when a telnet connection is aborted by user keystroke
+  - FIX: telnet client was reprocessing last received packet after an error (including user abort)
+  - FIX: was not signalling an error when a RST or FIN was sent back to tcp_connect
   
 v1.0.32
  - CHANGE: when loading cart images from disk, set default drive for cart image to be whatever drive the cart