WebSVN – Kolibri OS – Diff – /programs/network/telnet/telnet.asm

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2010-2013. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2010-2015. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  telnet.asm - Telnet client for KolibriOS                       ;;
 ;;                                                                 ;;
 ;;  Written by hidnplayr@kolibrios.org                             ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-format binary as ""
-__DEBUG__       = 0
+format binary as ""
 __DEBUG_LEVEL__ = 1
 BUFFERSIZE      = 4096
 include '../../macros.inc'
 purge mov,add,sub
 include '../../proc32.inc'
-include '../../dll.inc'
-include '../../debug-fdo.inc'
+include '../../dll.inc'
 include '../../network.inc'
 ; entry point
 start:
 ; load libraries
         stdcall dll.Load, @IMPORT
         test    eax, eax
-        jnz     exit
-; initialize console
+        jnz     exit
-        push    1
-        call    [con_start]
-        push    title
-        push    25
-        push    80
-        push    25
+; initialize console
-        push    80
+        invoke  con_start, 1
-        call    [con_init]
+        invoke  con_init, 80, 25, 80, 25, title
 ; Check for parameters
-        cmp     byte [hostname], 0
+        cmp     byte[hostname], 0
         jne     resolve
-main:
-        call    [con_cls]
+main:
-; Welcome user
+        invoke  con_cls
-        push    str1
-        call    [con_write_asciiz]
+; Welcome user
+        invoke  con_write_asciiz, str1
 prompt:
-; write prompt
-        push    str2
-        call    [con_write_asciiz]
+prompt:
-; read string
+; write prompt
-        mov     esi, hostname
+        invoke  con_write_asciiz, str2
-        push    256
+; read string (wait for input)
-        push    esi
+        mov     esi, hostname
-        call    [con_gets]
+        invoke  con_gets, esi, 256
 ; check for exit
+        test    eax, eax
-        test    eax, eax
-        jz      done
-        cmp     byte [esi], 10
+        jz      done
-        jz      done
+        cmp     byte[esi], 10
         jz      done
 resolve:
 resolve:
-        mov     [sockaddr1.port], 23 shl 8
+        mov     [sockaddr1.port], 23 shl 8      ; Port is in network byte order
         xor     eax, eax
         xor     ebx, ebx
-        mov     byte [esi-1], 0
+        mov     byte[esi-1], 0
   .portloop:
         lodsb
-        cmp     al, 0x20
+        cmp     al, ' '
         jbe     .port_done
         sub     al, '0'
         jb      hostname_error
         cmp     al, 9
         ja      hostname_error
   .done:
-; resolve name
-        push    esp     ; reserve stack place
-        push    esp     ; ptr to result
-        push    0       ; addrinfo hints
+; resolve name
-        push    0       ; servname
-        push    hostname; hostname
+        push    esp     ; reserve stack place
-        call    [getaddrinfo]
+        invoke  getaddrinfo, hostname, 0, 0, esp
         pop     esi
 ; test for error
         test    eax, eax
-        jnz     dns_error
+        jnz     dns_error
-        call    [con_cls]
-        push    str3
-        call    [con_write_asciiz]
+        invoke  con_cls
-        push    hostname
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str3
-; write results
+        invoke  con_write_asciiz, hostname
         push    str8
-        call    [con_write_asciiz]
+; write results
-;        mov     edi, esi
+        invoke  con_write_asciiz, str8
-; convert IP address to decimal notation
-        mov     eax, [esi+addrinfo.ai_addr]
+; convert IP address to decimal notation
-        mov     eax, [eax+sockaddr_in.sin_addr]
-        mov     [sockaddr1.ip], eax
+        mov     eax, [esi+addrinfo.ai_addr]
-        push    eax
+        mov     eax, [eax+sockaddr_in.sin_addr]
-        call    [inet_ntoa]
-; write result
+        mov     [sockaddr1.ip], eax
-        push    eax
-        call    [con_write_asciiz]
+        invoke  inet_ntoa, eax
-; free allocated memory
+; write result
-        push    esi
+        invoke  con_write_asciiz, eax
-        call    [freeaddrinfo]
+; free allocated memory
         invoke  freeaddrinfo, esi
         push    str9
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str9
         mcall   socket, AF_INET4, SOCK_STREAM, 0
         cmp     eax, -1
         jz      socket_err
         mov     [socketnum], eax
         mcall   connect, [socketnum], sockaddr1, 18
         test    eax, eax
         jnz     socket_err
-        mcall   40, 1 shl 7 ; + 7
+        mcall   40, EVM_STACK
-        call    [con_cls]
+        invoke  con_cls
         mcall   18, 7
         push    eax
-        mcall   51, 1, thread, mem - 2048
-        pop     ecx
-        mcall   18, 3
         mcall   51, 1, thread, mem - 2048
-mainloop:
+        pop     ecx
-        call    [con_get_flags]
+        mcall   18, 3
-        test    eax, 0x200                      ; con window closed?
         jnz     exit
 mainloop:
-        mcall   recv, [socketnum], buffer_ptr, BUFFERSIZE, 0
+        invoke  con_get_flags
+        test    eax, 0x200                      ; con window closed?
-        cmp     eax, -1
+        jnz     exit
         je      closed
         mcall   recv, [socketnum], buffer_ptr, BUFFERSIZE, 0
         cmp     eax, -1
-    DEBUGF  1, 'TELNET: got %u bytes of data !\n', eax
+        je      closed
         mov     esi, buffer_ptr
-        lea     edi, [esi + eax]
-        mov     byte [edi], 0
         lea     edi, [esi+eax]
-  .scan_cmd:
+        mov     byte[edi], 0
-        cmp     byte [esi], 0xff        ; Interpret As Command
+  .scan_cmd:
-        jne     .no_cmd
+        cmp     byte[esi], 0xff         ; Interpret As Command
-        ; TODO: parse options, for now, we will reply with 'WONT' to everything
+        jne     .no_cmd
-        mov     byte [esi + 1], 252     ; WONT
+; TODO: parse options
-        add     esi, 3                  ; a command is always 3 bytes
+; for now, we will reply with 'WONT' to everything
-        jmp     .scan_cmd
-  .no_cmd:
+        mov     byte[esi+1], 252        ; WONT
         add     esi, 3                  ; a command is always 3 bytes
-        cmp     esi, buffer_ptr
+        jmp     .scan_cmd
-        je      .print
+  .no_cmd:
-    DEBUGF  1, 'TELNET: sending data\n'
+        cmp     esi, buffer_ptr
         je      .print
-        push    esi edi
-        sub     esi, buffer_ptr
-        mcall   send, [socketnum], buffer_ptr, , 0
-        pop     edi esi
         push    esi edi
-  .print:
+        sub     esi, buffer_ptr
-        cmp     esi, edi
-        jae     mainloop
+        mcall   send, [socketnum], buffer_ptr, , 0
-        push    esi
-        call    [con_write_asciiz]
+        pop     edi esi
-  .loop:
-        lodsb
+  .print:
-        test    al, al
+        cmp     esi, edi
-        jz      .print
+        jae     mainloop
-        jmp     .loop
         invoke  con_write_asciiz, esi
 socket_err:
-        DEBUGF  1, "TELNET: socket error %d", ebx
-        push    str6
+  .loop:
-        call    [con_write_asciiz]
+        lodsb
         test    al, al
-        jmp     prompt
+        jz      .print
         jmp     .loop
 dns_error:
         DEBUGF  1, "TELNET: DNS error %d", eax
-        push    str5
+socket_err:
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str6
         jmp     prompt
         jmp     prompt
 dns_error:
-hostname_error:
+        invoke  con_write_asciiz, str5
-        push    str11
+        jmp     prompt
         call    [con_write_asciiz]
-        jmp     prompt
+hostname_error:
+        invoke  con_write_asciiz, str11
-closed:
+        jmp     prompt
         push    str12
-        call    [con_write_asciiz]
+closed:
-        jmp     prompt
+        invoke  con_write_asciiz, str12
         dw AF_INET4
 .port   dw 0
 .ip     dd 0
         rb 10
-include_debug_strings    ; ALWAYS present in data section
 ; import
 align 4
 @IMPORT:

Subversion Repositories Kolibri OS

(root)/programs/network/telnet/telnet.asm @ 6477 – Rev 4743 → 5858