From a4e79969dd5f78fa6cc92258d874899ce40b456f Mon Sep 17 00:00:00 2001
From: hidnplayr <hidnplayr@kolibrios.org>
Date: Mon, 2 Apr 2012 16:18:12 +0000
Subject: [PATCH] Bugfix for Telnet and tcp socket close in net branch

git-svn-id: svn://kolibrios.org@2541 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/branches/net/applications/telnet/telnet.asm | 2 +-
 kernel/branches/net/network/socket.inc             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/branches/net/applications/telnet/telnet.asm b/kernel/branches/net/applications/telnet/telnet.asm
index 3b133a3257..392bbebe6e 100644
--- a/kernel/branches/net/applications/telnet/telnet.asm
+++ b/kernel/branches/net/applications/telnet/telnet.asm
@@ -153,7 +153,6 @@ mainloop:
 
         cmp     byte [esi], 0x1b        ; escape character
         jne     .print_byte
-        mov     byte [esi], 0
         inc     esi
 
         cmp     word [esi], 0x485b      ; move cursor to beginning
@@ -169,6 +168,7 @@ mainloop:
         jmp     .print_loop
 
   @@:
+        inc     esi
         inc     esi
         jmp     .print_loop
 
diff --git a/kernel/branches/net/network/socket.inc b/kernel/branches/net/network/socket.inc
index b4306e1503..86a7cc0be8 100644
--- a/kernel/branches/net/network/socket.inc
+++ b/kernel/branches/net/network/socket.inc
@@ -670,7 +670,7 @@ SOCKET_close:
         cmp     [eax + TCP_SOCKET.t_state], TCPS_SYN_RECEIVED    ; state must be LISTEN, SYN_SENT or CLOSED
         jb      .free
 
-        call    TCP_output
+        call    TCP_drop
         mov     dword [esp+32], 0
 
         ret