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

  → / @ 2314

  → / @ 2315

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Regard whitespace Rev 2314 → Rev 2315

/kernel/branches/net/build.bat
86,7 → 86,7
if not exist bin\lib mkdir bin\lib
cd applications\libraries
for %%a in (%libs%) do (
fasm -m 65536 %%a\%%a.asm ..\..\bin\libs\%%a.obj
fasm -m 65536 %%a\%%a.asm ..\..\bin\lib\%%a.obj
if not %errorlevel%==0 goto :Error_FasmFailed
)
cd ..\..

/kernel/branches/net/network/socket.inc
269,7 → 269,9
DEBUGF 1,"SOCKET_open: domain: %u, type: %u protocol: %x\n", ecx, edx, esi
push ecx edx esi
call SOCKET_alloc
pop esi edx ecx
jz s_error
mov [esp+32], edi ; return socketnumber
1308,7 → 1310,7
align 4
SOCKET_alloc:
push ecx ebx
push ebx
stdcall kernel_alloc, SOCKETBUFFSIZE
DEBUGF 1, "SOCKET_alloc: ptr=%x\n", eax
1316,12 → 1318,12
jz .exit
; zero-initialize allocated memory
push eax edi
push eax
mov edi, eax
mov ecx, SOCKETBUFFSIZE / 4
xor eax, eax
rep stosd
pop edi eax
pop eax
; set send-and receive procedures to return -1
mov [eax + SOCKET.snd_proc], s_error
1328,11 → 1330,11
mov [eax + SOCKET.rcv_proc], s_error
; find first free socket number and use it
mov ecx, [last_socket_num]
mov edi, [last_socket_num]
.next_socket_number:
inc ecx
inc edi
jz .next_socket_number ; avoid socket nr 0
cmp ecx, -1
cmp edi, -1
je .next_socket_number ; avoid socket nr -1
mov ebx, net_sockets
.next_socket:
1340,15 → 1342,14
test ebx, ebx
jz .last_socket
cmp [ebx + SOCKET.Number], ecx
cmp [ebx + SOCKET.Number], edi
jne .next_socket
jmp .next_socket_number
.last_socket:
mov [last_socket_num], ecx
mov [eax + SOCKET.Number], ecx
DEBUGF 1, "SOCKET_alloc: number=%u\n", ecx
mov edi, ecx
mov [last_socket_num], edi
mov [eax + SOCKET.Number], edi
DEBUGF 1, "SOCKET_alloc: number=%u\n", edi
; Fill in PID
mov ebx, [TASK_BASE]
1373,7 → 1374,7
mov [net_sockets + SOCKET.NextPtr], eax
or eax, eax ; used to clear zero flag
.exit:
pop ebx ecx
pop ebx
ret
1459,10 → 1460,11
jae .fail
; Allocate new socket
push ebx
call SOCKET_alloc
pop ebx
jz .fail
push esi ecx edi
push eax
mov esi, esp
add_to_queue (ebx + SOCKET_QUEUE_LOCATION), MAX_backlog, 4, .fail2
1476,7 → 1478,6
rep movsd
and [eax + SOCKET.options], not SO_ACCEPTCON
pop edi ecx esi
ret

/kernel/branches/net/network/tcp_input.inc
173,7 → 173,9
DEBUGF 1,"Accepting new connection\n"
mov [ebx + SOCKET.lock], 0
push ecx edx esi edi ;;;
call SOCKET_fork
pop edi esi edx ecx
test eax, eax
jz .drop