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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2010-2020. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2010-2021. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  tracert.asm - Trace network route for KolibriOS                ;;
 ;;                                                                 ;;
 ;;  Written by hidnplayr@kolibrios.org                             ;;
 ; load libraries
         stdcall dll.Load, @IMPORT
         test    eax, eax
         jnz     exit
 ; initialize console
-        push    1
-        call    [con_start]
+        invoke  con_start, 1
-        push    title
-        push    250
-        push    80
-        push    25
-        push    80
-        call    [con_init]
+        invoke  con_init, 80, 25, 80, 250, title
 ; main loop
         cmp     byte[params], 0
         jne     parse_param
-        push    str_welcome
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str_welcome
 main:
-; write prompt
-        push    str_prompt
+; write prompt
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str_prompt
 ; read string
-        mov     esi, params
-        push    1024
-        push    esi
+        mov     esi, params
-        call    [con_gets]
+        invoke  con_gets, esi, 1024
 ; check for exit
         test    eax, eax
         jz      exit
         cmp     byte [esi], 10
         cmp     al, '-'
         jne     .invalid
         lodsb
         ; implement more parameters here
   .invalid:
-        push    str13
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str13
         jmp     main
   .resolve:
         DEBUGF  2, "resolve\n"
 ; resolve name
-        push    esp     ; reserve stack place
-        push    esp     ; fourth parameter
-        push    0       ; third parameter
-        push    0       ; second parameter
-        push    params  ; first parameter
+        push    esp     ; reserve stack place
-        call    [getaddrinfo]
+        invoke  getaddrinfo, params, 0, 0, esp
         pop     esi
 ; test for error
         test    eax, eax
         jnz     fail
 ; convert IP address to decimal notation
         mov     eax, [esi+addrinfo.ai_addr]
-        mov     eax, [eax+sockaddr_in.sin_addr]
-        mov     [sockaddr1.ip], eax
+        mov     eax, [eax+sockaddr_in.sin_addr]
-        push    eax
+        mov     [sockaddr1.ip], eax
-        call    [inet_ntoa]
+        invoke  inet_ntoa
 ; write result
         mov     [ip_ptr], eax
-        push    eax
-; free allocated memory
+        push    eax
         push    esi
-        call    [freeaddrinfo]
+; free allocated memory
         invoke  freeaddrinfo, esi
         push    str4
         cmp     eax, -1
         je      fail2
-        mcall   40, EVM_STACK
+        mcall   40, EVM_STACK
-        push    str3
-        call    [con_write_asciiz]
-        push    [ip_ptr]
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str3
-        push    str4
+        invoke  con_write_asciiz, [ip_ptr]
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str4
         mov     [ttl], 1
  ;;       mcall   send, [udp_socket], udp_packet, 5, 0    ; dummy send
+        mcall   recv, [icmp_socket], buffer_ptr, BUFFERSIZE, MSG_DONTWAIT ;; dummy read
+mainloop:
+        invoke  con_get_flags
+        test    eax, 0x200                      ; con window closed?
+        jnz     exit_now
+        invoke  con_kbhit
-        mcall   recv, [icmp_socket], buffer_ptr, BUFFERSIZE, MSG_DONTWAIT ;; dummy read
+        test    eax, eax
-mainloop:
+        jz      .nokey
-        call    [con_get_flags]
+        invoke  con_getch2
-        test    eax, 0x200                      ; con window closed?
+        cmp     ax, 0x1E03      ; Ctrl+C
-        jnz     exit_now
+        je      main
         mov     ebx, 10
         div     ebx
         push    edx
         push    eax
-        push    str1
-        call    [con_printf]
+        invoke  con_printf, str1
         add     esp, 3*4
         mov     ebx, [buffer_ptr + IPv4_header.SourceAddress]
         movzx   ebx, ah
         push    ebx
         movzx   ebx, al
         push    ebx
-        push    str2
-        call    [con_printf]
+        invoke  con_printf, str2
         add     esp, 5*4
         ret
-; Invalid reply
-  .invalid:
+; Invalid reply
-        DEBUGF  2, "Invalid response\n"
+  .invalid:
-        push    str10
+        DEBUGF  2, "Invalid response\n"
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str10
-        jmp     main    ;.continue
+        jmp     main    ;.continue
 ; Timeout!
-  .timeout:
+; Timeout!
-        DEBUGF  2, "Timeout\n", eax
+  .timeout:
         mcall   5, 100
         jmp     mainloop
 ; DNS error
-fail:
-        push    str5
+fail:
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str5
         jmp     main
-; Socket error
-fail2:
+; Socket error
-        push    str6
+fail2:
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str6
         jmp     main
-; Finally.. exit!
-exit:
+; Finally.. exit!
-        push    1
+exit:
-        call    [con_exit]
+        invoke  con_exit, 1
         stosb
         jmp     @r
   @@:
         stosb
-        push    buffer_ptr
-        call    [con_write_asciiz]
-        push    str7
+        invoke  con_write_asciiz, buffer_ptr
-        call    [con_write_asciiz]
         invoke  con_write_asciiz, str7
         ret
         con_exit,       'con_exit',     \
         con_gets,       'con_gets',\
         con_cls,        'con_cls',\
         con_getch2,     'con_getch2',\
         con_set_cursor_pos, 'con_set_cursor_pos',\
-        con_get_flags,  'con_get_flags'
+        con_get_flags,  'con_get_flags',\
+        con_kbhit,      'con_kbhit'
 import  network,        \
         getaddrinfo,    'getaddrinfo',  \
         freeaddrinfo,   'freeaddrinfo', \

Subversion Repositories Kolibri OS

(root)/programs/network/tracert/tracert.asm – Rev 7892 → 9128