Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3703 → Rev 3704

/programs/network/downloader/downloader.asm
187,6 → 187,7
jmp still
 
exit:
DEBUGF 1, "Exiting\n"
or eax, -1 ; close this program
mcall
 
208,6 → 209,10
cmp byte[params], 0
jne exit
 
mov ecx, [sc.work_text]
or ecx, 0x80000000
mcall 4, <10, 93>, , download_complete
 
ret
 
save_in_shared:
249,10 → 254,6
DEBUGF 2, "Saving to file\n"
mcall 70, fileinfo
 
mov ecx, [sc.work_text]
or ecx, 0x80000000
mcall 4, <10, 93>, , download_complete
 
ret
 
 
358,7 → 359,7
 
DEBUGF 1, "Reading incoming data\n"
 
mcall 40, EVM_STACK ; we only want stack events now
mcall 40, EVM_STACK + EVM_BUTTON
 
mov eax, [buf_ptr]
mov [pos], eax
365,8 → 366,10
 
.read:
mcall 23, 100 ; 1 second timeout
cmp eax, EV_BUTTON
je exit
.read_dontwait:
mcall recv, [socketnum], [pos], BUFFERSIZE, 0
mcall recv, [socketnum], [pos], BUFFERSIZE, MSG_DONTWAIT
inc eax ; -1 = error (socket closed?)
jz .no_more_data
dec eax ; 0 bytes...
/programs/network/ftpc/ftpc.asm
161,7 → 161,7
jnz exit
 
; receive socket data
mcall recv, [socketnum], [offset], BUFFERSIZE, 0
mcall recv, [socketnum], [offset], BUFFERSIZE, MSG_DONTWAIT
inc eax
jz wait_for_serverdata
dec eax
/programs/network/ftpc/servercommands.inc
80,7 → 80,7
 
data_ok:
 
mcall recv, [datasocket], buffer_ptr, BUFFERSIZE, 0 ; fixme: use other buffer
mcall recv, [datasocket], buffer_ptr, BUFFERSIZE, MSG_DONTWAIT ; fixme: use other buffer
inc eax
jz .fail
dec eax
/programs/network/ftpd/ftpd.asm
270,7 → 270,7
mov ecx, [ebp + thread_data.socketnum]
mov edx, [ebp + thread_data.buffer_ptr]
mov esi, sizeof.thread_data.buffer ;;; FIXME
xor edi, edi
mov edi, MSG_DONTWAIT
mcall recv
inc eax ; error? (-1)
jz threadloop
/programs/network/ircc/socket.inc
205,11 → 205,11
; TODO: read more data if we receive one full packet
 
.nextpacket:
mcall recv, [socketnum], packetbuf, 1024, 0 ; read a packet
mcall recv, [socketnum], packetbuf, 1024, MSG_DONTWAIT ; read a packet
inc eax ; check if we got one
jz .done
dec eax
jz .done
jz .done ; TODO: check for errors!
 
; ok we have data, now feed it to the recoder
 
/programs/network/synergyc/synergyc.asm
286,8 → 286,6
 
 
wait_for_data:
mcall 10 ; wait for data
 
mcall recv, [socketnum], buffer_ptr, BUFFERSIZE, 0
cmp eax, -1
je wait_for_data
/programs/network/tcpserv/tcpserv.asm
91,8 → 91,6
mcall send, [socketnum2], hello, hello.length
 
.loop:
mcall 10
 
mcall recv, [socketnum2], buffer, buffer.length, 0
cmp eax, -1
je .loop
/programs/network/telnet/telnet.asm
171,25 → 171,15
mcall 18, 3
 
mainloop:
DEBUGF 1, 'TELNET: Waiting for events\n'
mcall 10
DEBUGF 1, 'TELNET: EVENT %x !\n', eax
 
call [con_get_flags]
test eax, 0x200 ; con window closed?
jnz exit
 
.check_for_data:
mcall recv, [socketnum], buffer_ptr, BUFFERSIZE, 0
cmp eax, -1
jne .parse_data
cmp ebx, 6 ; EWOULDBLOCK
je mainloop
jmp closed
je closed
 
 
.parse_data:
 
DEBUGF 1, 'TELNET: got %u bytes of data !\n', eax
 
mov esi, buffer_ptr
217,7 → 207,7
 
.print:
cmp esi, edi
jae .check_for_data
jae mainloop
 
push esi
call [con_write_asciiz]
/programs/network/tftpc/tftpc.asm
308,7 → 308,7
jz .key
 
 
mcall recv, [socketnum], buffer, buffer_len, 0 ; receive data
mcall recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT ; receive data
 
cmp word[buffer], opcode_data
jne .error
415,7 → 415,7
dec eax
jz .key
 
mcall recv, [socketnum], buffer, buffer_len, 0 ; receive ack
mcall recv, [socketnum], buffer, buffer_len, MSG_DONTWAIT ; receive ack
 
cmp word[buffer], opcode_ack
jne .exit
/programs/network/vncc/thread.inc
3,7 → 3,7
 
DEBUGF 1, 'I am the thread!\n'
 
mcall 40, 1 shl 7
mcall 40, 0
 
; resolve name
push esp ; reserve stack place
55,8 → 55,6
mcall send, [socketnum], shared, 1, 0
DEBUGF 1, 'Sending handshake: shared session?\n'
 
mcall 23, 100*TIMEOUT
 
call wait_for_data ; now the server should send init message
 
DEBUGF 1, 'Serverinit: bpp: %u depth: %u bigendian: %u truecolor: %u\n', \
85,8 → 83,6
mcall send, [socketnum], fbur, 10, 0
 
thread_loop:
mcall 23, 100
 
call read_data ; Read the data into the buffer
 
; cmp eax, 2
206,10 → 202,8
 
 
read_data:
 
mov [datapointer], receive_buffer
.loop:
mcall 23, 100*TIMEOUT
mcall recv, [socketnum], [datapointer], 4096, 0
cmp eax, -1
je .done
227,8 → 221,6
 
 
wait_for_data:
 
mcall 23, 500
mcall recv, [socketnum], receive_buffer, 4096, 0
cmp eax, -1
je wait_for_data
/programs/network/zeroconf/zeroconf.asm
295,7 → 295,7
mcall 23, TIMEOUT*100 ; wait for data
 
read_data: ; we have data - this will be the response
mcall 75, 7, [socketNum], [dhcpMsg], BUFFER, 0 ; read data from socket
mcall 75, 7, [socketNum], [dhcpMsg], BUFFER, MSG_DONTWAIT ; read data from socket
cmp eax, -1
jne @f
DEBUGF 1,"No answer from DHCP server\n"