BlueGreycalmElegant

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/branches/Kolibri-acpi/network/IPv4.inc @ 3626

  → /kernel/branches/Kolibri-acpi/network/IPv4.inc @ 3725

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 3626 → Rev 3725

/kernel/branches/Kolibri-acpi/network/IPv4.inc
55,8 → 55,8
ends
uglobal
align 4
uglobal
IP_LIST rd NET_DEVICES_MAX
SUBNET_LIST rd NET_DEVICES_MAX
69,6 → 69,7
IP_packets_dumped rd NET_DEVICES_MAX
FRAGMENT_LIST rb MAX_FRAGMENTS * sizeof.FRAGMENT_slot
endg
84,7 → 85,7
xor eax, eax
mov edi, IP_LIST
mov ecx, 7*NET_DEVICES_MAX + (sizeof.FRAGMENT_slot*MAX_FRAGMENTS)/4
rep stosd
rep stosd
}
223,8 → 224,7
;-----------------------------------
; Check if destination IP is correct
call NET_ptr_to_num
shl edi, 2
call NET_ptr_to_num4
; check if it matches local ip (Using RFC1122 strong end system model)
476,10 → 476,10
push cx ; First copy dword-wise, then byte-wise
shr cx, 2 ;
rep movsd ;
rep movsd ;
pop cx ;
and cx, 3 ;
rep movsb ;
rep movsb ;
push eax
push edx ; Push pointer to fragment onto stack
586,9 → 586,9
push ebx ; push the mac onto the stack
push ax
inc [IP_packets_tx + 4*edi] ; update stats
inc [IP_packets_tx + edi] ; update stats
mov ebx, [NET_DRV_LIST + 4*edi]
mov ebx, [NET_DRV_LIST + edi]
lea eax, [ebx + ETH_DEVICE.mac]
mov edx, esp
mov ecx, [esp + 10 + 6]
696,7 → 696,7
;; todo: check socket options if we should add header, or just compute checksum
push edi ecx
rep movsb
rep movsb
pop ecx edi
; [edi + IPv4_header.VersionAndIHL] ; IPv4, normal length (no Optional header)
786,7 → 786,7
; copy header
mov esi, [esp + 2*4]
mov ecx, 5 ; 5 dwords: TODO: use IHL field of the header!
rep movsd
rep movsd
; copy data
mov esi, [esp + 2*4]
795,7 → 795,7
mov ecx, [esp + 1*4]
DEBUGF DEBUG_NETWORK_VERBOSE, "IPv4_fragment: copying %u bytes\n", ecx
rep movsb
rep movsb
; now, correct header
mov ecx, [esp + 1*4]
823,7 → 823,7
call [ebx + NET_DEVICE.transmit]
;<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
mov ecx, [esp+4]
mov ecx, [esp+4]
add [esp], ecx
mov ecx, [esp+3*4+6+4] ; ptr to begin of buff
857,7 → 857,7
; IPv4_route
;
; IN: eax = Destination IP
; OUT: edi = device number
; OUT: edi = device number*4
; eax = ip of gateway if nescessary, unchanged otherwise
;
;---------------------------------------------------------------------------
890,8 → 890,7
.invalid:
mov eax, [GATEWAY_LIST+4] ;;; FIXME
.broadcast:
xor edi, edi ; if none found, use device 1 as default ;;;; FIXME
inc di
mov edi, 4 ; if none found, use device 1 as default ;;;; FIXME
ret