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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
 ;; Copyright (C) KolibriOS team 2004-2009. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
-;;  IP.INC                                                         ;;
+;;  IPv4.INC                                                       ;;
 ;;                                                                 ;;
 ;;  Part of the tcp/ip network stack for KolibriOS                 ;;
 ;;                                                                 ;;
 ;;  Based on the work of [Johnny_B] and [smb]                      ;;
 ;;                                                                 ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1208 $
+$Revision: 1249 $
 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)
 	.NextPtr		dd  ?  ; Pointer to next fragment entry (-1 for last packet)
 	.Owner			dd  ?  ; Pointer to structure of driver
-				rb  2  ; to match ethernet header size
+				rb  2  ; to match ethernet header size          ; TODO: fix this hack
 	.Data:			       ; Ip header begins here (we will need the IP header to re-construct the complete packet)
 ends
 ;-----------------------------------------------------------------
-;
-; IP_Handler:
+;
 ; IPv4_Handler:
 ;  Called by eth_handler,
-;  will check if IP Packet isnt damaged
+;  Will check if IP Packet isnt damaged
 ;  and call appropriate handler. (TCP/UDP/ICMP/..)
+;
 align 4
 IPv4_handler:
-	DEBUGF	1,"IP_Handler - start\n"
-	mov	cx , [edx + IPv4_Packet.HeaderChecksum]
+	DEBUGF	1,"IP_Handler - start\n"
+	push	edx ebx
+	; save checksum, and clear it in original packet
+	mov	di , [edx + IPv4_Packet.HeaderChecksum]
-	xchg	ch , cl 					; Get the checksum in intel format
+	DEBUGF	1,"checksum: %x\n",di
+	mov	word [edx + IPv4_Packet.HeaderChecksum], 0
-	mov	word [edx + IPv4_Packet.HeaderChecksum], 0	; Clear checksum field to recalculating checksum
+	; Re-calculate checksum
+	movzx	ecx, byte [edx + IPv4_Packet.VersionAndIHL]	; Calculate Header length by using IHL field
+	and	ecx, 0x0000000F  ;
+	shl	cx , 2		 ;
+	mov	esi, edx
-	movzx	eax, byte [edx + IPv4_Packet.VersionAndIHL]	; Calculate Header length by using IHL field
-	and	eax, 0x0000000F  ;
+	xor	edx, edx
-	shl	eax, 2		 ;
+	call	checksum_1
+	call	checksum_2
-	push	edx
-	stdcall checksum_jb, edx, eax				; buf_ptr, buf_size
+	; now compare the two..
-	pop	edx
+	cmp	dx, di
-	cmp	cx , ax
+	pop	ebx edx
-	jnz	.dump						; if CHECKSUM isn't valid then dump Packet
+	jne	.dump						; if checksum isn't valid then dump packet
 	sub	ecx, eax					;
 	add	eax, edx
 	push	eax
+	mov	al , [edx + IPv4_Packet.Protocol]
+;----------------------- experimental
+	mov	esi, [edx + IPv4_Packet.SourceAddress]
+	mov	edi, [edx + IPv4_Packet.DestinationAddress]
-	mov	al , [edx + IPv4_Packet.Protocol]
+;-----------------------
 	pop	edx						; Offset to data (tcp/udp/icmp/.. Packet)
 	cmp	al , IP_PROTO_TCP
-;        je      TCP_handler
+	je	TCP_handler
 ;        loop    @r                 ;
 	movzx	eax, byte [edx + IPv4_Packet.VersionAndIHL]	; Calculate Header length by using IHL field
 	and	ax, 0x000F					;
+	shl	ax, 2						;
-	shl	ax, 2						;
+	sub	ecx, eax
 	sub	ecx, eax					;
 	add	eax, edx
 	push	eax
+	mov	al , [edx + IPv4_Packet.Protocol]
+;----------------------- experimental
+	mov	esi, [edx + IPv4_Packet.SourceAddress]
+	mov	edi, [edx + IPv4_Packet.DestinationAddress]
-	mov	al , [edx + IPv4_Packet.Protocol]
+;-----------------------
 	pop	edx						; Offset to data (tcp/udp/icmp/.. Packet)
 	cmp	al , IP_PROTO_TCP
-;        je      TCP_handler
+	je	TCP_handler
 ;     ebx = source ip
 ;     ecx = data length
 ;     dx  = fragment id
 ;     di  = protocol
+;
-; OUT: eax points to buffer start
+; OUT: eax = pointer to buffer start
-;      ebx is size of complete buffer
-;      edi = pointer to start of data (-1 on error)
+;      ebx = pointer to device struct (needed for sending procedure)
 ;      ecx = unchanged (packet size of embedded data)
-;      edx = pointer to device struct (needed for sending procedure)
+;      edx = size of complete buffer
 ;      esi = pointer to sending procedure
+;      edi = pointer to start of data (-1 on error)
+;
 ;-----------------------------------------------------------------
 	lea	eax, [edx + ETH_DEVICE.mac]
 	mov	ebx, esp
 	mov	ecx, [esp+18]	 ;; 18 or  22 ??
 	add	ecx, IPv4_Packet.DataOrOptional
 	mov	di , ETHER_IPv4
-	call	ETH_create_Packet		   ; TODO: figure out a way to make this work with other protocols too
+	call	ETH_create_packet		   ; TODO: figure out a way to make this work with other protocols too
 	add	esp, 6
 	cmp	edi, -1
 	je	.exit
 	pop	ecx
 	mov	[edi + IPv4_Packet.SourceAddress], ecx
 	pop	ecx
 	mov	[edi + IPv4_Packet.DestinationAddress], ecx
+	push	eax ebx edx
+	; calculate checksum
+	xor	edx, edx
-	push	eax
+	mov	esi, edi
+	mov	ecx, IPv4_Packet.DataOrOptional
-	stdcall checksum_jb, edi, IPv4_Packet.DataOrOptional ; buf_ptr, buf_size
+	call	checksum_1
-	xchg	al, ah
+	call	checksum_2
-	mov	[edi + IPv4_Packet.HeaderChecksum], ax
+	mov	[edi + IPv4_Packet.HeaderChecksum], dx
-	pop	eax ecx
+	pop	edx ebx eax ecx
 	add	edi, IPv4_Packet.DataOrOptional
-	DEBUGF 1,"IPv4 Packet for device %x created successfully\n", edx
+	DEBUGF 1,"IPv4 Packet for device %x created successfully\n", ebx
 	ret
   .not_found:
 	DEBUGF 1,"Create IPv4 Packet - ARP entry not found!\n"
-	; TODO: QUEUE!
+	; TODO: QUEUE the packet to resend later!

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/IPv4.inc – Rev 1208 → 1249