WebSVN – Kolibri OS – Diff – /programs/network/ping/ping.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       ;;
 ;;                                                                 ;;
 ;;  ping.asm - ICMP echo client 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
 ; Init identifier with our PID number
         mcall   9, thread_info, -1
         mov     eax, [thread_info.PID]
         mov     [icmp_packet.id], ax
 ; expand payload to 65504 bytes
         jnz     .expand_payload
 ; 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
         mov     [timeout], ebx
         jmp     .param_loop
   @@:
         ; implement more parameters here
   .invalid:
-        push    str13
-        call    [con_write_asciiz]
+        invoke  con_write_asciiz, str13
         jmp     main
   .resolve:
 ; 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, eax
 ; 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]
-        push    [size]
+        invoke  con_write_asciiz, str3
-        push    str3b
+        invoke  con_write_asciiz, [ip_ptr]
-        call    [con_printf]
+        invoke  con_printf, str3b, [size]
         add     esp, 2*4
 mainloop:
-        call    [con_get_flags]
+        invoke  con_get_flags
         test    eax, 0x200                      ; con window closed?
         div     ebx
         push    edx
         push    eax
         push    [recvd]
-        push    str7
-        call    [con_printf]
+        invoke  con_printf, str7
         add     esp, 5*4
-        jmp     .continue
+        jmp     .continue
   .ttl_exceeded:
         push    str14
-        call    [con_write_asciiz]
+  .ttl_exceeded:
         invoke  con_write_asciiz, str14
         jmp     .continue
 ; Error in packet, print it to user
-  .miscomp:
+; Error in packet, print it to user
-        sub     edi, icmp_packet.data+1
+  .miscomp:
-        push    edi
+        sub     edi, icmp_packet.data+1
-        push    str9
-        call    [con_printf]
+        push    edi
-        add     esp, 2*4
+        invoke  con_printf, str9
-        jmp     .continue
+        add     esp, 2*4
         jmp     .continue
-; Invalid reply
-  .invalid:
-        push    str10
+; Invalid reply
-        call    [con_write_asciiz]
+  .invalid:
-        jmp     .continue
+        invoke  con_write_asciiz, str13
+        jmp     .continue
+; Timeout!
+  .no_response:
+        invoke  con_write_asciiz, str8
+; Send more ICMP packets ?
+  .continue:
         inc     [icmp_packet.seq]
 ; Timeout!
-  .no_response:
+        invoke  con_kbhit
-        push    str8
+        test    eax, eax
-        call    [con_write_asciiz]
+        jz      .nokey
   .zero:
         push    edx
         push    eax
         push    [stats.rx]
         push    [stats.tx]
-        push    str12
-        call    [con_printf]
+        invoke  con_printf, str12
         add     esp, 5*4
         jmp     main
 ; 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
 ; data
 title   db      'ICMP echo (ping) client',0
 str_welcome db  'Please enter the hostname or IP-address of the host you want to ping,',10
             db  'or just press enter to exit.',10,10
             db  'Options:',10
-            db  ' -t            Send packets till users abort.',10
+            db  ' -t            Send packets till users abort. (Ctrl+C))',10
             db  ' -n number     Number of requests to send.',10
             db  ' -i TTL        Time to live.',10
             db  ' -l size       Size of echo request.',10
             db  ' -w time-out   Time-out in hundredths of a second.',10,0
 str_prompt  db  10,'> ',0
         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'
 socketnum       dd ?

Subversion Repositories Kolibri OS

(root)/programs/network/ping/ping.asm – Rev 7891 → 9128