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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 2308 $
+$Revision: 2310 $
-struct  UDP_Packet
+struct  UDP_header
         adc     dl, [IP2+1]
         adc     dh, [IP2+0]
         adc     dl, [IP2+3]
         adc     dh, [IP2+2]
-        adc     dl, cl ; byte[esi+UDP_Packet.Length+1]
+        adc     dl, cl ; byte[esi+UDP_header.Length+1]
-        adc     dh, ch ; byte[esi+UDP_Packet.Length+0]
+        adc     dh, ch ; byte[esi+UDP_header.Length+0]
 ; Done with pseudoheader, now do real header
-        adc     dl, byte[esi+UDP_Packet.SourcePort+1]
+        adc     dl, byte[esi+UDP_header.SourcePort+1]
-        adc     dh, byte[esi+UDP_Packet.SourcePort+0]
+        adc     dh, byte[esi+UDP_header.SourcePort+0]
-        adc     dl, byte[esi+UDP_Packet.DestinationPort+1]
+        adc     dl, byte[esi+UDP_header.DestinationPort+1]
-        adc     dh, byte[esi+UDP_Packet.DestinationPort+0]
+        adc     dh, byte[esi+UDP_header.DestinationPort+0]
-        adc     dl, byte[esi+UDP_Packet.Length+1]
+        adc     dl, byte[esi+UDP_header.Length+1]
-        adc     dh, byte[esi+UDP_Packet.Length+0]
+        adc     dh, byte[esi+UDP_header.Length+0]
         adc     edx, 0
 ; Done with header, now do data
         push    esi
-        movzx   ecx, [esi+UDP_Packet.Length]
+        movzx   ecx, [esi+UDP_header.Length]
         rol     cx , 8
-        sub     cx , sizeof.UDP_Packet
+        sub     cx , sizeof.UDP_header
-        add     esi, sizeof.UDP_Packet
+        add     esi, sizeof.UDP_header
+;
 ;  IN:   [esp]  = Pointer to buffer
 ;       [esp+4] = size of buffer
 ;       ebx = ptr to device struct
 ;       ecx = UDP Packet size
-;       edx = ptr to UDP header
+;       esi = ptr to UDP header
 ;       edi = ptr to ipv4 source and dest address
+;
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 UDP_input:
         DEBUGF  1,"UDP_input, size:%u\n", ecx
+; First validate, checksum
 ; First validate, checksum:
-        neg     [edx+UDP_Packet.Checksum]       ; substract chechksum from 0
+        neg     [esi + UDP_header.Checksum]     ; substract checksum from 0
-        jz      .no_checksum                    ; if checksum is zero, it is considered valid and we continue processing
-                                                ; otherwise, we will re-calculate the checksum and add it to this value, thus creating 0 when it is correct
         jz      .no_checksum                    ; if checksum is zero, it is considered valid and we continue processing
-        push    edx
-        push    edi
+                                                ; otherwise, we will re-calculate the checksum and add it to this value, thus creating 0 when it is correct
-        push    esi
-        mov     esi, edx
         UDP_checksum (edi), (edi+4)
-        pop     edi
+        push    esi
-        pop     esi     ; we dont need it, but it is smaller then add esp, 4
+        UDP_checksum (edi), (edi+4)
         pop     edx
+        jnz     .checksum_mismatch
+  .no_checksum:
+        DEBUGF  1,"UDP Checksum is correct\n"
+        ; Convert port numbers to intel format
         jnz     .checksum_mismatch
         rol     [edx + UDP_header.DestinationPort], 8
-  .no_checksum:
+        rol     [edx + UDP_header.SourcePort], 8
+        rol     [edx + UDP_header.Length], 8
+        ; Look for a socket where
-        DEBUGF  1,"UDP Checksum is correct\n"
+        ; IP Packet UDP Destination Port = local Port
+        ; IP Packet SA = Remote IP
-        ; Look for a socket where
-        ; IP Packet UDP Destination Port = local Port
         ; IP Packet SA = Remote IP
         mov     si, [edx + UDP_header.DestinationPort]
-        mov     eax, net_sockets
+        mov     cx, [edx + UDP_header.SourcePort]
-  .try_more:
+        mov     edi, [edi + 4]                          ; ipv4 source address
+        mov     eax, net_sockets
         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.NextPtr]
-  .next_socket:
+        or      eax, eax
-        mov     eax, [eax + SOCKET.NextPtr]
+        jz      .dump
-        or      eax, eax
+        cmp     [eax + SOCKET.Domain], AF_INET4
-        jz      .dump
+        jne     .next_socket
         cmp     [eax + SOCKET.Domain], AF_INET4
-        jne     .next_socket
+        cmp     [eax + SOCKET.Protocol], IP_PROTO_UDP
-        cmp     [eax + SOCKET.Protocol], IP_PROTO_UDP
+        jne     .next_socket
         jne     .next_socket
-        cmp     [eax + UDP_SOCKET.LocalPort], si
-        jne     .next_socket
+        cmp     [eax + UDP_SOCKET.LocalPort], si
+        jne     .next_socket
         DEBUGF  1,"using socket: %x\n", eax
         DEBUGF  1,"using socket: %x\n", eax
         ;;; TODO: when packet is processed, check more sockets!
-        cmp     [eax + IP_SOCKET.RemoteIP], 0xffffffff
-        je      @f
+        ;;; TODO: when packet is processed, check more sockets!
         mov     edi, [edi + 4]                          ; ipv4 source address
-        cmp     [eax + IP_SOCKET.RemoteIP], edi
+        cmp     [eax + IP_SOCKET.RemoteIP], 0xffffffff
-        jne     .try_more
+        je      @f
-       @@:
+        cmp     [eax + IP_SOCKET.RemoteIP], edi
         jne     .next_socket
-        cmp     [eax + UDP_SOCKET.firstpacket], 0
+       @@:
         jz      .updateport
         cmp     [eax + UDP_SOCKET.firstpacket], 0
-        mov     si, [edx + UDP_Packet.SourcePort]
+        jz      .updateport
-        rol     si, 8
-        cmp     [eax + UDP_SOCKET.RemotePort], si
-        jne     .dump
+        cmp     [eax + UDP_SOCKET.RemotePort], cx
         jne     .dump
         push    ebx
-        lea     ebx, [eax + SOCKET.lock]
+        push    ebx
-        call    wait_mutex
+        lea     ebx, [eax + SOCKET.lock]
-        pop     ebx
+        call    wait_mutex
         pop     ebx
-  .updatesock:
-        inc     [UDP_PACKETS_RX]
-        DEBUGF  1,"Found valid UDP packet for socket %x\n", eax
+  .updatesock:
-        lea     esi, [edx + sizeof.UDP_Packet]
+        inc     [UDP_PACKETS_RX]
-        movzx   ecx, [edx + UDP_Packet.Length]
+        DEBUGF  1,"Found valid UDP packet for socket %x\n", eax
-        rol     cx , 8
+        lea     esi, [edx + sizeof.UDP_header]
         mov     ebx, [eax + IP_SOCKET.LocalIP]
         mov     eax, [eax + IP_SOCKET.RemoteIP]
         mov     di, IP_PROTO_UDP shl 8 + 128
         sub     esp, 8                                          ; Data ptr and data size will be placed here
-        add     ecx, sizeof.UDP_Packet
+        add     ecx, sizeof.UDP_header
 ;;; TODO: fragment id
         push    edx esi
         call    IPv4_output
         jz      .fail
         mov     [esp + 8], eax                                  ; pointer to buffer start
         mov     [esp + 8 + 4], edx                              ; buffer size
-        mov     [edi + UDP_Packet.Length], cx
+        mov     [edi + UDP_header.Length], cx
-        rol     [edi + UDP_Packet.Length], 8
+        rol     [edi + UDP_header.Length], 8
         pop     esi
         push    edi ecx
-        sub     ecx, sizeof.UDP_Packet
+        sub     ecx, sizeof.UDP_header
-        add     edi, sizeof.UDP_Packet
+        add     edi, sizeof.UDP_header
         shr     ecx, 2
         rep     movsd
         mov     ecx, [esp]
         and     ecx, 3
         rep     movsb
         pop     ecx edi
-        pop     dword [edi + UDP_Packet.SourcePort]
+        pop     dword [edi + UDP_header.SourcePort]

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/udp.inc – Rev 2308 → 2310