badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Removed unnescessary typecasts in net branch

Browse Source 
git-svn-id: svn://kolibrios.org@2302 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2011-11-07 22:08:40 +00:00
parent 8aee69dafb
commit b2a283b9fe
4 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
kernel/branches/net/network/IPv4.inc
View File

@ -234,7 +234,7 @@ IPv4_input: ; TODO: implement handler for IP options
; check if it matches local ip ; check if it matches local ip
mov eax, dword[IP_LIST+edi] mov eax, [IP_LIST+edi]
cmp [edx + IPv4_Packet.DestinationAddress], eax cmp [edx + IPv4_Packet.DestinationAddress], eax
je .ip_ok je .ip_ok
@ -287,10 +287,10 @@ IPv4_input: ; TODO: implement handler for IP options
; No, it's just a regular IP packet, pass it to the higher protocols ; No, it's just a regular IP packet, pass it to the higher protocols
.handle_it: ; We reach here if packet hasnt been fragmented, or when it already has been re-constructed .handle_it: ; We reach here if packet hasnt been fragmented, or when it already has been re-constructed
movzx eax, byte [edx + IPv4_Packet.VersionAndIHL] ; Calculate Header length by using IHL field movzx eax, [edx + IPv4_Packet.VersionAndIHL] ; Calculate Header length by using IHL field
and eax, 0x0000000f ; and eax, 0x0000000f ;
shl eax, 2 ; shl eax, 2 ;
movzx ecx, word [edx + IPv4_Packet.TotalLength] ; Calculate length of encapsulated Packet movzx ecx, [edx + IPv4_Packet.TotalLength] ; Calculate length of encapsulated Packet
xchg cl , ch ; xchg cl , ch ;
sub ecx, eax ; sub ecx, eax ;
@ -345,7 +345,7 @@ IPv4_input: ; TODO: implement handler for IP options
cmp esi, -1 cmp esi, -1
je .dump je .dump
mov word [esi + FRAGMENT_slot.ttl], 15 ; Reset the ttl mov [esi + FRAGMENT_slot.ttl], 15 ; Reset the ttl
mov esi, [esi + FRAGMENT_slot.ptr] mov esi, [esi + FRAGMENT_slot.ptr]
or edi, -1 or edi, -1
.find_last_entry: ; The following routine will try to find the last entry .find_last_entry: ; The following routine will try to find the last entry
@ -384,15 +384,15 @@ IPv4_input: ; TODO: implement handler for IP options
jmp .dump ; If no free slot was found, dump the packet jmp .dump ; If no free slot was found, dump the packet
.found_free_slot: ; We found a free slot, let's fill in the FRAGMENT_slot structure .found_free_slot: ; We found a free slot, let's fill in the FRAGMENT_slot structure
mov word [esi + FRAGMENT_slot.ttl], 15 ; RFC recommends 15 secs as ttl mov [esi + FRAGMENT_slot.ttl], 15 ; RFC recommends 15 secs as ttl
mov ax , word [edx + IPv4_Packet.Identification] mov ax , [edx + IPv4_Packet.Identification]
mov word [esi + FRAGMENT_slot.id], ax mov [esi + FRAGMENT_slot.id], ax
mov eax, dword [edx + IPv4_Packet.SourceAddress] mov eax,[edx + IPv4_Packet.SourceAddress]
mov dword [esi + FRAGMENT_slot.SrcIP], eax mov [esi + FRAGMENT_slot.SrcIP], eax
mov eax, dword [edx + IPv4_Packet.DestinationAddress] mov eax, [edx + IPv4_Packet.DestinationAddress]
mov dword [esi + FRAGMENT_slot.DstIP], eax mov [esi + FRAGMENT_slot.DstIP], eax
pop eax pop eax
mov dword [esi + FRAGMENT_slot.ptr], eax mov [esi + FRAGMENT_slot.ptr], eax
; Now, replace ethernet header in original buffer with a FRAGMENT_entry structure ; Now, replace ethernet header in original buffer with a FRAGMENT_entry structure
mov [eax + FRAGMENT_entry.NextPtr], -1 mov [eax + FRAGMENT_entry.NextPtr], -1
mov [eax + FRAGMENT_entry.PrevPtr], -1 mov [eax + FRAGMENT_entry.PrevPtr], -1
@ -419,12 +419,12 @@ IPv4_input: ; TODO: implement handler for IP options
.count_bytes: .count_bytes:
cmp [esi + FRAGMENT_entry.PrevPtr], edi cmp [esi + FRAGMENT_entry.PrevPtr], edi
jne .destroy_slot_pop ; Damn, something screwed up, remove the whole slot (and free buffers too if possible!) jne .destroy_slot_pop ; Damn, something screwed up, remove the whole slot (and free buffers too if possible!)
mov cx, word [esi + FRAGMENT_entry.Data + IPv4_Packet.TotalLength] ; Add total length mov cx, [esi + FRAGMENT_entry.Data + IPv4_Packet.TotalLength] ; Add total length
xchg cl, ch xchg cl, ch
DEBUGF 1,"Packet size: %u\n", cx DEBUGF 1,"Packet size: %u\n", cx
add ax, cx add ax, cx
movzx cx, byte [esi + FRAGMENT_entry.Data + IPv4_Packet.VersionAndIHL] ; Sub Header length movzx cx, [esi + FRAGMENT_entry.Data + IPv4_Packet.VersionAndIHL] ; Sub Header length
and cx, 0x000F and cx, 0x000F
shl cx, 2 shl cx, 2
DEBUGF 1,"Header size: %u\n", cx DEBUGF 1,"Header size: %u\n", cx
@ -465,46 +465,46 @@ IPv4_input: ; TODO: implement handler for IP options
mov edx, [esp+4] ; Get pointer to first fragment entry back in edx mov edx, [esp+4] ; Get pointer to first fragment entry back in edx
.rebuild_packet_loop: .rebuild_packet_loop:
movzx ecx, word [edx + FRAGMENT_entry.Data + IPv4_Packet.FlagsAndFragmentOffset] ; Calculate the fragment offset movzx ecx, [edx + FRAGMENT_entry.Data + IPv4_Packet.FlagsAndFragmentOffset] ; Calculate the fragment offset
xchg cl , ch ; intel byte order xchg cl , ch ; intel byte order
shl cx , 3 ; multiply by 8 and clear first 3 bits shl cx , 3 ; multiply by 8 and clear first 3 bits
DEBUGF 1,"Fragment offset: %u\n", cx DEBUGF 1,"Fragment offset: %u\n", cx
lea edi, [eax + ecx] ; Notice that edi will be equal to eax for first fragment lea edi, [eax + ecx] ; Notice that edi will be equal to eax for first fragment
movzx ebx, byte [edx + FRAGMENT_entry.Data + IPv4_Packet.VersionAndIHL] ; Find header size (in ebx) of fragment movzx ebx, [edx + FRAGMENT_entry.Data + IPv4_Packet.VersionAndIHL] ; Find header size (in ebx) of fragment
and bx , 0x000F ; and bx , 0x000F ;
shl bx , 2 ; shl bx , 2 ;
lea esi, [edx + FRAGMENT_entry.Data] ; Set esi to the correct begin of fragment lea esi, [edx + FRAGMENT_entry.Data] ; Set esi to the correct begin of fragment
movzx ecx, word [edx + FRAGMENT_entry.Data + IPv4_Packet.TotalLength] ; Calculate total length of fragment movzx ecx, [edx + FRAGMENT_entry.Data + IPv4_Packet.TotalLength] ; Calculate total length of fragment
xchg cl, ch ; intel byte order xchg cl, ch ; intel byte order
cmp edi, eax ; Is this packet the first fragment ? cmp edi, eax ; Is this packet the first fragment ?
je .first_fragment je .first_fragment
sub cx, bx ; If not, dont copy the header sub cx, bx ; If not, dont copy the header
add esi, ebx ; add esi, ebx ;
.first_fragment: .first_fragment:
push cx ; First copy dword-wise, then byte-wise push cx ; First copy dword-wise, then byte-wise
shr cx, 2 ; shr cx, 2 ;
rep movsd ; rep movsd ;
pop cx ; pop cx ;
and cx, 3 ; and cx, 3 ;
rep movsb ; rep movsb ;
push eax push eax
push edx ; Push pointer to fragment onto stack push edx ; Push pointer to fragment onto stack
mov ebx, [edx + FRAGMENT_entry.Owner] ; we need to remeber the owner, in case this is the last packet mov ebx, [edx + FRAGMENT_entry.Owner] ; we need to remeber the owner, in case this is the last packet
mov edx, [edx + FRAGMENT_entry.NextPtr] ; Set edx to the next pointer mov edx, [edx + FRAGMENT_entry.NextPtr] ; Set edx to the next pointer
call kernel_free ; free the previous fragment buffer (this uses the value from stack) call kernel_free ; free the previous fragment buffer (this uses the value from stack)
pop eax pop eax
cmp edx, -1 ; Check if it is last fragment in chain cmp edx, -1 ; Check if it is last fragment in chain
jne .rebuild_packet_loop jne .rebuild_packet_loop
pop ecx ; pop ecx
xchg cl, ch xchg cl, ch
mov edx, eax mov edx, eax
mov word [edx + IPv4_Packet.TotalLength], cx mov [edx + IPv4_Packet.TotalLength], cx
add esp, 8 add esp, 8
xchg cl, ch ; xchg cl, ch ;
@ -550,17 +550,17 @@ IPv4_find_fragment_slot:
;;; TODO: the RFC says we should check protocol number too ;;; TODO: the RFC says we should check protocol number too
push eax ebx ecx edx push eax ebx ecx edx
mov ax , word [edx + IPv4_Packet.Identification] mov ax , [edx + IPv4_Packet.Identification]
mov ecx, MAX_FRAGMENTS mov ecx, MAX_FRAGMENTS
mov esi, FRAGMENT_LIST mov esi, FRAGMENT_LIST
mov ebx, dword [edx + IPv4_Packet.SourceAddress] mov ebx, [edx + IPv4_Packet.SourceAddress]
mov edx, dword [edx + IPv4_Packet.DestinationAddress] mov edx, [edx + IPv4_Packet.DestinationAddress]
.find_slot: .find_slot:
cmp word [esi + FRAGMENT_slot.id], ax cmp [esi + FRAGMENT_slot.id], ax
jne .try_next jne .try_next
cmp dword [esi + FRAGMENT_slot.SrcIP], ebx cmp [esi + FRAGMENT_slot.SrcIP], ebx
jne .try_next jne .try_next
cmp dword [esi + FRAGMENT_slot.DstIP], edx cmp [esi + FRAGMENT_slot.DstIP], edx
je .found_slot je .found_slot
.try_next: .try_next:
add esi, FRAGMENT_slot.size add esi, FRAGMENT_slot.size
@ -630,7 +630,7 @@ IPv4_output:
rol [edi + IPv4_Packet.TotalLength], 8 ; internet byte order rol [edi + IPv4_Packet.TotalLength], 8 ; internet byte order
mov [edi + IPv4_Packet.FlagsAndFragmentOffset], 0x0000 mov [edi + IPv4_Packet.FlagsAndFragmentOffset], 0x0000
mov [edi + IPv4_Packet.HeaderChecksum], 0 mov [edi + IPv4_Packet.HeaderChecksum], 0
popw word [edi + IPv4_Packet.TimeToLive] ; ttl shl 8 + protocol pop word [edi + IPv4_Packet.TimeToLive] ; ttl shl 8 + protocol
; [edi + IPv4_Packet.Protocol] ; [edi + IPv4_Packet.Protocol]
popw [edi + IPv4_Packet.Identification] ; fragment id popw [edi + IPv4_Packet.Identification] ; fragment id
popd [edi + IPv4_Packet.SourceAddress] popd [edi + IPv4_Packet.SourceAddress]

34
kernel/branches/net/network/icmp.inc
View File

@ -192,29 +192,29 @@ ICMP_input:
pop [esi + IPv4_Packet.DestinationAddress] pop [esi + IPv4_Packet.DestinationAddress]
; Recalculate ip header checksum ; Recalculate ip header checksum
movzx ecx, byte [esi + IPv4_Packet.VersionAndIHL] ; Calculate IP Header length by using IHL field movzx ecx, [esi + IPv4_Packet.VersionAndIHL] ; Calculate IP Header length by using IHL field
and ecx, 0x0f and ecx, 0x0f
shl cx, 2 shl cx, 2
mov edi, ecx ; IP header length mov edi, ecx ; IP header length
mov eax, edx ; ICMP packet start addr mov eax, edx ; ICMP packet start addr
push esi ; Calculate the IP checksum push esi ; Calculate the IP checksum
xor edx, edx ; xor edx, edx ;
call checksum_1 ; call checksum_1 ;
call checksum_2 ; call checksum_2 ;
pop esi ; pop esi ;
mov word [esi + IPv4_Packet.HeaderChecksum], dx ; mov [esi + IPv4_Packet.HeaderChecksum], dx ;
; Recalculate ICMP CheckSum ; Recalculate ICMP CheckSum
movzx ecx, word[esi + IPv4_Packet.TotalLength] ; Find length of IP Packet movzx ecx, [esi + IPv4_Packet.TotalLength] ; Find length of IP Packet
xchg ch, cl ; xchg ch, cl ;
sub ecx, edi ; IP packet length - IP header length = ICMP packet length sub ecx, edi ; IP packet length - IP header length = ICMP packet length
mov esi, eax ; Calculate ICMP checksum mov esi, eax ; Calculate ICMP checksum
xor edx, edx ; xor edx, edx ;
call checksum_1 ; call checksum_1 ;
call checksum_2 ; call checksum_2 ;
mov word [eax + ICMP_Packet.Checksum], dx ; mov [eax + ICMP_Packet.Checksum], dx ;
; Transmit the packet (notice that packet ptr and packet size have been on stack since start of the procedure!) ; Transmit the packet (notice that packet ptr and packet size have been on stack since start of the procedure!)
call [ebx + NET_DEVICE.transmit] call [ebx + NET_DEVICE.transmit]

10
kernel/branches/net/network/socket.inc
View File

@ -566,7 +566,7 @@ SOCKET_listen:
call SOCKET_num_to_ptr call SOCKET_num_to_ptr
jz s_error jz s_error
cmp word [eax + SOCKET.Domain], AF_INET4 cmp [eax + SOCKET.Domain], AF_INET4
jne s_error jne s_error
cmp [eax + SOCKET.Protocol], IP_PROTO_TCP cmp [eax + SOCKET.Protocol], IP_PROTO_TCP
@ -620,7 +620,7 @@ SOCKET_accept:
test [eax + SOCKET.options], SO_ACCEPTCON test [eax + SOCKET.options], SO_ACCEPTCON
jz s_error jz s_error
cmp word [eax + SOCKET.Domain], AF_INET4 cmp [eax + SOCKET.Domain], AF_INET4
jne s_error jne s_error
cmp [eax + SOCKET.Protocol], IP_PROTO_TCP cmp [eax + SOCKET.Protocol], IP_PROTO_TCP
@ -864,11 +864,11 @@ SOCKET_get_opt:
jz s_error jz s_error
cmp dword [edx], IP_PROTO_TCP cmp dword [edx], IP_PROTO_TCP
jnz s_error jne s_error
cmp dword [edx+4], -2 cmp dword [edx+4], -2
jz @f je @f
cmp dword [edx+4], -3 cmp dword [edx+4], -3
jnz s_error jne s_error
@@: @@:
; mov eax, [edx+12] ; mov eax, [edx+12]
; test eax, eax ; test eax, eax

2
kernel/branches/net/network/stack.inc
View File

@ -383,7 +383,7 @@ NET_remove_device:
mov ecx, MAX_NET_DEVICES mov ecx, MAX_NET_DEVICES
mov edi, NET_DRV_LIST+4 mov edi, NET_DRV_LIST+4
repe scasd repe scasd
jz @f je @f
push dword [edi-4] push dword [edi-4]
pop [NET_DRV_LIST] pop [NET_DRV_LIST]
@@: @@: