WebSVN – Kolibri OS – Diff – /programs/network/icmp/ping.asm

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; TODO: ttl, user selectable size/number of packets
 format binary as ""
         dd      1               ; header version
         dd      START           ; entry point
         dd      I_END           ; initialized size
         dd      IM_END+0x1000   ; required memory
         dd      IM_END+0x1000   ; stack pointer
-        dd      s               ; parameters
+        dd      params          ; parameters
         dd      0               ; path
 include '../../proc32.inc'
 include '../../macros.inc'
 purge mov,add,sub
+include '../../dll.inc'
-include '../../dll.inc'
+include '../../struct.inc'
 include '../../network.inc'
 include 'icmp.inc'
-include 'icmp.inc'
+include 'ip.inc'
         jnz     exit
 ; initialize console
         push    1
         call    [con_start]
         push    title
-        push    25
+        push    250
         push    80
         push    25
         push    80
         call    [con_init]
+; expand payload to 65504 bytes
+        mov     edi, icmp_packet.data+32
+        mov     ecx, 65504/32-1
+  .expand_payload:
+        mov     esi, icmp_packet.data
+        movsd
+        movsd
+        movsd
+        movsd
+        movsd
+        movsd
+        movsd
+        movsd
+        dec     ecx
+        jnz     .expand_payload
 ; main loop
-        cmp     byte[s], 0
+        cmp     byte[params], 0
         jne     parse_param
         push    str_welcome
         call    [con_write_asciiz]
 main:
 ; write prompt
         push    str_prompt
         call    [con_write_asciiz]
 ; read string
-        mov     esi, s
+        mov     esi, params
-        push    256
+        push    1024
         push    esi
         call    [con_gets]
 ; check for exit
         test    eax, eax
         mov     [stats.tx], 0
         mov     [stats.rx], 0
         mov     [stats.time], 0
+parse_param:
-parse_param:
+; parameters defaults
+        mov     [count], 4
+        mov     [size], 32
+        mov     [ttl], 128
-        mov     [count], 4      ; default number of pings to send
+        mov     [timeout], 300
 ; Check if any additional parameters were given
-        mov     esi, s
+        mov     esi, params
         mov     ecx, 1024
   .addrloop:
         lodsb
         cmp     al, 't'
         jne     @f
         mov     [count], -1     ; infinite
         jmp     .param_loop
   @@:
+        cmp     al, 'n'
+        jne     @f
+        call    ascii_to_dec
+        test    ebx, ebx
+        jz      .invalid
+        mov     [count], ebx
+        jmp     .param_loop
+  @@:
+        cmp     al, 'l'
+        jne     @f
+        call    ascii_to_dec
+        test    ebx, ebx
+        jz      .invalid
+        cmp     ebx, 65500
+        ja      .invalid
+        mov     [size], ebx
+        jmp     .param_loop
+  @@:
+        cmp     al, 'i'
+        jne     @f
+        call    ascii_to_dec
+        test    ebx, ebx
+        jz      .invalid
+        cmp     ebx, 255
+        ja      .invalid
+        mov     [ttl], ebx
+        jmp     .param_loop
+  @@:
+        cmp     al, 'w'
+        jne     @f
+        call    ascii_to_dec
+        test    ebx, ebx
+        jz      .invalid
+        mov     [timeout], ebx
+        jmp     .param_loop
+  @@:
         ; implement more parameters here
   .invalid:
         push    str13
         call    [con_write_asciiz]
         jmp     main
 ; resolve name
         push    esp     ; reserve stack place
         push    esp     ; fourth parameter
         push    0       ; third parameter
         push    0       ; second parameter
-        push    s       ; first parameter
+        push    params  ; first parameter
         call    [getaddrinfo]
         pop     esi
 ; test for error
         test    eax, eax
         jnz     fail
         cmp     eax, -1
         jz      fail2
         mov     [socketnum], eax
+        mcall   connect, [socketnum], sockaddr1, 18
+        cmp     eax, -1
+        je      fail2
+        pushd   [ttl]
+        pushd   4                               ; length of option
+        pushd   IP_TTL
+        pushd   IPPROTO_IP
+        mcall   setsockopt, [socketnum], esp
+        add     esp, 16
+        cmp     eax, -1
-        mcall   connect, [socketnum], sockaddr1, 18
+        je      fail2
         mcall   40, EVM_STACK
-;        call    [con_cls]
+        mcall   40, EVM_STACK
         push    str3
         call    [con_write_asciiz]
         push    [ip_ptr]
+        call    [con_write_asciiz]
         call    [con_write_asciiz]
         push    [size]
-        push    (icmp_packet.length - ICMP_Packet.Data)
+        push    str3b
-        push    str3b
+        call    [con_printf]
-        call    [con_printf]
+        add     esp, 2*4
 mainloop:
+        call    [con_get_flags]
+        test    eax, 0x200                      ; con window closed?
+        jnz     exit_now
-        call    [con_get_flags]
+        inc     [stats.tx]
+        mcall   26, 10                          ; Get high precision timer count
-        test    eax, 0x200                      ; con window closed?
+        mov     [time_reference], eax
-        jnz     exit_now
+        mov     esi, [size]
         add     esi, sizeof.ICMP_header
-        inc     [stats.tx]
+        xor     edi, edi
-        mcall   26, 10                          ; Get high precision timer count
+        mcall   send, [socketnum], icmp_packet
-        mov     [time_reference], eax
+        cmp     eax, -1
         jb      @f
         inc     eax
   @@:
         mov     [time_reference], eax
 ; Receive reply
         mcall   recv, [socketnum], buffer_ptr, BUFFERSIZE, MSG_DONTWAIT
         cmp     eax, -1
+        je      .no_response
+        test    eax, eax
+        jz      fail2
+; IP header length
+        movzx   esi, byte[buffer_ptr]
+        and     esi, 0xf
+        shl     esi, 2
-        je      .no_response
+; Check packet length
         sub     eax, esi
-        sub     eax, ICMP_Packet.Data
+        sub     eax, sizeof.ICMP_header
         jb      .invalid
         mov     [recvd], eax
+; make esi point to ICMP packet header
+        add     esi, buffer_ptr
+; we have a response, print the sender IP
+        push    esi
+        mov     eax, [buffer_ptr + IPv4_header.SourceAddress]
+        rol     eax, 16
+        movzx   ebx, ah
+        push    ebx
+        movzx   ebx, al
+        push    ebx
+        shr     eax, 16
-        cmp     word[buffer_ptr + ICMP_Packet.Identifier], IDENTIFIER
+        movzx   ebx, ah
-        jne     .invalid
+        push    ebx
+        movzx   ebx, al
+        push    ebx
+        push    str11
-; OK, we have a response, update stats and let the user know
+        call    [con_printf]
-        inc     [stats.rx]
+        add     esp, 5*4
+        pop     esi
+; What kind of response is it?
+        cmp     [esi + ICMP_header.Type], ICMP_ECHOREPLY
+        je      .echo_reply
+        cmp     [esi + ICMP_header.Type], ICMP_TIMXCEED
+        je      .ttl_exceeded
+        jmp     .invalid
-        mov     eax, [time_reference]
-        add     [stats.time], eax
+  .echo_reply:
-        push    str11                   ; TODO: print IP address of packet sender
+        cmp     [esi + ICMP_header.Identifier], IDENTIFIER
-        call    [con_write_asciiz]
+        jne     .invalid
+; Validate the packet
-; validate the packet
+        add     esi, sizeof.ICMP_header
+        mov     ecx, [size]
+        mov     edi, icmp_packet.data
+        repe    cmpsb
+        jne     .miscomp
-        lea     esi, [buffer_ptr + ICMP_Packet.Data]
+; update stats
-        mov     ecx, [recvd]
+        inc     [stats.rx]
-        mov     edi, icmp_packet.data
+        mov     eax, [time_reference]
-        repe    cmpsb
+        add     [stats.time], eax
         jne     .miscomp
         movzx   eax, [buffer_ptr + IPv4_header.TimeToLive]
-; All OK, print to the user!
-        mov     eax, [time_reference]
-        xor     edx, edx
+        push    eax
-        mov     ebx, 10
+        mov     eax, [time_reference]
-        div     ebx
+        xor     edx, edx
+        mov     ebx, 10
+        div     ebx
+        push    edx
+        push    eax
+        push    [recvd]
+        push    str7
+        call    [con_printf]
-        push    edx
+        add     esp, 5*4
-        push    eax
+        jmp     .continue
 ;        movzx   eax, word[buffer_ptr + ICMP_Packet.SequenceNumber]
-;        push    eax
-        push    [recvd]
+  .ttl_exceeded:
         push    str14
-        push    str7
+        call    [con_write_asciiz]
-        call    [con_printf]
+        jmp     .continue
         jmp     .continue
 ; Error in packet, print it to user
         inc     [icmp_packet.seq]
         cmp     [count], -1
         je      .forever
         dec     [count]
-        jz      done
+        jz      .stats
+  .forever:
-  .forever:
+; wait a second before sending next request
-        mcall   5, 100  ; wait a second
         mcall   5, 100
         jmp     mainloop
-; Done..
+; Print statistics
-done:
+  .stats:
         cmp     [stats.rx], 0
         jne     @f
         xor     eax, eax
         push    eax
         push    [stats.rx]
         push    [stats.tx]
         push    str12
         call    [con_printf]
+        add     esp, 5*4
         jmp     main
 ; DNS error
 fail:
         call    [con_exit]
 exit_now:
         mcall   -1
+ascii_to_dec:
+        lodsb
+        cmp     al, ' '
+        jne     .fail
+        xor     eax, eax
+        xor     ebx, ebx
+  .loop:
+        lodsb
+        test    al, al
+        jz      .done
+        cmp     al, ' '
+        je      .done
+        sub     al, '0'
+        jb      .fail
+        cmp     al, 9
+        ja      .fail
+        lea     ebx, [ebx*4+ebx]
+        lea     ebx, [ebx*2+eax]
+        jmp     .loop
+  .fail:
+        xor     ebx, ebx
+  .done:
+        dec     esi
+        ret
 ; 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  ' -n number     Number of requests to send.',10
+            db  ' -i TTL        Time to live.',10
-str_welcome db  'Please enter the hostname or IP-address of the host you want to ping,',10
+            db  ' -l size       Size of echo request.',10
-            db  'or just press enter to exit.',10,0
+            db  ' -w time-out   Time-out in hundredths of a second.',10,0
 str_prompt  db  10,'> ',0
 str3    db      'Pinging to ',0
 str3b   db      ' with %u data bytes',10,0
 str4    db      10,0
 str5    db      'Name resolution failed.',10,0
-str6    db      'Could not open socket',10,0
+str6    db      'Socket error.',10,0
 str13   db      'Invalid parameter(s)',10,0
-str11   db      'Answer: ',0
+str11   db      'Answer from %u.%u.%u.%u: ',0
+str7    db      'bytes=%u time=%u.%u ms TTL=%u',10,0
-str7    db      'bytes=%u time=%u.%u ms',10,0
+str8    db      'Timeout',10,0
-str8    db      'Timeout',10,0
+str9    db      'miscompare at offset %u.',10,0
-str9    db      'Miscompare at offset %u',10,0
+str10   db      'invalid reply.',10,0
         rb 10
 time_reference  dd ?
 ip_ptr          dd ?
+count           dd ?
+size            dd ?
+ttl             dd ?
-count           dd ?
+timeout         dd ?
 recvd           dd ?    ; received number of bytes in last packet
 stats:
         con_set_cursor_pos, 'con_set_cursor_pos',\
         con_get_flags,  'con_get_flags'
 socketnum       dd ?
-icmp_packet     db 8            ; type
+icmp_packet     db ICMP_ECHO    ; type
                 db 0            ; code
-                dw 0            ;
+                dw 0            ; checksum
  .id            dw IDENTIFIER   ; identifier
- .seq           dw 0x0000       ; sequence number
- .data          db 'abcdefghijklmnopqrstuvwxyz012345'
+ .seq           dw 0x0000       ; sequence number
+ .data          db 'abcdefghijklmnopqrstuvwxyz012345'
- .length = $ - icmp_packet
 I_END:
                 rb 65504-32

Subversion Repositories Kolibri OS

(root)/programs/network/icmp/ping.asm – Rev 5805 → 5842