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/ @ 1533

  → /kernel/ @ 1532

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 1533 → Rev 1532

/kernel/branches/net/network/ARP.inc
506,18 → 506,16
;; TODO: check if driver could transmit packet
pop esi
imul esi, ARP_ENTRY.size
add esi, ARP_table
pop eax
imul eax, ARP_ENTRY.size
add eax, ARP_table
mov ecx, 25
.wait_loop:
cmp [esi + ARP_ENTRY.Status], 1
cmp [eax + ARP_ENTRY.Status], 1
je .got_it
push esi
mov esi, 10
call delay_ms
pop esi
loop .wait_loop
mov eax, -2 ; request send

/kernel/branches/net/network/tcp.inc
266,31 → 266,7
} ; returns in dx only
macro TCP_sendseqinit ptr {
push edi ;;;; i dont like this static use of edi
mov edi, [ptr + TCP_SOCKET.ISS]
mov [ptr + TCP_SOCKET.SND_UP], edi
mov [ptr + TCP_SOCKET.SND_MAX], edi
mov [ptr + TCP_SOCKET.SND_NXT], edi
mov [ptr + TCP_SOCKET.SND_UNA], edi
pop edi
}
macro TCP_rcvseqinit ptr {
push edi
mov edi, [ptr + TCP_SOCKET.IRS]
inc edi
mov [ptr + TCP_SOCKET.RCV_NXT], edi
mov [ptr + TCP_SOCKET.RCV_ADV], edi
pop edi
}
;-----------------------------------------------------------------
;
; TCP_input:
444,7 → 420,7
;-----------------------------------
; Is this socket a listening socket?
test [ebx + SOCKET.options], SO_ACCEPTCON
; test [ebx + SOCKET.options], SO_ACCEPTCON
; jnz .listening_socket ;;;;; TODO
;-------------------------------------
501,7 → 477,7
movzx eax, word[edi+2]
rol ax, 8
DEBUGF 1,"Maxseg: %u\n", ax
DEBUGF 1,"Maxseg: %u", ax
mov [ebx + TCP_SOCKET.t_maxseg], eax
517,7 → 493,7
test [edx + TCP_segment.Flags], TH_SYN
jz @f
DEBUGF 1,"Got window option\n"
DEBUGF 1,"Got window option"
;;;;;
@@:
529,7 → 505,7
cmp byte [edi+1], 10
jne .no_options
DEBUGF 1,"Got timestamp option\n"
DEBUGF 1,"Got timestamp option"
;;;;;
556,30 → 532,20
cmp [ebx + TCP_SOCKET.t_state], TCB_ESTABLISHED
jnz .not_uni_xfer
DEBUGF 1,"1\n"
test [edx + TCP_segment.Flags], TH_SYN + TH_FIN + TH_RST + TH_URG
jnz .not_uni_xfer
DEBUGF 1,"2\n"
test [edx + TCP_segment.Flags], TH_ACK
jz .not_uni_xfer
DEBUGF 1,"3\n"
mov eax, [edx + TCP_segment.SequenceNumber]
cmp eax, [ebx + TCP_SOCKET.RCV_NXT]
jne .not_uni_xfer
DEBUGF 1,"4\n"
movzx eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value isntead: todo: figure out where to store it)
cmp eax, [ebx + TCP_SOCKET.SND_WND]
jne .not_uni_xfer
;; movzx eax, [edx + TCP_segment.Window] ;;;;; (should use pre-calculated value isntead: todo: figure out where to store it)
;; cmp eax, [ebx + TCP_SOCKET.SND_WND]
;; jne .not_uni_xfer
DEBUGF 1,"5\n"
mov eax, [ebx + TCP_SOCKET.SND_NXT]
cmp eax, [ebx + TCP_SOCKET.SND_MAX]
jne .not_uni_xfer
618,7 → 584,7
; Delete acknowledged bytes from send buffer
; notice how ecx already holds number of bytes ack-ed
lea eax, [ebx + STREAM_SOCKET.snd]
lea eax, [ebx + snd]
call SOCKET_ring_free
; Stop retransmit timer
654,12 → 620,9
DEBUGF 1,"header prediction: we are receiver\nreceiving %u bytes of data\n", ecx
add esi, edx
lea eax, [ebx + STREAM_SOCKET.rcv]
call SOCKET_ring_write ; Add the data to the socket buffer
lea eax, [ebx + rcv]
call SOCKET_ring_add ; Add the data to the socket buffer
mov eax, ebx
call SOCKET_notify_owner
add [ebx + TCP_SOCKET.RCV_NXT], ecx ; Update sequence number with number of bytes we have copied
or [ebx + TCP_SOCKET.t_flags], TF_DELACK ; Set delayed ack flag
670,7 → 633,7
.not_uni_xfer:
DEBUGF 1,"Header prediction failed\n" ; time to do it the "slow" way :)
DEBUGF 1,"Header prediction failed\n"
;------------------------------
; Calculate receive window size
677,6 → 640,11
;;;;
;-------------------------
; TCP slow input procedure
DEBUGF 1,"TCP slow input procedure\n"
cmp [ebx + TCP_SOCKET.t_state], TCB_LISTEN
je .LISTEN
686,7 → 654,7
;--------------------------------------------
; Protection Against Wrapped Sequence Numbers
; First, check if timestamp is present
; First, check timestamp if present
;;;; TODO
713,9 → 681,7
test [edx + TCP_segment.Flags], TH_SYN
jz .drop
cmp esi, 0xffffff ; destination ip = 255.255.255.255 ?
jz .drop
; TODO: find sender ip address somewhere!
; TODO: check if it's a broadcast or multicast, and drop if so
call SOCKET_fork
740,6 → 706,7
mov [eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_interval
mov ebx, eax
jmp .trim_then_step6
758,9 → 725,11
cmp eax, [ebx + TCP_SOCKET.ISS]
jle .drop_with_reset
DEBUGF 1,"snd_max = %x\n", [ebx + TCP_SOCKET.SND_MAX] ;;; TODO: set this, but where?
; mov eax, [edx + TCP_segment.AckNumber]
cmp eax, [ebx + TCP_SOCKET.SND_MAX]
jg .drop_with_reset
;; cmp eax, [ebx + TCP_SOCKET.SND_MAX]
;; jg .drop_with_reset
@@:
test [edx + TCP_segment.Flags], TH_RST
798,7 → 767,7
push [edx + TCP_segment.SequenceNumber]
pop [ebx + TCP_SOCKET.IRS]
TCP_rcvseqinit ebx
;;; TODO: tcp_rcvseqinit
mov [ebx + TCP_SOCKET.t_flags], TF_ACKNOW
812,7 → 781,7
DEBUGF 1,"TCP: active open\n"
; TODO: update stats
; TODO: set general socket state to connected
; TODO: set socket state to connected
mov [ebx + TCP_SOCKET.t_state], TCB_ESTABLISHED
852,16 → 821,16
.trim_then_step6:
DEBUGF 1,"Trimming window\n"
;----------------------------
; trim any data not in window
DEBUGF 1,"Trimming window\n"
mov eax, [ebx + TCP_SOCKET.RCV_NXT]
sub eax, [edx + TCP_segment.SequenceNumber]
test eax, eax
jz .no_duplicate
jz .no_drop
test [edx + TCP_segment.Flags], TH_SYN
jz .no_drop
879,10 → 848,10
and [edx + TCP_segment.Flags], not (TH_URG)
dec eax
jz .no_duplicate
.no_drop:
DEBUGF 1,"Going to drop %u out of %u bytes\n", eax, ecx
DEBUGF 1,"Going to drop %u bytes of data", eax
; eax holds number of bytes to drop
926,7 → 895,7
.duplicate:
DEBUGF 1,"Duplicate received\n"
DEBUGF 1,"Duplicate received"
;----------------------------------------
; Update statistics for duplicate packets
955,7 → 924,7
; Handle data that arrives after process terminates
cmp [ebx + SOCKET.PID], 0
jg @f
jge @f
cmp [ebx + TCP_SOCKET.t_state], TCB_CLOSE_WAIT
jle @f
967,6 → 936,7
;;; update stats
jmp .drop_with_reset
@@:
;----------------------------------------
1069,14 → 1039,10
jg .ack_dup
jl .ack_nodup
DEBUGF 1,"TCP state = syn received"
;;;;;
.ack_dup:
DEBUGF 1,"Duplicate ACK"
;;;;
.ack_nodup:
1083,8 → 1049,6
;;;; 887
DEBUGF 1,"New ACK"
;-------------------------------------------------
; If the congestion window was inflated to account
; for the other side's cached packets, retrace it
1105,6 → 1069,7
mov [ebx + TCP_SOCKET.timer_retransmission], 120 ;;;; TODO: correct this value
.all_outstanding:
;-------------------------------------------
; Open congestion window in response to ACKs
1114,9 → 1079,9
;------------------------------------------
; Remove acknowledged data from send buffer
xor ecx, ecx ;;;;;;
lea eax, [ebx + STREAM_SOCKET.snd]
call SOCKET_ring_free ;;;; 943 - 956
lea eax, [ebx + snd]
mov ecx, ecx ;;;; 943 - 956
call SOCKET_ring_free
;---------------------------------------
; Wake up process waiting on send buffer
1231,7 → 1196,7
;;; 1040-1050
movzx eax, [edx + TCP_segment.UrgentPointer]
add eax, [ebx + STREAM_SOCKET.rcv + RING_BUFFER.size]
add eax, [ebx + rcv.size]
cmp eax, SOCKET_MAXDATA
jle .not_urgent
1251,36 → 1216,18
.do_data:
DEBUGF 1,"TCP: do data\n"
DEBUGF 1,"TCP: do data:\n"
test [edx + TCP_segment.Flags], TH_FIN
jnz .process_fin
cmp [ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_1
test [ebx + TCP_SOCKET.t_state], TCB_FIN_WAIT_1
jge .dont_do_data
test ecx, ecx
jz .final_processing
DEBUGF 1,"Processing data in segment\n"
;; TODO: check if data is in sequence !
;;; NOW, process the data
movzx eax, [edx + TCP_segment.DataOffset] ;;; todo: remember this in.. edi ?
and eax, 0xf0
shr al, 2
lea esi, [edx + eax]
or [ebx + TCP_SOCKET.t_flags], TF_DELACK
add [ebx + TCP_SOCKET.RCV_NXT], ecx ;;; right ?
lea eax, [ebx + STREAM_SOCKET.rcv]
call SOCKET_ring_write
mov eax, ebx
call SOCKET_notify_owner
jmp .final_processing
1301,33 → 1248,26
dd .no_fin ;TCB_CLOSED
dd .no_fin ;TCB_LISTEN
dd .no_fin ;TCB_SYN_SENT
dd .fin_syn_est ;TCB_SYN_RECEIVED
dd .fin_syn_est ;TCB_ESTABLISHED
dd ._1131 ;TCB_SYN_RECEIVED
dd ._1131 ;TCB_ESTABLISHED
dd .no_fin ;TCB_CLOSE_WAIT
dd .fin_wait1 ;TCB_FIN_WAIT_1
dd ._1139 ;TCB_FIN_WAIT_1
dd .no_fin ;TCB_CLOSING
dd .no_fin ;TCB_LAST_ACK
dd .fin_wait2 ;TCB_FIN_WAIT_2
dd .fin_timed ;TCB_TIMED_WAIT
dd ._1147 ;TCB_FIN_WAIT_2
dd ._1156 ;TCB_TIMED_WAIT
.fin_syn_est:
._1131:
jmp .final_processing
._1139:
.fin_wait1:
._1147:
jmp .final_processing
._1156:
.fin_wait2:
jmp .final_processing
.fin_timed:
jmp .final_processing
.no_fin:
;-----------------
1337,8 → 1277,6
DEBUGF 1,"Final processing\n"
mov [ebx + SOCKET.lock], 0
;;; if debug enabled, output packet
;test ;;;needoutput = 1
1347,6 → 1285,7
test [ebx + TCP_SOCKET.t_flags], TF_ACKNOW
jnz .ack_now
mov [ebx + SOCKET.lock], 0
call kernel_free
add esp, 4
ret
1360,6 → 1299,7
call TCP_output
pop ebx
mov [ebx + SOCKET.lock], 0
call kernel_free
add esp, 4
ret
1382,6 → 1322,7
call TCP_output
pop ebx
mov [ebx + SOCKET.lock], 0
call kernel_free
add esp, 4
ret
1406,6 → 1347,7
test [edx + TCP_segment.Flags], TH_SYN
jnz .respond_syn
mov [ebx + SOCKET.lock], 0
call kernel_free
add esp, 4
ret
1412,11 → 1354,9
.respond_ack:
mov dl, TH_RST
;;;;
push ebx
call TCP_respond_segment
pop ebx
jmp .destroy_new_socket
1423,11 → 1363,9
.respond_syn:
mov dl, TH_RST + TH_ACK
;;;;
push ebx
call TCP_respond_socket
pop ebx
call TCP_respond_segment
jmp .destroy_new_socket
1445,6 → 1383,7
;;;; kill the newly created socket
mov [ebx + SOCKET.lock], 0
call kernel_free
add esp, 4
ret
1534,7 → 1473,7
test ecx, ecx
jnz .no_zero_window
cmp ebx, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
cmp ebx, [eax + snd.size]
jge @f
and dl, not (TH_FIN) ; clear the FIN flag ??? how can it be set before?
1552,7 → 1491,7
;;;106
mov esi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
mov esi, [eax + snd.size]
cmp esi, ecx
jl @f
mov esi, ecx
1597,7 → 1536,7
mov edi, [eax + TCP_SOCKET.SND_NXT]
add edi, esi ; len
sub edi, [eax + TCP_SOCKET.SND_UNA]
add edi, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
add edi, [eax + snd.size]
cmp edi, 0
jle @f
1610,7 → 1549,7
; From now on, ecx will be the window we advertise to the other end
mov ecx, SOCKET_MAXDATA
sub ecx, [eax + STREAM_SOCKET.rcv + RING_BUFFER.size]
sub ecx, [eax + rcv.size]
;------------------------------
; Sender silly window avoidance
1767,11 → 1706,7
; edi = header size
; esi = snd ring buff ptr
mov ecx, [eax + STREAM_SOCKET.snd + RING_BUFFER.size]
cmp ecx, [eax + TCP_SOCKET.t_maxseg] ;;; right?
jle @f
mov ecx, [eax + TCP_SOCKET.t_maxseg]
@@:
xor ecx, ecx ;;;;;
add ecx, edi ; total TCP segment size
; Start by pushing all TCP header values in reverse order on stack
1803,6 → 1738,8
; Create the IP packet
mov ebx, [eax + IP_SOCKET.LocalIP] ; source ip
mov eax, [eax + IP_SOCKET.RemoteIP] ; dest ip
; mov ecx, ; data length
; mov dx, ; fragment id
mov di, IP_PROTO_TCP shl 8 + 128
call IPv4_output
jz .fail
1810,23 → 1747,25
;-----------------------------------------
; Move TCP header from stack to TCP packet
push ecx
mov ecx, [esp+4]
lea esi, [esp+4+4]
; pop ecx ; header size
; mov esi, esp
; add esp, ecx
; shr ecx, 2
; rep movsd
mov ecx, [esp]
lea esi, [esp+4]
shr ecx, 2
rep movsd
pop ecx ; full TCP packet size
pop esi ; headersize
add esp, esi
pop ecx
add esp, ecx
mov [esp + 4+4], edx ; packet size
mov [esp + 4], eax ; packet ptr
mov [esp + 4+4], edx ; packet size
mov edx, edi ; begin of data
sub edx, esi ; begin of packet (edi = begin of data)
push ecx
sub ecx, esi ; data size
mov edx, edi
sub edx, ecx
;--------------
; Copy the data
1835,34 → 1774,16
; ecx = buffer size
; edi = ptr to buffer
mov eax, [esp+4] ; socket ptr
push edx
add eax, STREAM_SOCKET.snd
mov eax, [esp] ; socket ptr
push ecx edx
add eax, snd
call SOCKET_ring_read
pop esi ecx
pop eax
test [esi + TCP_segment.Flags], TH_SYN + TH_FIN
jz @f
inc [eax + TCP_SOCKET.SND_NXT]
;;; TODO: update sentfin flag
@@:
;-------------------------------------------------------------
; Create the checksum (we have already pushed IPs onto stack)
;; add [eax + TCP_SOCKET.SND_NXT], ecx
mov edx, [eax + TCP_SOCKET.SND_NXT]
cmp edx, [eax + TCP_SOCKET.SND_MAX]
jle @f
mov [eax + TCP_SOCKET.SND_MAX], edx
;;;; TODO: time transmission (420)
@@:
;;; TODO: set retransmission timer
;--------------------
; Create the checksum
DEBUGF 1,"checksum: ptr=%x size=%u\n", esi, ecx
TCP_checksum (eax + IP_SOCKET.LocalIP), (eax + IP_SOCKET.RemoteIP)
2048,9 → 1969,10
mov ecx, TCP_segment.Data
mov di , IP_PROTO_TCP shl 8 + 128
call IPv4_output
test edi, edi
jz .error
pop esi cx
push edx eax
;---------------------------------------------------

/kernel/branches/net/network/socket.inc
169,7 → 169,6
.read_ptr dd ? ; Read pointer
.write_ptr dd ? ; Write pointer
.size dd ? ; Number of bytes buffered
.end:
}
virtual at 0
180,9 → 179,10
virtual at TCP_SOCKET.end
rcv RING_BUFFER
snd RING_BUFFER
STREAM_SOCKET:
.rcv rd RING_BUFFER.end/4
.snd rd RING_BUFFER.end/4
.end:
end virtual
221,6 → 221,14
mov ecx, 4
rep stosd
;--- for random port --
mov al, 0x0 ; set up 1s timer
out 0x70, al
in al, 0x71
;----------------------
@@:
pseudo_random eax
cmp ax, MIN_EPHEMERAL_PORT
227,6 → 235,7
jl @r
cmp ax, MAX_EPHEMERAL_PORT
jg @r
mov [last_UDP_port], ax
@@:
235,6 → 244,7
jl @r
cmp ax, MAX_EPHEMERAL_PORT
jg @r
mov [last_TCP_port], ax
}
308,14 → 318,23
cmp edx, IP_PROTO_TCP
jnz .no_stream
mov ebx, eax
mov esi, eax
stdcall kernel_alloc, SOCKET_MAXDATA
mov [esi + rcv.start_ptr], eax
mov [esi + rcv.write_ptr], eax
mov [esi + rcv.read_ptr], eax
mov [esi + rcv.size], 0
add eax, SOCKET_MAXDATA
mov [esi + rcv.end_ptr], eax
lea eax, [ebx + STREAM_SOCKET.snd]
call SOCKET_ring_create
stdcall kernel_alloc, SOCKET_MAXDATA
mov [esi + snd.start_ptr], eax
mov [esi + snd.write_ptr], eax
mov [esi + snd.read_ptr], eax
mov [esi + snd.size], 0
add eax, SOCKET_MAXDATA
mov [esi + snd.end_ptr], eax
lea eax, [ebx + STREAM_SOCKET.rcv]
call SOCKET_ring_create
ret
.no_stream:
478,12 → 497,10
mov ebx, [TCP_sequence_num]
add [TCP_sequence_num], 6400
mov [eax + TCP_SOCKET.ISS], ebx
mov [eax + TCP_SOCKET.timer_keepalive], TCP_time_keep_init
mov [eax + TCP_SOCKET.timer_keepalive], 120 ; 120*640ms => 75,6 seconds
TCP_sendseqinit eax
;;;; mov [ebx + TCP_SOCKET.timer_retransmission],
;;;; mov [ebx + TCP_SOCKET.timer_retransmission], ;; todo: create macro to set retransmission timer
push eax
call TCP_output
pop eax
654,9 → 671,6
call SOCKET_num_to_ptr
jz s_error
cmp [eax + SOCKET.Type], IP_PROTO_TCP ;;;;;;;;
je .tcp
mov ebx, esi
get_from_queue (eax + SOCKET_QUEUE_LOCATION),\
SOCKET_QUEUE_SIZE,\
693,18 → 707,10
.nd:
; remove the packet ;;; TODO: only if it is empty!!
;;;; call TCP_output ; only if it is tcp
call kernel_free
ret
.tcp:
mov ecx, esi
mov edi, edx
add eax, STREAM_SOCKET.rcv
call SOCKET_ring_read
mov dword[esp+32], ecx ; return number of bytes copied in ebx
ret
781,13 → 787,8
jz s_error
@@:
;;;; TODO: queue the data
push eax
mov ecx, esi
mov esi, edx
add eax, STREAM_SOCKET.snd
call SOCKET_ring_write
pop eax
call TCP_output
mov [esp+32], eax
1027,86 → 1028,58
ret
;--------------------------
;
; eax = ptr to ring struct (just a buffer of the right size)
;
align 4
SOCKET_ring_create:
mov esi, eax
stdcall create_ring_buffer, SOCKET_MAXDATA, PG_SW
DEBUGF 1,"SOCKET_ring_created: %x\n", eax
mov [esi + RING_BUFFER.start_ptr], eax
mov [esi + RING_BUFFER.write_ptr], eax
mov [esi + RING_BUFFER.read_ptr], eax
mov [esi + RING_BUFFER.size], 0
add eax, SOCKET_MAXDATA
mov [esi + RING_BUFFER.end_ptr], eax
ret
;-----------------------------------------------------------------
;
; SOCKET_ring_write
; SOCKET_ring_add
;
; Adds data to a stream socket, and updates write pointer and size
; Adds data to a stream socket
;
; IN: eax = ptr to ring struct
; ecx = data size
; esi = ptr to data
;
; OUT: ecx = number of bytes stored
; OUT: eax = number of bytes stored
;
;-----------------------------------------------------------------
align 4
SOCKET_ring_write:
SOCKET_ring_add:
DEBUGF 1,"SOCKET_ring_write: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
DEBUGF 1,"SOCKET_ring_add: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
add [eax + RING_BUFFER.size], ecx
cmp [eax + RING_BUFFER.size], SOCKET_MAXDATA
mov edi, [eax + RING_BUFFER.size]
add edi, ecx
cmp edi, SOCKET_MAXDATA
jg .too_large
mov [eax + RING_BUFFER.size], edi ; update size
.copy:
mov edi, [eax + RING_BUFFER.write_ptr]
DEBUGF 2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
push ecx ;<<<< 1
mov edi, [eax + RING_BUFFER.write_ptr] ; set write ptr in edi
add [eax + RING_BUFFER.write_ptr], ecx ; update write pointer
mov edx, [eax + RING_BUFFER.end_ptr]
cmp edx, [eax + RING_BUFFER.write_ptr]
jg .copy_in_2
je .wrap_write_ptr
.copy_more:
push ecx
shr ecx, 1
jnc .nb
movsb
.nb:
shr ecx, 1
jnc .nw
movsw
.nw:
test ecx, ecx
jz .nd
and ecx, 3
rep movsb
pop ecx
shr ecx, 2
rep movsd
.nd:
pop ecx
pop ecx ; >>>> 1/2
DEBUGF 2,"Copied %u bytes\n", ecx
cmp edi, [eax + RING_BUFFER.end_ptr]
jge .wrap
mov [eax + RING_BUFFER.write_ptr], edi
ret
.wrap:
sub edi, SOCKET_MAXDATA
mov [eax + RING_BUFFER.write_ptr], edi
ret
.too_large:
mov ecx, SOCKET_MAXDATA ; calculate number of bytes available in buffer
sub ecx, [eax + RING_BUFFER.size]
jge .full
jz .full
mov [eax + RING_BUFFER.size], SOCKET_MAXDATA ; update size, we will fill buffer completely
jmp .copy
.full:
1114,57 → 1087,88
xor ecx, ecx
ret
.copy_in_2:
DEBUGF 1,"Copying in 2 passes\n"
mov edx, ecx
mov ecx, [eax + RING_BUFFER.end_ptr] ; find number of bytes till end of buffer
sub ecx, edi
sub edx, ecx
push edx ; <<<< 2
mov edi, [eax + RING_BUFFER.start_ptr]
call .copy_more
.wrap_write_ptr:
sub [eax + RING_BUFFER.write_ptr], SOCKET_MAXDATA ; update write pointer
jmp .copy_more
;-----------------------------------------------------------------
;
; SOCKET_ring_read
;
; reads the data, BUT DOES NOT CLEAR IT FROM MEMORY YET
; reads the data, but let the data remain in the buffer
;
; IN: eax = ptr to ring struct
; ecx = buffer size
; edi = ptr to buffer
;
; OUT: ecx = number of bytes read
; OUT: eax = number of bytes read
;
;-----------------------------------------------------------------
align 4
SOCKET_ring_read:
DEBUGF 1,"SOCKET_ring_read: ringbuff=%x ptr=%x size=%u\n", eax, edi, ecx
DEBUGF 1,"SOCKET_ring_read: ringbuff=%x ptr=%x size=%u\n", eax, esi, ecx
cmp ecx, [eax + RING_BUFFER.size]
jg .less_data
cmp [eax + RING_BUFFER.size], ecx ; update size
jl .too_large
mov esi, [eax + RING_BUFFER.read_ptr] ; update read ptr
.copy:
mov esi, [eax + RING_BUFFER.read_ptr]
push ecx ;<<<< 1
mov edx, [eax + RING_BUFFER.read_ptr]
add edx, ecx
cmp edx, [eax + RING_BUFFER.end_ptr]
jg .copy_in_2
DEBUGF 2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
.copy_more:
push ecx
shr ecx, 1
jnc .nb
movsb
.nb:
shr ecx, 1
jnc .nw
movsw
.nw:
test ecx, ecx
jz .nd
and ecx, 3
rep movsb
pop ecx
shr ecx, 2
rep movsd
.nd:
pop ecx
pop ecx ; >>>> 1/2
DEBUGF 2,"Copied %u bytes\n", ecx
; .no_data_at_all:
ret
.less_data:
.too_large:
mov ecx, [eax + RING_BUFFER.size]
test ecx, ecx
; jz .no_data_at_all
jmp .copy
.full:
DEBUGF 2,"Ring buffer is full!\n"
xor ecx, ecx
ret
.copy_in_2:
DEBUGF 1,"Copying in 2 passes\n"
mov edx, ecx
mov ecx, [eax + RING_BUFFER.end_ptr] ; find number of bytes till end of buffer
sub ecx, edi
sub edx, ecx
push edx ; <<<< 2
mov esi, [eax + RING_BUFFER.start_ptr]
call .copy_more
;-----------------------------------------------------------------
;
; SOCKET_ring_free
1182,19 → 1186,26
DEBUGF 1,"Trying to free %u bytes of data from ring %x\n", ecx, eax
cmp ecx, [eax + RING_BUFFER.size]
jle .go_for_it
cmp ecx, SOCKET_MAXDATA ;;;;
jg .moron_input
mov ecx, [eax + RING_BUFFER.size]
.go_for_it:
sub [eax + RING_BUFFER.size], ecx
jl .sumthinwong
add [eax + RING_BUFFER.read_ptr], ecx
mov edx, [eax + RING_BUFFER.end_ptr]
cmp [eax + RING_BUFFER.read_ptr], edx
jl @f
sub [eax + RING_BUFFER.read_ptr], SOCKET_MAXDATA
sub [eax + RING_BUFFER.read_ptr], SOCKET_MAXDATA ;;;;;
@@:
ret
.sumthinwong: ; we could free all available bytes, but that would be stupid, i guess..
add [eax + RING_BUFFER.size], ecx
.moron_input:
xor ecx, ecx
ret
1360,8 → 1371,8
cmp [eax + SOCKET.Type], IP_PROTO_TCP
jnz .no_stream
stdcall kernel_free, [eax + STREAM_SOCKET.rcv + RING_BUFFER.start_ptr]
stdcall kernel_free, [eax + STREAM_SOCKET.snd + RING_BUFFER.start_ptr]
stdcall kernel_free, [eax + rcv.start_ptr]
stdcall kernel_free, [eax + snd.start_ptr]
.no_stream:
push eax ; this will be passed to kernel_free
1389,9 → 1400,9
ret
; IN: socket nr in ebx
; OUT: socket nr in eax
; preserves edx
; socket nr in ebx
; new socket nr in eax
; preserver edx
align 4
SOCKET_fork:
1429,7 → 1440,7
; Get socket structure address by its number
;
; IN: ecx = socket number
; OUT: eax = 0 on error, socket ptr otherwise
; OUT: ecx = 0 on error, socket ptr otherwise
; ZF = set on error
;
;---------------------------------------------------