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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2010. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  UDP.INC                                                        ;;
 ;;                                                                 ;;
 ;;  Part of the tcp/ip network stack for KolibriOS                 ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1485 $
+$Revision: 1514 $
 	rep	stosd
-	ret
 	ret
 ;-----------------------------------------------------------------
 ;
-; UDP_Handler:
+; UDP_input:
+;
-;  Called by IPv4_handler,
+;  Called by IPv4_input,
 ;  this procedure will inject the udp data diagrams in the application sockets.
+;
+;
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
-UDP_handler:
+UDP_input:
-	DEBUGF	1,"UDP_Handler, checksum:%x, size:%u\n", [edx+UDP_Packet.Checksum]:4, ecx
+	DEBUGF	1,"UDP_input, size:%u\n", ecx
 ; First validate, checksum:
 	cmp	[edx + UDP_Packet.Checksum], 0
 	jz	.no_checksum
-	xchg	edi, esi	; save ipv4 source address so we can look it up later
-	push	edx
+	xchg	edi, esi	; save ipv4 source address to edi so we can use it later
-	push	esi
-	push	edi
+	push	edx
-	mov	esi, edx
+	push	esi edi
-	call	UDP_checksum	; this destroys edx, ecx and esi (but not edi! :)
+	mov	esi, edx
 	; IP Packet SA = Remote IP
 	mov	eax, net_sockets
   .try_more:
+	mov	si , [edx + UDP_Packet.DestinationPort]   ; get the local port from the IP Packet's UDP header
-	mov	si , [edx + UDP_Packet.DestinationPort]   ; get the local port from the IP Packet's UDP header
+	rol	si , 8
   .next_socket:
-	mov	eax, [eax + SOCKET_head.NextPtr]
+	mov	eax, [eax + SOCKET.NextPtr]
 	or	eax, eax
 	jz	.dump
-	cmp	[eax + SOCKET_head.Domain], AF_INET4
+	cmp	[eax + SOCKET.Domain], AF_INET4
 	jne	.next_socket
-	cmp	[eax + SOCKET_head.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
 	jne	.next_socket
-	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.LocalPort], si
+	cmp	[eax + UDP_SOCKET.LocalPort], si
 	jne	.next_socket
-	DEBUGF	1,"found socket with matching domain, type and localport\n"
-	; For dhcp, we must allow any remote server to respond.
-	; I will accept the first incoming response to be the one
-	; I bind to, if the socket is opened with a destination IP address of
-	; 255.255.255.255
-	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], 0xffffffff
-	je	.ok1
+	DEBUGF	1,"using socket: %x\n", eax
+	;;; TODO: when packet is processed, check more sockets!
+	cmp	[eax + IP_SOCKET.RemoteIP], 0xffffffff
-	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], edi   ; edi is IPv4 destination address
-	jne	.try_more					      ; Quit if the source IP is not valid, check for more sockets with this IP/PORT combination
+	je	@f
 	cmp	[eax + IP_SOCKET.RemoteIP], edi 	; edi is the packets source address
-	DEBUGF	1,"Remote Ip matches\n"
+	jne	.try_more
+       @@:
-  .ok1:
 	cmp	[eax + UDP_SOCKET.firstpacket], 0
-	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.firstpacket], 0
+	jz	.updateport
-	jz	.updateport
 	mov	si, [edx + UDP_Packet.SourcePort]
-	mov	si, [edx + UDP_Packet.SourcePort]
+	rol	si, 8
-	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort], si
+	cmp	[eax + UDP_SOCKET.RemotePort], si
-	jne	.dump
+	jne	.dump
 	push	ebx
-	lea	ebx, [eax + SOCKET_head.lock]
+	lea	ebx, [eax + SOCKET.lock]
 	call	wait_mutex
 	pop	ebx
-  .ok2:
-	DEBUGF	1,"Found valid UDP packet for socket %x\n", eax
-	lea	esi, [edx + UDP_Packet.Data]
-	movzx	ecx, [edx + UDP_Packet.Length]
-	rol	cx , 8
-	sub	cx , UDP_Packet.Data
-	inc	[UDP_PACKETS_RX]
+  .updatesock:
-	pop	edi
+	inc	[UDP_PACKETS_RX]
-	add	esp, 4
+	DEBUGF	1,"Found valid UDP packet for socket %x\n", eax
 	lea	esi, [edx + UDP_Packet.Data]
-	sub	esi, edi
+	movzx	ecx, [edx + UDP_Packet.Length]
-	xchg	esi, edi
+	rol	cx , 8
+	sub	cx , UDP_Packet.Data
-	jmp	socket_internal_receiver
+	jmp	SOCKET_input
   .updateport:
 	push	ebx
-	push	ebx
+	lea	ebx, [eax + SOCKET.lock]
 ;-----------------------------------------------------------------
+;
-; UDP_socket_send
+; UDP_output
+;
 ; IN: eax = socket pointer
 ;     ecx = number of bytes to send
 ;     esi = pointer to data
 ;
-;-----------------------------------------------------------------
+;-----------------------------------------------------------------
-align 4
-UDP_socket_send:
-	mov	edx, dword [eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.LocalPort] ; load local port and remote port at once
-	DEBUGF	1,"local port: %x, remote port: %x\n",\
+align 4
+UDP_output:
+	DEBUGF	1,"UDP_output: socket:%x, bytes: %u, data ptr: %x\n", eax, ecx, esi
+	mov	dx, [eax + UDP_SOCKET.RemotePort]
+	DEBUGF	1,"remote port: %u\n", dx
+	rol	dx, 8
+	rol	edx, 16
+	mov	dx, [eax + UDP_SOCKET.LocalPort]
-	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.LocalPort]:4,\
+	DEBUGF	1,"local port: %u\n", dx
-	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort]:4
+	rol	dx, 8
 	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
-	mov	eax, [eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
 	mov	ebx, [eax + IP_SOCKET.LocalIP]
-	DEBUGF	1,"Create UDP Packet (size=%u)\n",ecx
+	mov	eax, [eax + IP_SOCKET.RemoteIP]
-	mov	di , IP_PROTO_UDP
-	sub	esp, 8						; Data ptr and data size will be placed here
+	mov	di , IP_PROTO_UDP
-	add	ecx, UDP_Packet.Data
+	sub	esp, 8						; Data ptr and data size will be placed here
 	add	ecx, UDP_Packet.Data
 	mov	ecx, [esp]
 	and	ecx, 3
 	rep	movsb
 	pop	ecx edi
-	pop	dword [edi + UDP_Packet.SourcePort]		; fill in both portnumbers
+	pop	dword [edi + UDP_Packet.SourcePort]
 	mov	[edi + UDP_Packet.Checksum], 0			; set it to zero, to calculate checksum
 ; Checksum
 	call	UDP_checksum
 	inc	[UDP_PACKETS_TX]
+	DEBUGF	1,"Sending UDP Packet to device %x\n", ebx
 	DEBUGF	1,"Sending UDP Packet to device %x\n", ebx
-	jmp	ETH_sender
 	jmp	NET_send
   .fail:
-	; todo: queue the packet
+  .fail:
 	add	esp, 8+8
 	ret
 ;-----------------------------------------------------------------

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/udp.inc – Rev 1485 → 1514