WebSVN – Kolibri OS – Diff – /kernel/trunk/network/udp.inc

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 5584 $
+$Revision: 5842 $
 macro   UDP_checksum    IP1, IP2  { ; esi = ptr to udp packet, ecx = packet size, destroys: ecx, edx
 ; Pseudoheader
         mov     edx, IP_PROTO_UDP
-        add     dl, [IP1+1]
+        add     dl, byte[IP1+1]
-        adc     dh, [IP1+0]
+        adc     dh, byte[IP1+0]
-        adc     dl, [IP1+3]
+        adc     dl, byte[IP1+3]
-        adc     dh, [IP1+2]
+        adc     dh, byte[IP1+2]
-        adc     dl, [IP2+1]
+        adc     dl, byte[IP2+1]
-        adc     dh, [IP2+0]
+        adc     dh, byte[IP2+0]
-        adc     dl, [IP2+3]
+        adc     dl, byte[IP2+3]
-        adc     dh, [IP2+2]
+        adc     dh, byte[IP2+2]
 ;-----------------------------------------------------------------
+;
 ; UDP_input:
+;
 ;  Called by IPv4_input,
-;  this procedure will inject the udp data diagrams in the application sockets.
+;  this procedure will inject the UDP data in the application sockets.
+;
-;  IN:   [esp]  = Pointer to buffer
+;  IN:  [esp] = ptr to buffer
-;       [esp+4] = size of buffer
 ;       ebx = ptr to device struct
-;       ecx = UDP Packet size
+;       ecx = UDP packet size
-;       esi = ptr to UDP header
+;       edx = ptr to IPv4 header
-;       edi = ptr to ipv4 source and dest address
+;       esi = ptr to UDP packet data
+;       edi = interface number*4
+;
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
         neg     [esi + UDP_header.Checksum]     ; substract checksum from 0
         jz      .no_checksum                    ; if checksum is zero, it is considered valid
         ; otherwise, we will re-calculate the checksum and add it to this value, thus creating 0 when it is correct
         mov     eax, edx
-        UDP_checksum (edi), (edi+4)
+        UDP_checksum (eax+IPv4_header.SourceAddress), (eax+IPv4_header.DestinationAddress)
         jnz     .checksum_mismatch
         call    mutex_lock
         popa
         mov     cx, [esi + UDP_header.SourcePort]
-        mov     dx, [esi + UDP_header.DestinationPort]
-        mov     edi, [edi + 4]                          ; ipv4 source address
+        mov     dx, [esi + UDP_header.DestinationPort]
-        mov     eax, net_sockets
         mov     eax, net_sockets
   .next_socket:
         mov     eax, [eax + SOCKET.NextPtr]
         or      eax, eax
         pusha
         mov     ecx, socket_mutex
         call    mutex_unlock
         popa
+        ;;; TODO: when packet is processed, check more sockets?!
-        ;;; TODO: when packet is processed, check more sockets!
+; FIXME: check remote IP if possible
+;
 ;        cmp     [eax + IP_SOCKET.RemoteIP], 0xffffffff
 ;        je      @f
-;        cmp     [eax + IP_SOCKET.RemoteIP], edi
+;        cmp     [eax + IP_SOCKET.RemoteIP],
-;        jne     .next_socket
-;       @@:
 ;        jne     .next_socket
-; FIXME: UDP should check remote IP, but not under all circumstances!
+;       @@:
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_lock
         popa
-  .updatesock:
-        call    NET_ptr_to_num4
+  .updatesock:
         inc     [UDP_PACKETS_RX + edi]
         movzx   ecx, [esi + UDP_header.Length]
         mov     dx, [eax + UDP_SOCKET.LocalPort]
         DEBUGF  DEBUG_NETWORK_VERBOSE, "local port=%x\n", dx
         sub     esp, 4                                          ; Data ptr will be placed here
-        push    edx esi
-        mov     edx, [eax + IP_SOCKET.LocalIP]
+        push    edx esi
+        mov     ebx, [eax + IP_SOCKET.device]
-        mov     ebx, [eax + IP_SOCKET.device]
+        mov     edx, [eax + IP_SOCKET.LocalIP]
+        mov     edi, [eax + IP_SOCKET.RemoteIP]
-        mov     eax, [eax + IP_SOCKET.RemoteIP]
+        mov     al, [eax + IP_SOCKET.ttl]
-        mov     di, IP_PROTO_UDP shl 8 + 128
+        mov     ah, IP_PROTO_UDP
         add     ecx, sizeof.UDP_header
         call    IPv4_output
         jz      .fail
         jne     @f
         call    SOCKET_find_port
        @@:
-        push    eax
-        init_queue (eax + SOCKET_QUEUE_LOCATION)                ; Set up data receiving queue
-        pop     eax
         push    eax
         lea     ecx, [eax + SOCKET.mutex]
         call    mutex_unlock
         pop     eax

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/udp.inc – Rev 5584 → 5842