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

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 8896 $
+$Revision: 9017 $
 uglobal
         net_10ms        dd ?
         net_tmr_count   dw ?
 endg
 DEBUG_NETWORK_ERROR     = 1
-DEBUG_NETWORK_ERROR     = 1
+DEBUG_NETWORK_VERBOSE   = 0
-DEBUG_NETWORK_VERBOSE   = 0
+NETWORK_SANITY_CHECKS   = 1
 align 4
         net_device_count        dd ?
         net_device_list         rd NET_DEVICES_MAX
+        net_buffs_free          rd NET_BUFFERS  ; list of pointers to actual net buffs
+        .current                dd ?            ; pointer to current element in net_buffs_free list
+if defined NETWORK_SANITY_CHECKS
+        net_buffs_low           dd ?            ; actual net buff mem region start
-        net_buffs_free          rd NET_BUFFERS
+        net_buffs_high          dd ?            ; actual net buff mem region stop
-        .current                dd ?
+end if
 ; allocate network buffers
         stdcall kernel_alloc, NET_BUFFER_SIZE*NET_BUFFERS
         test    eax, eax
         jz      .fail
+if defined NETWORK_SANITY_CHECKS
+        mov     [net_buffs_low], eax
+end if
         mov     edi, net_buffs_free
         mov     ecx, NET_BUFFERS
         cld
   .loop:
         stosd
         add     eax, NET_BUFFER_SIZE
         dec     ecx
+        jnz     .loop
+if defined NETWORK_SANITY_CHECKS
+        sub     eax, NET_BUFFER_SIZE
+        mov     [net_buffs_high], eax
-        jnz     .loop
+end if
         mov     eax, net_buffs_free
         stosd
         mov     eax, [eax]
         add     [net_buffs_free.current], 4
+        spin_unlock_irqrestore
+if defined NETWORK_SANITY_CHECKS
+        cmp     eax, [net_buffs_low]
+        cmp     eax, [net_buffs_low]
+        jb      .assert_mbuff
+        cmp     eax, [net_buffs_high]
+        ja      .assert_mbuff
+        test    eax, 0x7ff
+        jnz     .assert_mbuff
-        spin_unlock_irqrestore
+end if
         DEBUGF  DEBUG_NETWORK_VERBOSE, "net_buff_alloc: 0x%x\n", eax
         ret
   .too_large:
         xor     eax, eax
         DEBUGF  DEBUG_NETWORK_ERROR, "net_buff_alloc: too large!\n"
+        ret
+if defined NETWORK_SANITY_CHECKS
+  .assert_mbuff:
+        DEBUGF  DEBUG_NETWORK_ERROR, "net_buff_alloc: invalid buffer 0x%x\n", eax
+        DEBUGF  DEBUG_NETWORK_ERROR, "net_buff_alloc: caller=0x%x\n", [esp+4]
+        xor     eax, eax
+        ret
+end if
         ret
 endp
+align 4
+proc net_buff_free stdcall, buffer
+        DEBUGF  DEBUG_NETWORK_VERBOSE, "net_buff_free: 0x%x\n", [buffer]
+if defined NETWORK_SANITY_CHECKS
+        mov     eax, [buffer]
+        cmp     eax, [net_buffs_low]
+        jb      .assert_mbuff
+        cmp     eax, [net_buffs_high]
-align 4
+        ja      .assert_mbuff
-proc net_buff_free stdcall, buffer
+        test    eax, 0x7ff
         jnz     .assert_mbuff
-        DEBUGF  DEBUG_NETWORK_VERBOSE, "net_buff_free: 0x%x\n", [buffer]
+end if
         spin_lock_irqsave
+        sub     [net_buffs_free.current], 4             ; move pointer backwards
+        mov     eax, [net_buffs_free.current]           ; place free'd buffer pointer on the list
+        push    [buffer]
+        pop     dword[eax]
+        spin_unlock_irqrestore
+        ret
-        sub     [net_buffs_free.current], 4             ; move pointer backwards
+if defined NETWORK_SANITY_CHECKS
-        mov     eax, [net_buffs_free.current]           ; place free'd buffer pointer on the list
+  .assert_mbuff:
-        push    [buffer]
+        DEBUGF  DEBUG_NETWORK_ERROR, "net_buff_free: invalid buffer 0x%x\n", eax
-        dd      .packets_tx             ; 6
+        dd      .packets_tx             ;  6
-        dd      .packets_rx             ; 7
+        dd      .packets_rx             ;  7
-        dd      .bytes_tx               ; 8
+        dd      .bytes_tx               ;  8
-        dd      .bytes_rx               ; 9
+        dd      .bytes_rx               ;  9
         dd      .state                  ; 10
+        dd      .packets_tx_err         ; 11
+        dd      .packets_tx_drop        ; 12
+        dd      .packets_tx_ovr         ; 13
+        dd      .packets_rx_err         ; 14
+        dd      .packets_rx_drop        ; 15
+        dd      .packets_rx_ovr         ; 16
   .number = ($ - .table) / 4 - 1
   .get_type:
         mov     eax, [eax + NET_DEVICE.device_type]
         mov     [esp+32], eax
         ret
-  .get_dev_name:
-; { Patch by Coldy, sanity check
+  .get_dev_name:
-        mov     ebx, eax ; eax will used for is_region_userspace return
+        mov     ebx, eax
         stdcall is_region_userspace, ecx, 64
-        jz      .bad_buffer
-        mov     esi, [ebx + NET_DEVICE.name] ;mov     esi, [eax + NET_DEVICE.name]
+        jz      .bad_buffer
-; } End patch by Coldy, sanity check
+        mov     esi, [ebx + NET_DEVICE.name]
         mov     edi, ecx
         mov     [esp+20], ebx
         mov     eax, dword[eax + NET_DEVICE.bytes_rx]
         mov     [esp+32], eax
         ret
+  .packets_tx_err:
+        mov     eax, [eax + NET_DEVICE.packets_tx_err]
+        mov     [esp+32], eax
+        ret
+  .packets_tx_drop:
+        mov     eax, [eax + NET_DEVICE.packets_tx_drop]
+        mov     [esp+32], eax
+        ret
+  .packets_tx_ovr:
+        mov     eax, [eax + NET_DEVICE.packets_tx_ovr]
+        mov     [esp+32], eax
+        ret
+  .packets_rx_err:
+        mov     eax, [eax + NET_DEVICE.packets_rx_err]
+        mov     [esp+32], eax
+        ret
+  .packets_rx_drop:
+        mov     eax, [eax + NET_DEVICE.packets_rx_drop]
+        mov     [esp+32], eax
+        ret
+  .packets_rx_ovr:
+        mov     eax, [eax + NET_DEVICE.packets_rx_ovr]
+        mov     [esp+32], eax
+        ret
   .state:
         mov     eax, [eax + NET_DEVICE.link_state]
         mov     [esp+32], eax

Subversion Repositories Kolibri OS

(root)/kernel/trunk/network/stack.inc – Rev 8896 → 9017