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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 983 $
+$Revision: 1206 $
+;
 ;  IN:  /
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 UDP_init:
 	xor	eax, eax
 ;       UDP Packet size in ecx
 ;       pointer to UDP Packet data in edx
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
+align 4
 UDP_handler:
 	DEBUGF 1,"UDP_Handler\n"
-	; TODO: First validate the header & checksum. Discard buffer if error
+	; TODO: First validate the header & checksum!
 	; Look for a socket where
 	; IP Packet UDP Destination Port = local Port
 	; IP Packet SA = Remote IP
-	mov	esi, net_sockets
-  .try_more:
+	mov	eax, net_sockets
-	mov	ax , [edx + UDP_Packet.DestinationPort]   ; get the local port from the IP Packet's UDP header
+  .try_more:
-	rol	ax , 8
+	mov	bx , [edx + UDP_Packet.DestinationPort]   ; get the local port from the IP Packet's UDP header
   .next_socket:
-	mov	esi, [esi + SOCKET.NextPtr]
+	mov	eax, [eax + SOCKET.NextPtr]
-	or	esi, esi
+	or	eax, eax
+	jz	.dump
+	cmp	[eax + SOCKET.Domain], AF_INET4
-	jz	.dump
+	jne	.next_socket
-	cmp	[esi + SOCKET.Type], IP_PROTO_UDP
+	cmp	[eax + SOCKET.Type], IP_PROTO_UDP
 	jne	.next_socket
-	cmp	[esi + SOCKET.LocalPort], ax
+	cmp	[eax + SOCKET.LocalPort], bx
 	jne	.next_socket
 	; 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	[esi + SOCKET.RemoteIP], 0xffffffff
+	cmp	[eax + SOCKET.RemoteIP], 0xffffffff
-	je	@f
+	je	.ok1
-	mov	eax, [esp]
-	mov	eax, [eax + ETH_FRAME.Data + IPv4_Packet.SourceAddress] ; get the Source address from the IP Packet
+	mov	ebx, [esp]
-	cmp	[esi + SOCKET.RemoteIP], eax
-	jne	.try_more					      ; Quit if the source IP is not valid, check for more sockets with this IP/PORT combination
+	mov	ebx, [ebx + ETH_FRAME.Data + IPv4_Packet.SourceAddress] ; get the Source address from the IP Packet
+	cmp	[eax + SOCKET.RemoteIP], eax
-    @@:
-	DEBUGF 1,"Found valid UDP packet for socket %x\n", esi
+	jne	.try_more					      ; Quit if the source IP is not valid, check for more sockets with this IP/PORT combination
-;        sub     ecx, UDP_Packet.Data                    ; get # of bytes in ecx
+  .ok1:
-;        mov     eax, ecx
-	movzx	ecx, [edx + UDP_Packet.Length]
+	mov	bx, [edx + UDP_Packet.SourcePort]		      ; Remote port must be 0, or equal to sourceport of packet
-	xchg	cl , ch
-;        cmp     ecx, eax                                ; If UDP packet size is bigger then IP packet told us,
+	cmp	[eax + SOCKET.RemotePort],0
-;        jg      .error                                  ; Something must went wrong!
-	lea	ebx, [esi + SOCKET.lock]
-	call	wait_mutex
-	; OK - we have a valid UDP Packet for this socket.
+	je	.ok2
-	; First, update the sockets remote port number with the incoming msg
-	; - it will have changed
-	; from the original ( 69 normally ) to allow further connects
-	mov	ax, [edx + UDP_Packet.SourcePort]	   ; get the UDP source port
-	xchg	al, ah
-	mov	[esi + SOCKET.RemotePort], ax
-	; Now, copy data to socket. We have socket address as [eax + sockets].
-	; We have IP Packet in edx
-	add	edx, UDP_Packet.Data
-	mov	eax, [esi + SOCKET.rxDataCount] 	; get # of bytes already in buffer
-	DEBUGF 1,"bytes in socket: %u ", eax
-	lea	edi, [ecx + eax]			; check for buffer overflow
-	cmp	edi, SOCKETBUFFSIZE - SOCKETHEADERSIZE	;
-	jg	.dump					;
-	add	[esi + SOCKET.rxDataCount], ecx 	; increment the count of bytes in buffer
-	DEBUGF 1,"adding %u bytes\n", ecx
-	; ecx has count, edx points to data
-	lea	edi, [esi + eax + SOCKETHEADERSIZE]
-	push	esi
-	push	ecx
-	mov	esi, edx
+	cmp	[eax + SOCKET.RemotePort], bx
-	shr	ecx, 2
-	rep	movsd	       ; copy the data across
-	pop	ecx
-	and	ecx, 3
-	rep	movsb
-	pop	esi
-	DEBUGF 1,"UDP socket updated\n"
-	mov	[esi + SOCKET.lock], 0
-	; flag an event to the application
-	mov	eax, [esi + SOCKET.PID] 		; get socket owner PID
-	mov	ecx, 1
-	mov	esi, TASK_DATA + TASKDATA.pid
-       .next_pid:
-	cmp	[esi], eax
+	jne	.dump
 	je	.found_pid
-	inc	ecx
+  .ok2:
-	add	esi, 0x20
 	cmp	ecx, [TASK_COUNT]
-	jbe	.next_pid
+	DEBUGF 1,"Found valid UDP packet for socket %x\n", eax
 	lea	esi, [edx + UDP_Packet.Data]
+;
 ;-----------------------------------------------------------------
 UDP_create_packet:
-	DEBUGF 1,"Create UDP Packet\n"
+	DEBUGF 1,"Create UDP Packet (size=%u)\n",ecx
 	push	edx esi
 	add	ecx, UDP_Packet.Data
 	mov	di , IP_PROTO_UDP
 ;       dx  = fragment id
 	and	cx , 3
 	rep	movsb
 	pop	edi
-	pop	ecx
-;        bswap   ecx                                             ; convert little endian - big endian
-;        rol     ecx, 16                                         ;
+	pop	ecx
-	mov	dword [edi + UDP_Packet.SourcePort], ecx	; notice: we write both port's at once
 	mov	dword [edi + UDP_Packet.SourcePort], ecx	; notice: we write both port's at once
+	mov	[edi + UDP_Packet.Checksum], 0
-	mov	[edi + UDP_Packet.Checksum], 0
+	; TODO: calculate checksum using Pseudo-header  (However, using a 0 as checksum shouldnt generate any errors :)
 	; TODO: calculate checksum using Pseudo-header  (However, using a 0 as checksum shouldnt generate any errors :)
 	inc	[UDP_PACKETS_TX]
 	push	ebx eax 		     ; TODO: make this work on other protocols besides ethernet
-	mov	ebx,edx 		     ;
+	push	edx eax 		     ; TODO: make this work on other protocols besides ethernet
+	DEBUGF 1,"Sending UDP Packet to device %x\n", ebx      ;
+	jmp	ETH_Sender		     ;
+  .exit:
+	ret
 	DEBUGF 1,"Sending UDP Packet to device %x\n", ebx      ;
-	jmp	ETH_Sender		     ;
+  .fail:
 	; todo: queue the packet

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/udp.inc – Rev 1197 → 1206