WebSVN – Kolibri OS – Diff – /kernel/branches/kolibri_pe/network/ip.inc

 ;;                                                                 ;;
 ;;  See file COPYING for details                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 593 $
+$Revision: 914 $
 	; IHL keeps number of octets, so we need to << 2 'reg'
 	shl     reg, 2
+}
+include "tcp.inc"
+include "udp.inc"
 include "icmp.inc"
 ;***************************************************************************
 ;   Function
 ;      ip_rx
     imul    eax, IPBUFFSIZE
     add     eax, IPbuffs
+    mov     ebx, eax  ; ebx=pointer to IP_PACKET
-    mov     ebx, eax  ; ebx=pointer to IP_PACKET
+;        DEBUGF  1, "K : ip_rx - proto: %u\n", [ebx + IP_PACKET.Protocol]:1
     ; Validate the IP checksum
     mov     dx, word[ebx + IP_PACKET.HeaderChecksum]
     xchg    dh,dl          ; Get the checksum in intel format
-    mov     [ebx + IP_PACKET.HeaderChecksum], word 0  ; clear checksum field - need to when
+    mov     [ebx + IP_PACKET.HeaderChecksum], 0  ; clear checksum field - need to when
                                 ; recalculating checksum
     ;  this needs two data pointers and two size #.
     ;  2nd pointer can be of length 0
+    GET_IHL ecx, ebx + IP_PACKET.VersionAndIHL ;get packet length in ecx
+    stdcall checksum_jb, ebx, ecx   ;buf_ptr, buf_size
     cmp     dx, ax
-    GET_IHL ecx, ebx + IP_PACKET.VersionAndIHL ;get packet length in ecx
+;        DEBUGF  1, "K : ip_rx - checksums: %x - %x\n", dx, ax
     stdcall checksum_jb, ebx, ecx   ;buf_ptr, buf_size
-    cmp     dx, ax
+    jnz     .dump.1  ;if CHECKSUM isn't valid then dump packet
     mov     edx, ebx ; EDX (IP-BUFFER POINTER) WILL BE USED FOR *_rx HANDLERS BELOW!!!
     mov     edx, ebx ; EDX (IP-BUFFER POINTER) WILL BE USED FOR *_rx HANDLERS BELOW!!!
-    jnz     .dump  ;if CHECKSUM isn't valid then dump packet
+;        DEBUGF  1, "K : ip_rx - dest: %x - %x\n", [ebx + IP_PACKET.DestinationAddress], [stack_ip]
+    ; Validate the IP address, if it isn't broadcast
-    ; Validate the IP address, if it isn't broadcast
+    mov     eax, [stack_ip]
+    cmp     dword[ebx + IP_PACKET.DestinationAddress], eax
+    je      @f
+    ; If the IP address is 255.255.255.255, accept it
+    ; - it is a broadcast packet, which we need for dhcp
-    mov     eax, [stack_ip]
+	mov	eax, [ebx + IP_PACKET.DestinationAddress]
+	cmp	eax, 0xffffffff
+	;je      @f
+	;mov     ecx, [stack_ip]
+	;and     eax, [subnet_mask]
-    cmp     dword[ebx + IP_PACKET.DestinationAddress], eax
+	;and     ecx, [subnet_mask]
-    je      @f
+	;cmp     eax, ecx
 	;jne     .dump.2
-    ; If the IP address is 255.255.255.255, accept it
+	;mov     eax, [ebx + IP_PACKET.DestinationAddress]
+	;or      eax, [subnet_mask]
-    ; - it is a broadcast packet, which we need for dhcp
+	;cmp     eax, 0xffffffff
-    cmp     dword[ebx + IP_PACKET.DestinationAddress], 0xffffffff
+	jne	.dump.2
-    jne     .dump
+  @@:
+    mov     al, [ebx + IP_PACKET.VersionAndIHL]
+    and     al, 0x0f  ;get IHL(header length)
-  @@:
+    cmp     al, 0x05  ;if IHL!= 5*4(20 bytes)
+;        DEBUGF  1, "K : ip_rx - ihl: %x - 05\n", al
-    mov     al, [ebx + IP_PACKET.VersionAndIHL]
+    jnz     .dump.3	;then dump it
-    and     al, 0x0f  ;get IHL(header length)
-    cmp     al, 0x05  ;if IHL!= 5*4(20 bytes)
+;        DEBUGF  1, "K : ip_rx - ttl: %x - 00\n", [ebx + IP_PACKET.TimeToLive]:2
     jnz     .dump     ;then dump it
     cmp     [ebx + IP_PACKET.TimeToLive], 0
-    cmp     byte[ebx + IP_PACKET.TimeToLive], byte 0
+    je	    .dump.4	;if TTL==0 then dump it
     je      .dump     ;if TTL==0 then dump it
+    mov     ax, [ebx + IP_PACKET.FlagsAndFragmentOffset]
-    mov     ax, word[ebx + IP_PACKET.FlagsAndFragmentOffset]
+    and     ax, 0xFFBF   ;get flags
-    and     ax, 0xFFBF   ;get flags
+;        DEBUGF  1, "K : ip_rx - flags: %x - 0000\n", ax
     cmp     ax, 0        ;if some flags was set then we dump this packet
-    jnz     .dump        ;the flags should be used for fragmented packets
+    jnz     .dump.5	   ;the flags should be used for fragmented packets
     ; Check the protocol, and call the appropriate handler
     ; Each handler will re-use or free the queue buffer as appropriate
     mov     al, [ebx + IP_PACKET.Protocol]
     cmp     al , PROTOCOL_TCP
     jne     .not_tcp
-    DEBUGF  1,"K : ip_rx - TCP packet\n"
+;    DEBUGF  1,"K : ip_rx - TCP packet\n"
     mov     eax, dword[buffer_number]
     call    tcp_rx
     jmp     .exit
   .not_tcp:
+    cmp     al, PROTOCOL_UDP
+    jne     .not_udp
+;    DEBUGF  1,"K : ip_rx - UDP packet\n"
+    mov     eax, dword[buffer_number]
-    cmp     al, PROTOCOL_UDP
+    call    udp_rx
+    jmp     .exit
+  .not_udp:
+    cmp     al, PROTOCOL_ICMP
-    jne     .not_udp
+    jne     .dump.6		 ;protocol ain't supported
+;    DEBUGF  1,"K : ip_rx - ICMP packet\n"
+    ;GET_IHL ecx, ebx + IP_PACKET.VersionAndIHL ;get packet length in ecx
-    DEBUGF  1,"K : ip_rx - UDP packet\n"
+    mov     eax, dword[buffer_number]
+    stdcall icmp_rx,eax,ebx,ecx  ;buffer_number,IPPacketBase,IPHeaderLength
+    jmp     .exit
+  .dump.1:
+	DEBUGF	1, "K : ip_rx - dumped (checksum: 0x%x-0x%x)\n", dx, ax
-    mov     eax, dword[buffer_number]
+	jmp	.dump.x
+  .dump.2:
-    call    udp_rx
+	DEBUGF	1, "K : ip_rx - dumped (ip: %u.%u.%u.%u)\n", [ebx + IP_PACKET.DestinationAddress + 0]:1, [ebx + IP_PACKET.DestinationAddress + 1]:1, [ebx + IP_PACKET.DestinationAddress + 2]:1, [ebx + IP_PACKET.DestinationAddress + 3]:1
-    jmp     .exit
+	jmp	.dump.x
-  .not_udp:
+  .dump.3:
-    cmp     al , PROTOCOL_ICMP
+	DEBUGF	1, "K : ip_rx - dumped (ihl: %u)\n", al

Subversion Repositories Kolibri OS

(root)/kernel/branches/kolibri_pe/network/ip.inc – Rev 837 → 914