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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1208 $
+$Revision: 1249 $
 ;-----------------------------------------------------------------
 align 4
 UDP_handler:
 	DEBUGF 1,"UDP_Handler\n"
+	; First validate, checksum:
+	DEBUGF 1,"Real UDP checksum: %x\n", [edx + UDP_Packet.Checksum]:4
+	mov    [edx + UDP_Packet.Checksum], 0
+	pusha
+	rol	cx, 8
+	push	cx
+	rol	cx, 8
+	push	word IP_PROTO_UDP shl 8
+	push	edi
+	push	esi
+	mov	esi, edx
+	xor	edx, edx
+	call	checksum_1
+; Checksum for pseudoheader
+	mov	ecx, 12
+	mov	esi, esp
+	call	checksum_1
+	add	esp, 12
+	call	checksum_2
+	popa
 	; TODO: First validate the header & checksum!
 	; Look for a socket where
 	; IP Packet UDP Destination Port = local Port
 	; IP Packet SA = Remote IP
 	mov	eax, net_sockets
   .try_more:
 	mov	bx , [edx + UDP_Packet.DestinationPort]   ; get the local port from the IP Packet's UDP header
   .next_socket:
-	mov	eax, [eax + SOCKET.NextPtr]
+	mov	eax, [eax + SOCKET_head.NextPtr]
 	or	eax, eax
 	jz	.dump
-	cmp	[eax + SOCKET.Domain], AF_INET4
+	cmp	[eax + SOCKET_head.Domain], AF_INET4
 	jne	.next_socket
-	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET_head.Type], IP_PROTO_UDP
 	jne	.next_socket
-	cmp	[eax + SOCKET.LocalPort], bx
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.LocalPort], bx
 	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.RemoteIP], 0xffffffff
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], 0xffffffff
 	je	.ok1
 	mov	ebx, [esp]
 	mov	ebx, [ebx + ETH_FRAME.Data + IPv4_Packet.SourceAddress] ; get the Source address from the IP Packet   FIXME
-	cmp	[eax + SOCKET.RemoteIP], ebx
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], ebx
 	jne	.try_more					      ; Quit if the source IP is not valid, check for more sockets with this IP/PORT combination
 	DEBUGF 1,"Remote Ip matches\n"
 	movzx	ecx, [edx + UDP_Packet.Length]
 	rol	cx , 8
 	sub	cx , UDP_Packet.Data
 	mov	dx , bx
+	lea	ebx, [eax + SOCKET_head.lock]
+	call	wait_mutex
-	call	socket_internal_receiver
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort], dx	       ; update remote port number
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], edi
+	inc	[UDP_PACKETS_RX]
+	pop	edi
+	add	esp, 4
+	sub	esi, edi
+	xchg	esi, edi
 	jmp	socket_internal_receiver
 	inc	[UDP_PACKETS_RX]
   .dump:
 ;-----------------------------------------------------------------
 ;
-; Note: UDP works only on top of IP protocol :)
-;
+; UDP_socket_send
-; IN: eax = dest ip
-;     ebx = source ip
+;
-;     ecx = data length
+; IN: eax = socket pointer
-;     edx = remote port shl 16 + local port (both in INET order)
+;     ecx = number of bytes to send
+;     esi = pointer to data
-;     esi = data offset
+;
+;-----------------------------------------------------------------
+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",\
 	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.LocalPort]:4,\
+	[eax + SOCKET_head.end + IPv4_SOCKET.end + UDP_SOCKET.RemotePort]:4
+	mov	ebx, [eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
+	mov	eax, [eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP]
+	DEBUGF 1,"Create UDP Packet (size=%u)\n",ecx
+	mov	di , IP_PROTO_UDP
-;-----------------------------------------------------------------
+	sub	esp, 8						; reserve some place in stack for later
-UDP_create_packet:
+; Create the pseudoheader in stack,
+; (now that we still have all the variables that are needed.)
-	DEBUGF 1,"Create UDP Packet (size=%u)\n",ecx
+	push	dword IP_PROTO_UDP shl 8
 	push	eax
-	push	edx esi
+	push	ebx
+	add	ecx, UDP_Packet.Data
+; TODO: fill in:   dx  = fragment id
-	add	ecx, UDP_Packet.Data
-	mov	di , IP_PROTO_UDP
+	push	edx esi
+	call	IPv4_create_packet				; TODO: figure out a way to choose between IPv4 and IPv6
 	cmp	edi, -1
-;       dx  = fragment id
+	je	.fail
 	mov	[esp + 8 + 12], eax				; pointer to buffer start
-	call	IPv4_create_packet				; TODO: figure out a way to choose between IPv4 and IPv6
-	cmp	edi, -1
+	mov	[esp + 8 + 12 + 4], edx 			; buffer size
 	je	.fail
+	rol	cx, 8
-	mov	byte[edi + UDP_Packet.Length], ch
+	mov	[edi + UDP_Packet.Length], cx
-	mov	byte[edi + UDP_Packet.Length+1], cl
+	mov	[esp + 8 + 10], cx
-	sub	ecx , UDP_Packet.Data
+	ror	cx, 8
-	pop	esi
+	pop	esi
+	push	edi ecx
+	sub	ecx, UDP_Packet.Data
+	add	edi, UDP_Packet.Data
+	shr	ecx, 2
+	rep	movsd
+	mov	ecx, [esp]
+	and	cx , 3
+	rep	movsb
+	pop	ecx edi
+	pop	dword [edi + UDP_Packet.SourcePort]		      ; fill in both portnumbers
-	push	edi
+	mov	[edi + UDP_Packet.Checksum], 0			; set it to zero, to calculate checksum
-	add	edi, UDP_Packet.Data
-	push	cx
 	shr	ecx, 2
-	rep	movsd
-	pop	cx
+; Checksum for UDP header + data
-	and	cx , 3
+	xor	edx, edx
-	rep	movsb
-	pop	edi
-	pop	ecx
+	mov	esi, edi
-	mov	dword [edi + UDP_Packet.SourcePort], ecx	; notice: we write both port's at once
+	call	checksum_1
+; Checksum for pseudoheader
-	mov	[edi + UDP_Packet.Checksum], 0
+	mov	ecx, 12
+	mov	esi, esp
 	call	checksum_1
-	; TODO: calculate checksum using Pseudo-header  (However, using a 0 as checksum shouldnt generate any errors :)
+	add	esp, 12 					; remove the pseudoheader from stack
 ; Now create the final checksum and store it in UDP header
-	inc	[UDP_PACKETS_TX]
+	call	checksum_2
 	mov	[edi + UDP_Packet.Checksum], dx

Subversion Repositories Kolibri OS

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