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

  → /kernel/ @ 3256

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 3257 → Rev 3256

/kernel/branches/net/network/socket.inc
227,8 → 227,30
}
;-----------------------------------------------------------------
;
; SOCKET_block
;
;-----------------------------------------------------------------
macro SOCKET_block socket, loop, done {
test [socket + SOCKET.options], SO_BLOCK ; Is this a blocking socket?
jz done ; No, return immediately
pusha
mov eax, EVENT_NETWORK
mov ebx, 1337 ; UID: ????
call wait_event
popa
jmp loop
}
;-----------------------------------------------------------------
;
; Socket API (function 74)
;
;-----------------------------------------------------------------
285,12 → 307,6
mov [esp+32], edi ; return socketnumber
DEBUGF 2,"socknum=%u\n", edi
; push edx
; and edx, SO_NONBLOCK
or [eax + SOCKET.options], SO_NONBLOCK ;edx
; pop edx
; and edx, not SO_NONBLOCK
mov [eax + SOCKET.Domain], ecx
mov [eax + SOCKET.Type], edx
mov [eax + SOCKET.Protocol], esi
695,12 → 711,8
ret
.block:
test [eax + SOCKET.options], SO_NONBLOCK
jnz s_error
SOCKET_block eax, .loop, s_error
call SOCKET_block
jmp .loop
;-----------------------------------------------------------------
;
; SOCKET_close
820,13 → 832,23
jmp s_error
.block:
test [eax + SOCKET.options], SO_NONBLOCK
jnz s_error
SOCKET_block eax, .loop, s_error
call SOCKET_block
jmp .loop
align 4
SOCKET_receive_local:
; does this socket have a PID yet?
cmp [eax + SOCKET.PID], 0
jne @f
; Change PID to that of current process
mov ebx, [TASK_BASE]
mov ebx, [ebx + TASKDATA.pid]
mov [eax + SOCKET.PID], ebx
@@:
mov [eax + SOCKET.rcv_proc], SOCKET_receive_stream
align 4
SOCKET_receive_stream:
835,10 → 857,10
mov ecx, esi
mov edi, edx
xor edx, edx
add eax, STREAM_SOCKET.rcv
.loop:
cmp [eax + STREAM_SOCKET.rcv + RING_BUFFER.size], 0
cmp [eax + RING_BUFFER.size], 0
je .block
add eax, STREAM_SOCKET.rcv
call SOCKET_ring_read
call SOCKET_ring_free
846,13 → 868,9
ret
.block:
test [eax + SOCKET.options], SO_NONBLOCK
jnz s_error
SOCKET_block (eax - STREAM_SOCKET.rcv), .loop, s_error
call SOCKET_block
jmp .loop
;-----------------------------------------------------------------
;
; SOCKET_send
949,8 → 967,6
align 4
SOCKET_send_local:
DEBUGF 1,"SOCKET_send: LOCAL\n"
; does this socket have a PID yet?
cmp [eax + SOCKET.PID], 0
jne @f
960,7 → 976,13
mov ebx, [ebx + TASKDATA.pid]
mov [eax + SOCKET.PID], ebx
@@:
mov [eax + SOCKET.snd_proc], SOCKET_send_local_
align 4
SOCKET_send_local_:
DEBUGF 1,"SOCKET_send: LOCAL\n"
; get the other side's socket and check if it still exists
mov eax, [eax + SOCKET.device]
call SOCKET_check
976,7 → 998,7
mov [esp+32], ecx
; and notify the other end
call SOCKET_notify
call SOCKET_notify_owner
ret
1092,13 → 1114,13
cmp dword [edx+8], 0
je .unblock
and [eax + SOCKET.options], not SO_NONBLOCK
or [eax + SOCKET.options], SO_BLOCK
mov dword [esp+32], 0 ; success!
ret
.unblock:
or [eax + SOCKET.options], SO_NONBLOCK
and [eax + SOCKET.options], not SO_BLOCK
mov dword [esp+32], 0 ; success!
ret
1129,7 → 1151,7
mov [eax + SOCKET.Type], SOCK_STREAM
mov [eax + SOCKET.Protocol], 0 ;;; CHECKME
mov [eax + SOCKET.snd_proc], SOCKET_send_local
mov [eax + SOCKET.rcv_proc], SOCKET_receive_stream
mov [eax + SOCKET.rcv_proc], SOCKET_receive_local
mov ebx, eax
call SOCKET_alloc
1140,7 → 1162,7
mov [eax + SOCKET.Type], SOCK_STREAM
mov [eax + SOCKET.Protocol], 0 ;;; CHECKME
mov [eax + SOCKET.snd_proc], SOCKET_send_local
mov [eax + SOCKET.rcv_proc], SOCKET_receive_stream
mov [eax + SOCKET.rcv_proc], SOCKET_receive_local
; Link the two sockets to eachother
mov [eax + SOCKET.device], ebx
1353,7 → 1375,7
call mutex_unlock
popa
jmp SOCKET_notify
jmp SOCKET_notify_owner
.full:
DEBUGF 2,"SOCKET_input: socket %x is full!\n", eax
1565,44 → 1587,8
;-----------------------------------------------------------------
;
; SOCKET_block
; SOCKET_notify_owner
;
; Suspends the thread attached to a socket
;
; IN: eax = socket ptr
; OUT: /
;
;-----------------------------------------------------------------
align 4
SOCKET_block:
DEBUGF 1,"SOCKET_block: %x\n", eax
pushf
cli
; Set the 'socket is blocked' flag
or [eax + SOCKET.state], SS_BLOCKED
; Suspend the thread
push edx
mov edx, [TASK_BASE]
DEBUGF 1,"SOCKET_block: suspending PID: %u\n", [edx + TASKDATA.pid]
mov [edx + TASKDATA.state], 1 ; Suspended
pop edx
call change_task
popf
DEBUGF 1,"SOCKET_block: continueing\n"
ret
;-----------------------------------------------------------------
;
; SOCKET_notify
;
; notify's the owner of a socket that something happened
;
; IN: eax = socket ptr
1610,27 → 1596,20
;
;-----------------------------------------------------------------
align 4
SOCKET_notify:
SOCKET_notify_owner:
DEBUGF 1,"SOCKET_notify: %x\n", eax
DEBUGF 1,"SOCKET_notify_owner: %x\n", eax
call SOCKET_check
jz .error
test [eax + SOCKET.state], SS_BLOCKED
jnz .unblock
test [eax + SOCKET.options], SO_NONBLOCK
jz .error
push eax ecx esi
; socket exists and is of non blocking type.
; We'll try to flag an event to the thread
; socket exists, now try to flag an event to the application
mov eax, [eax + SOCKET.PID]
test eax, eax
jz .done
jz .error2
mov ecx, 1
mov esi, TASK_DATA + TASKDATA.pid
1641,48 → 1620,23
add esi, 0x20
cmp ecx, [TASK_COUNT]
jbe .next_pid
; PID not found, TODO: close socket!
jmp .done
jmp .error2
.found_pid:
shl ecx, 8
or [ecx + SLOT_BASE + APPDATA.event_mask], EVENT_NETWORK
mov [check_idle_semaphore], 200 ; What does this mean??
mov [check_idle_semaphore], 200
DEBUGF 1,"SOCKET_notify: Raised a network event!\n"
DEBUGF 1,"SOCKET_notify_owner: succes!\n"
jmp .done
.unblock:
push eax ecx esi
; Clear the 'socket is blocked' flag
and [eax + SOCKET.state], not SS_BLOCKED
; Find the thread's TASK_DATA
mov eax, [eax + SOCKET.PID]
test eax, eax
jz .error
xor ecx, ecx
inc ecx
mov esi, TASK_DATA
.next:
cmp [esi + TASKDATA.pid], eax
je .found
inc ecx
add esi, 0x20
cmp ecx, [TASK_COUNT]
jbe .next
jmp .error
.found:
; Run the thread
mov [esi + TASKDATA.state], 0 ; Running
DEBUGF 1,"SOCKET_notify: Unblocked socket!\n"
.done:
.error2:
pop esi ecx eax
.error:
ret
2012,7 → 1966,7
push ebx
mov ebx, [TASK_BASE]
mov ebx, [ebx + TASKDATA.pid]
mov ebx, [ecx + TASKDATA.pid]
cmp [eax + SOCKET.PID], ebx
pop ebx
2096,7 → 2050,7
and [eax + SOCKET.options], not (SS_ISCONNECTED + SS_ISDISCONNECTING + SS_ISCONFIRMING)
or [eax + SOCKET.options], SS_ISCONNECTING
jmp SOCKET_notify
jmp SOCKET_notify_owner
2117,7 → 2071,7
and [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISDISCONNECTING + SS_ISCONFIRMING)
or [eax + SOCKET.options], SS_ISCONNECTED
jmp SOCKET_notify
jmp SOCKET_notify_owner
2139,7 → 2093,7
and [eax + SOCKET.options], not (SS_ISCONNECTING)
or [eax + SOCKET.options], SS_ISDISCONNECTING + SS_CANTRCVMORE + SS_CANTSENDMORE
jmp SOCKET_notify
jmp SOCKET_notify_owner
2160,7 → 2114,7
and [eax + SOCKET.options], not (SS_ISCONNECTING + SS_ISCONNECTED + SS_ISDISCONNECTING)
or [eax + SOCKET.options], SS_CANTRCVMORE + SS_CANTSENDMORE
jmp SOCKET_notify
jmp SOCKET_notify_owner
;-----------------------------------------------------------------

/kernel/branches/net/network/tcp_input.inc
485,7 → 485,7
popa
mov eax, ebx
call SOCKET_notify
call SOCKET_notify_owner
; Generate more output
call TCP_output
521,7 → 521,7
call SOCKET_ring_write ; Add the data to the socket buffer
mov eax, ebx
call SOCKET_notify
call SOCKET_notify_owner
or [ebx + TCP_SOCKET.t_flags], TF_DELACK ; Set delayed ack flag
1079,7 → 1079,7
pushf ; Why?
mov eax, ebx
call SOCKET_notify
call SOCKET_notify_owner
; Update TCPS

/kernel/branches/net/network/IPv4.inc
225,7 → 225,7
call NET_ptr_to_num
shl edi, 2
; check if it matches local ip (Using RFC1122 strong end system model)
; check if it matches local ip
mov eax, [edx + IPv4_header.DestinationAddress]
cmp eax, [IP_LIST+edi]

/kernel/branches/net/network/stack.inc
79,8 → 79,7
SO_USELOOPBACK = 1 shl 8
SO_BINDTODEVICE = 1 shl 9
SO_BLOCK = 1 shl 10 ; TO BE REMOVED
SO_NONBLOCK = 1 shl 31
SO_BLOCK = 1 shl 10
; Socket level
SOL_SOCKET = 0
87,24 → 86,22
; Socket States
SS_NOFDREF = 0x0001 ; no file table ref any more
SS_ISCONNECTED = 0x0002 ; socket connected to a peer
SS_ISCONNECTING = 0x0004 ; in process of connecting to peer
SS_ISDISCONNECTING = 0x0008 ; in process of disconnecting
SS_CANTSENDMORE = 0x0010 ; can't send more data to peer
SS_CANTRCVMORE = 0x0020 ; can't receive more data from peer
SS_RCVATMARK = 0x0040 ; at mark on input
SS_ISABORTING = 0x0080 ; aborting fd references - close()
SS_RESTARTSYS = 0x0100 ; restart blocked system calls
SS_ISDISCONNECTED = 0x0800 ; socket disconnected from peer
SS_NOFDREF = 0x001 ; no file table ref any more
SS_ISCONNECTED = 0x002 ; socket connected to a peer
SS_ISCONNECTING = 0x004 ; in process of connecting to peer
SS_ISDISCONNECTING = 0x008 ; in process of disconnecting
SS_CANTSENDMORE = 0x010 ; can't send more data to peer
SS_CANTRCVMORE = 0x020 ; can't receive more data from peer
SS_RCVATMARK = 0x040 ; at mark on input
SS_ISABORTING = 0x080 ; aborting fd references - close()
SS_RESTARTSYS = 0x100 ; restart blocked system calls
SS_ISDISCONNECTED = 0x800 ; socket disconnected from peer
SS_ASYNC = 0x0100 ; async i/o notify
SS_ISCONFIRMING = 0x0200 ; deciding to accept connection req
SS_MORETOCOME = 0x0400
SS_ASYNC = 0x100 ; async i/o notify
SS_ISCONFIRMING = 0x200 ; deciding to accept connection req
SS_MORETOCOME = 0x400
SS_BLOCKED = 0x8000
SOCKET_MAXDATA = 4096*32 ; must be 4096*(power of 2) where 'power of 2' is at least 8
; Network driver types