WebSVN – Kolibri OS – Diff – /kernel/branches/Kolibri-acpi/network/IPv4.inc

 align 4
 uglobal
-        IP_LIST         rd MAX_NET_DEVICES
+        IP_LIST                 rd NET_DEVICES_MAX
-        SUBNET_LIST     rd MAX_NET_DEVICES
+        SUBNET_LIST             rd NET_DEVICES_MAX
-        DNS_LIST        rd MAX_NET_DEVICES
+        DNS_LIST                rd NET_DEVICES_MAX
-        GATEWAY_LIST    rd MAX_NET_DEVICES
+        GATEWAY_LIST            rd NET_DEVICES_MAX
-        BROADCAST_LIST  rd MAX_NET_DEVICES
+        BROADCAST_LIST          rd NET_DEVICES_MAX
-        IP_packets_tx   rd MAX_NET_DEVICES
+        IP_packets_tx           rd NET_DEVICES_MAX
-        IP_packets_rx   rd MAX_NET_DEVICES
+        IP_packets_rx           rd NET_DEVICES_MAX
 ;-----------------------------------------------------------------
 macro   IPv4_init {
         xor     eax, eax
         mov     edi, IP_LIST
-        mov     ecx, 7*MAX_NET_DEVICES + (sizeof.FRAGMENT_slot*MAX_FRAGMENTS)/4
+        mov     ecx, 7*NET_DEVICES_MAX + (sizeof.FRAGMENT_slot*MAX_FRAGMENTS)/4
         rep     stosd
+;
 ;------------------------------------------------------------------
 align 4
 IPv4_output:
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_output: size=%u\n", ecx
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_output: size=%u ip=0x%x\n", ecx, eax
         cmp     ecx, 65500              ; Max IPv4 packet size
-        ja      .too_large
-        push    ecx eax edx di
         ja      .too_large
+        push    ecx eax edx di
+        call    IPv4_route              ; outputs device number in edi, dest ip in eax
         cmp     eax, 1 shl 24 + 127
-        je      .loopback
+        test    edi, edi
         jz      .loopback
         call    IPv4_route              ; outputs device number in edi, dest ip in eax
         call    ARP_IP_to_MAC
         test    eax, 0xffff0000         ; error bits
         jnz     .arp_error
         push    ebx                     ; push the mac onto the stack
         push    ax
-        inc     [IP_packets_tx + edi]   ; update stats
+        inc     [IP_packets_tx + 4*edi] ; update stats
-        mov     ebx, [NET_DRV_LIST + edi]
+        mov     ebx, [NET_DRV_LIST + 4*edi]
         lea     eax, [ebx + ETH_DEVICE.mac]
         mov     edx, esp
         mov     ecx, [esp + 10 + 6]
         add     edi, sizeof.IPv4_header
         DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_output: success!\n"
         ret
   .eth_error:
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_output: ethernet error\n"
+        DEBUGF  DEBUG_NETWORK_ERROR, "IPv4_output: ethernet error\n"
         add     esp, 3*4+2+6
         xor     edi, edi
         ret
   .arp_error:
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_output: ARP error=%x\n", eax
+        DEBUGF  DEBUG_NETWORK_ERROR, "IPv4_output: ARP error=%x\n", eax
         add     esp, 3*4+2
         xor     edi, edi
         ret
   .too_large:
         DEBUGF  DEBUG_NETWORK_ERROR, "IPv4_output: Packet too large!\n"
+        xor     edi, edi
-        xor     edi, edi
+        ret
         ret
+  .loopback:
-  .loopback:
+        mov     dword [esp + 2], eax            ; change source IP to dest IP
-        mov     dword [esp + 2], eax
+        mov     ecx, [esp + 10]
         jnz     .arp_error
         push    ebx                     ; push the mac
         push    ax
-        inc     [IP_packets_tx + edi]
+        inc     [IP_packets_tx + 4*edi]
-        mov     ebx, [NET_DRV_LIST + edi]
+        mov     ebx, [NET_DRV_LIST + 4*edi]
         lea     eax, [ebx + ETH_DEVICE.mac]
         mov     edx, esp
         mov     ecx, [esp + 6 + 4]
         add     ecx, sizeof.IPv4_header
-        mov     di, ETHER_IPv4
+        mov     di, ETHER_PROTO_IPv4
         call    ETH_output
         DEBUGF  DEBUG_NETWORK_VERBOSE, "Ipv4_fragment: new fragment"
         mov     eax, [esp + 3*4]
         lea     ebx, [esp + 4*4]
-        mov     di , ETHER_IPv4
+        mov     di , ETHER_PROTO_IPv4
         call    ETH_output
 ;---------------------------------------------------------------------------
+;
 ; IPv4_route
+;
 ; IN:   eax = Destination IP
-; OUT:  edi = device id * 4
+; OUT:  edi = device number
 ;       eax = ip of gateway if nescessary, unchanged otherwise
+;
 ;---------------------------------------------------------------------------
 align 4
 IPv4_route:
         cmp     eax, 0xffffffff
         je      .broadcast
         xor     edi, edi
-        mov     ecx, MAX_NET_DEVICES
+        mov     ecx, NET_DEVICES_MAX
   .loop:
         mov     ebx, [IP_LIST+edi]
         and     ebx, [SUBNET_LIST+edi]
         jz      .next
         mov     edx, eax
         and     edx, [SUBNET_LIST+edi]
+        cmp     ebx, edx
+        jne     .next
         DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_route: %u\n", edi
-        cmp     ebx, edx
+        ret
         je      .found_it
   .next:
         add     edi, 4
-        dec     ecx
-        jnz     .loop
+        dec     ecx
-  .invalid:
-        xor     edi, edi                        ; if none found, use device 0 as default
-        mov     eax, [GATEWAY_LIST]
-  .found_it:
+        jnz     .loop
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "IPv4_route: %u\n", edi
+  .invalid:
-        ret
+        mov     eax, [GATEWAY_LIST+4]       ;;; FIXME
   .broadcast:
         mov     ebx, [SUBNET_LIST + eax]
         not     ebx
         or      ebx, ecx
         mov     [BROADCAST_LIST + eax], ebx
+        mov     ebx, [NET_DRV_LIST + eax]
-        mov     eax, ecx
+        mov     eax, [IP_LIST + eax]
         call    ARP_output_request              ; now send a gratuitous ARP
         call    NET_send_event

Subversion Repositories Kolibri OS

(root)/kernel/branches/Kolibri-acpi/network/IPv4.inc @ 3589 – Rev 3589 → 3626