Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7678 → Rev 7679

/kernel/trunk/network/ARP.inc
259,7 → 259,7
movsd ; Move sender IP to Dest IP
 
pop esi
mov esi, [net_drv_list + esi]
mov esi, [net_device_list + esi]
lea esi, [esi + ETH_DEVICE.mac]
lea edi, [edx + ARP_header.SenderMAC]
movsd ; Copy MAC address from in MAC_LIST
539,7 → 539,7
pop edi eax ; IP in eax, device number in ebx, for ARP_output_request
 
push esi edi
mov ebx, [net_drv_list + edi]
mov ebx, [net_device_list + edi]
call arp_output_request
pop edi esi
.found_it:
669,7 → 669,7
ret
 
.send_announce:
mov ebx, [net_drv_list + eax]
mov ebx, [net_device_list + eax]
mov eax, [IPv4_address + eax]
call arp_output_request ; now send a gratuitous ARP
ret
/kernel/trunk/network/IPv4.inc
648,7 → 648,7
inc [IPv4_packets_tx + edi] ; update stats
 
mov ax, ETHER_PROTO_IPv4
mov ebx, [net_drv_list + edi]
mov ebx, [net_device_list + edi]
mov ecx, [esp + 6 + 8 + 2]
add ecx, sizeof.IPv4_header
mov edx, esp
747,7 → 747,7
 
inc [IPv4_packets_tx + 4*edi]
mov ax, ETHER_PROTO_IPv4
mov ebx, [net_drv_list + 4*edi]
mov ebx, [net_device_list + 4*edi]
mov ecx, [esp + 6 + 4]
add ecx, sizeof.IPv4_header
mov edx, esp
1114,7 → 1114,7
or ebx, ecx
mov [IPv4_broadcast + eax], ebx
 
mov ebx, [net_drv_list + eax]
mov ebx, [net_device_list + eax]
mov eax, [IPv4_address + eax]
call arp_output_request ; now send a gratuitous ARP
 
/kernel/trunk/network/PPPoE.inc
131,7 → 131,7
cmp ebx, NET_DEVICES_MAX
ja .bad
 
mov ebx, [net_drv_list + 4*ebx]
mov ebx, [net_device_list + 4*ebx]
test ebx, ebx
jz .bad
 
/kernel/trunk/network/ethernet.inc
1,6 → 1,6
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;
;; Copyright (C) KolibriOS team 2004-2015. All rights reserved. ;;
;; Copyright (C) KolibriOS team 2004-2019. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License ;;
;; ;;
;; ETHERNET.INC ;;
285,7 → 285,7
cmp bh, NET_DEVICES_MAX
ja .error
movzx eax, bh
mov eax, dword [net_drv_list + 4*eax]
mov eax, dword [net_device_list + 4*eax]
cmp [eax + NET_DEVICE.device_type], NET_DEVICE_ETH
jne .error
 
/kernel/trunk/network/socket.inc
1228,7 → 1228,7
cmp edx, NET_DEVICES_MAX
ja .invalid
 
mov edx, [net_drv_list + 4*edx]
mov edx, [net_device_list + 4*edx]
test edx, edx
jz .already
mov [eax + SOCKET.device], edx
/kernel/trunk/network/stack.inc
251,8 → 251,8
uglobal
align 4
 
net_running dd ?
net_drv_list rd NET_DEVICES_MAX
net_device_count dd ?
net_device_list rd NET_DEVICES_MAX
 
net_buffs_free rd NET_BUFFERS
.current dd ?
290,7 → 290,7
 
; Init the network drivers list
xor eax, eax
mov edi, net_running
mov edi, net_device_count
mov ecx, (NET_DEVICES_MAX + 1)
rep stosd
 
346,7 → 346,7
je .exit
mov [net_10ms], eax
 
cmp [net_running], 0
cmp [net_device_count], 0
je .exit
 
test [net_10ms], 0x0f ; 160ms
460,7 → 460,7
 
DEBUGF DEBUG_NETWORK_VERBOSE, "net_add_device: %x\n", ebx ;;; TODO: use mutex to lock net device list
 
cmp [net_running], NET_DEVICES_MAX
cmp [net_device_count], NET_DEVICES_MAX
jae .error
 
;----------------------------------
467,7 → 467,7
; Check if device is already listed
mov eax, ebx
mov ecx, NET_DEVICES_MAX ; We need to check whole list because a device may be removed without re-organizing list
mov edi, net_drv_list
mov edi, net_device_list
 
repne scasd ; See if device is already in the list
jz .error
476,7 → 476,7
; Find empty slot in the list
xor eax, eax
mov ecx, NET_DEVICES_MAX
mov edi, net_drv_list
mov edi, net_device_list
 
repne scasd
jnz .error
488,10 → 488,10
mov [edi], ebx ; add device to list
 
mov eax, edi ; Calculate device number in eax
sub eax, net_drv_list
sub eax, net_device_list
shr eax, 2
 
inc [net_running] ; Indicate that one more network device is up and running
inc [net_device_count] ; Indicate that one more network device is up and running
 
call net_send_event
 
517,7 → 517,7
align 4
net_remove_device:
 
cmp [net_running], 0
cmp [net_device_count], 0
je .error
 
;----------------------------
525,7 → 525,7
 
mov eax, ebx
mov ecx, NET_DEVICES_MAX
mov edi, net_drv_list
mov edi, net_device_list
 
repne scasd
jnz .error
535,7 → 535,7
 
xor eax, eax
mov dword [edi-4], eax
dec [net_running]
dec [net_device_count]
 
call net_send_event
 
575,7 → 575,7
 
push ecx
mov ecx, NET_DEVICES_MAX
mov edi, net_drv_list
mov edi, net_device_list
.loop:
cmp ebx, [edi]
je .found
589,7 → 589,7
ret
 
.found:
sub edi, net_drv_list
sub edi, net_device_list
pop ecx
ret
 
717,7 → 717,7
cmp bl, 255
jne @f
 
mov eax, [net_running]
mov eax, [net_device_count]
mov [esp+32], eax
ret
 
729,10 → 729,10
and esi, 0x0000ff00
shr esi, 6
 
cmp dword[esi + net_drv_list], 0 ; check if driver is running
cmp dword[esi + net_device_list], 0 ; check if device is running
je .doesnt_exist
 
mov eax, [esi + net_drv_list]
mov eax, [esi + net_device_list]
 
and ebx, 0x000000ff
cmp ebx, .number
840,7 → 840,7
mov esi, ebx
and esi, 0x0000ff00
shr esi, 6 ; now we have the device num * 4 in esi
cmp [esi + net_drv_list], 0 ; check if driver is running
cmp [esi + net_device_list], 0 ; check if device is running
je .doesnt_exist
 
push .return ; return address (we will be using jumps instead of calls)
/kernel/trunk/network/tcp_usreq.inc
122,7 → 122,7
test eax, eax
jz .enoroute
pop eax
mov ebx, [net_drv_list + edi]
mov ebx, [net_device_list + edi]
mov [eax + TCP_SOCKET.device], ebx
mov [eax + TCP_SOCKET.LocalIP], edx
popa
/kernel/trunk/network/udp.inc
341,7 → 341,7
test eax, eax
jz .enoroute
pop eax
mov ebx, [net_drv_list + edi]
mov ebx, [net_device_list + edi]
mov [eax + UDP_SOCKET.device], ebx
mov [eax + UDP_SOCKET.LocalIP], edx
popa