WebSVN – Kolibri OS – Diff – /kernel/branches/net/network/IPv4.inc

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2011. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2012. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  IPv4.INC                                                       ;;
 ;;                                                                 ;;
 ;;  Part of the tcp/ip network stack for KolibriOS                 ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2629 $
+$Revision: 2731 $
-MAX_FRAGMENTS           = 64
+MAX_FRAGMENTS                   = 64
-struct  FRAGMENT_entry                 ; This structure will replace the ethernet header in fragmented ip packets
+struct  FRAGMENT_entry                  ; This structure will replace the ethernet header in fragmented ip packets
-        PrevPtr                dd  ?  ; Pointer to previous fragment entry  (-1 for first packet)
+        PrevPtr                 dd ?    ; Pointer to previous fragment entry  (-1 for first packet)
-        NextPtr                dd  ?  ; Pointer to next fragment entry (-1 for last packet)
+        NextPtr                 dd ?    ; Pointer to next fragment entry (-1 for last packet)
-        Owner                  dd  ?  ; Pointer to structure of driver
+        Owner                   dd ?    ; Pointer to structure of driver
-                               rb  2  ; to match ethernet header size          ; TODO: fix this hack
+                                rb 2    ; to match ethernet header size         ;;; FIXME
-                                      ; Ip header begins here (we will need the IP header to re-construct the complete packet)
+                                        ; Ip header begins here (we will need the IP header to re-construct the complete packet)
 ends
-        IP_LIST         rd  MAX_IP
+        IP_LIST         rd MAX_IP
-        SUBNET_LIST     rd  MAX_IP
+        SUBNET_LIST     rd MAX_IP
-        DNS_LIST        rd  MAX_IP
+        DNS_LIST        rd MAX_IP
+        GATEWAY_LIST    rd MAX_IP
-        GATEWAY_LIST    rd  MAX_IP
+        BROADCAST_LIST  rd MAX_IP
-        IP_PACKETS_TX   rd  MAX_IP
+        IP_PACKETS_TX   rd MAX_IP
 ;-----------------------------------------------------------------
 macro   IPv4_init {
         xor     eax, eax
-        mov     edi, IP_LIST
-        mov     ecx, 4*MAX_IP
-        rep     stosd
-        mov     edi, FRAGMENT_LIST
+        mov     edi, IP_LIST
-        mov     ecx, sizeof.FRAGMENT_slot*MAX_FRAGMENTS/4 + 2*MAX_IP
+        mov     ecx, 7*MAX_IP + (sizeof.FRAGMENT_slot*MAX_FRAGMENTS)/4
         rep     stosd
 ; Decrease TimeToLive of all fragment slots
+;
 ;-----------------------------------------------------------------
 macro IPv4_decrease_fragment_ttls {
-local   .loop
+local   .loop, .next
         mov     esi, FRAGMENT_LIST
         mov     ecx, MAX_FRAGMENTS
   .loop:
         cmp     [esi + FRAGMENT_slot.ttl], 0
+        je      .next
+        dec     [esi + FRAGMENT_slot.ttl]
+        jz      .died
+  .next:
-        je      .try_next
+        add     esi, sizeof.FRAGMENT_slot
+        dec     ecx
+        jnz     .loop
+        jmp     .done
         dec     [esi + FRAGMENT_slot.ttl]
-        jnz     .try_next
+  .died:
-        DEBUGF 1,"Fragment slot timed-out!\n"
-;;; TODO: clear all entry's of timed-out slot
+        DEBUGF 1,"Fragment slot timed-out!\n"
+;;; TODO: clear all entry's of timed-out slot
-  .try_next:
+        jmp     .next
         add     esi, 4
-        loop    .loop
+  .done:
 ;-----------------------------------------------------------------
+;
 ; IPv4_input:
 ;
-;  Will check if IP Packet isnt damaged
+;  Will check if IPv4 Packet isnt damaged
 ;  and call appropriate handler. (TCP/UDP/ICMP/..)
+;
 ;  It will also re-construct fragmented packets
+;
 ;  IN:  Pointer to buffer in [esp]
 ;       size of buffer in [esp+4]
 ;       pointer to device struct in ebx
-;       pointer to IP header in edx
+;       pointer to IPv4 header in edx
-;       size of IP packet in ecx
+;       size of IPv4 packet in ecx
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
-IPv4_input:      ; TODO: add code for raw sockets
+IPv4_input:                                                     ; TODO: add IPv4 raw sockets support
+        DEBUGF  1,"IPv4_input, packet from: %u.%u.%u.%u ",\
-        DEBUGF  1,"IPv4_input, packet from: %u.%u.%u.%u ",\
+        [edx + IPv4_header.SourceAddress + 0]:1,[edx + IPv4_header.SourceAddress + 1]:1,\
-        [edx + IPv4_header.SourceAddress]:1,[edx + IPv4_header.SourceAddress + 1]:1,[edx + IPv4_header.SourceAddress + 2]:1,[edx + IPv4_header.SourceAddress + 3]:1
+        [edx + IPv4_header.SourceAddress + 2]:1,[edx + IPv4_header.SourceAddress + 3]:1
-        DEBUGF  1,"to: %u.%u.%u.%u\n",\
-        [edx + IPv4_header.DestinationAddress]:1,[edx + IPv4_header.DestinationAddress + 1]:1,[edx + IPv4_header.DestinationAddress + 2]:1,[edx + IPv4_header.DestinationAddress + 3]:1
-;-------------------------------------------
-; Check if the packet still has time to live
+        DEBUGF  1,"to: %u.%u.%u.%u\n",\
-        cmp     byte [edx + IPv4_header.TimeToLive], 0
+        [edx + IPv4_header.DestinationAddress + 0]:1,[edx + IPv4_header.DestinationAddress + 1]:1,\
-        je      .dump
+        [edx + IPv4_header.DestinationAddress + 2]:1,[edx + IPv4_header.DestinationAddress + 3]:1
 ;-------------------------------
-; Now, re-calculate the checksum
+; re-calculate the checksum
         call    NET_ptr_to_num
         shl     edi, 2
         ; check if it matches local ip
-        mov     eax, [IP_LIST+edi]
+        mov     eax, [edx + IPv4_header.DestinationAddress]
-        cmp     [edx + IPv4_header.DestinationAddress], eax
+        cmp     eax, [IP_LIST+edi]
         je      .ip_ok
-        ; check for broadcast
         mov     eax, [SUBNET_LIST+edi]
-        not     eax
+        ; check for broadcast (IP or (not SUBNET))
-        or      eax, [IP_LIST+edi]
-        cmp     [edx + IPv4_header.DestinationAddress], eax
+        cmp     eax, [BROADCAST_LIST+edi]
         je      .ip_ok
-        ; or a special broadcast
+        ; or a special broadcast (255.255.255.255)
-        cmp     [edx + IPv4_header.DestinationAddress], -1
-        je      .ip_ok
+        cmp     eax, 0xffffffff
+        je      .ip_ok
-        ; maybe it's a multicast then
+        ; maybe it's a multicast (224.0.0.0/4)
-        mov     eax, [edx + IPv4_header.DestinationAddress]
+        and     eax, 0x0fffffff
-        and     eax, 0xff000000
+        cmp     eax, 224
-;        cmp     eax, 224 shl 24
+        je      .ip_ok
 ;        je      .ip_ok
         je      UDP_input
         cmp     al, IP_PROTO_ICMP
         je      ICMP_input
-        DEBUGF  2,"unknown Internet protocol: %u\n", al
+        DEBUGF  2,"IPv4_input - unknown protocol: %u\n", al
   .dump:
-        DEBUGF  2,"IP_Handler - dumping\n"
+        DEBUGF  2,"IPv4_input - dumping\n"
 ;        inc     [dumped_rx_count]
         pop     ecx
         xchg    cl, ch
         mov     edx, eax
         mov     [edx + IPv4_header.TotalLength], cx
         add     esp, 8
+        xchg    cl, ch
+        push    ecx
-        xchg    cl, ch              ;
-        push    ecx                ;;;;
-        push    eax                ;;;;
-;        mov     esi, edx           ;  This prints the IP packet to the debug board (usefull when using serial output debug..)
-;                                   ;
-;        packet_to_debug
         push    eax
         jmp     .handle_it          ; edx = buf ptr, ecx = size, [esp] buf ptr, [esp+4], total size, ebx=device ptr
   .destroy_slot_pop:
 ;-----------------------------------------------------------------
+;
 ; find fragment slot
+;
 ; IN: pointer to fragmented packet in edx
-; OUT: pointer to slot in edi, -1 on error
+; OUT: pointer to slot in esi, -1 on error
+;
 ;-----------------------------------------------------------------
 align 4
 IPv4_find_fragment_slot:
         cmp     ebx, edx
         je      .found_it
   .next:
+        add     edi, 4
-        add     edi, 4
+        dec     ecx
-        loop    .loop
+        jnz     .loop
   .invalid:
         mov     eax, [IP_LIST + eax]
         ret
   .write_ip:
+        mov     [IP_LIST + eax], ecx
+        ; pre-calculate the local broadcast address
+        mov     ebx, [SUBNET_LIST + eax]
+        not     ebx
+        or      ecx, ebx
+        mov     [BROADCAST_LIST + eax], ecx
         mov     [IP_LIST + eax], ecx
         xor     eax, eax
         ret
         mov     eax, [SUBNET_LIST + eax]
         ret
   .write_subnet:
+        mov     [SUBNET_LIST + eax], ecx
+        ; pre-calculate the local broadcast address
+        mov     ebx, [IP_LIST + eax]
+        not     ecx
+        or      ecx, ebx
+        mov     [BROADCAST_LIST + eax], ecx
         mov     [SUBNET_LIST + eax], ecx
         xor     eax, eax
         ret

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/IPv4.inc – Rev 2629 → 2731