Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2994 → Rev 2995

/kernel/branches/net/applications/ftpd/commands.inc
763,11 → 763,11
mov al, ','
stosb
; port
movzx eax, byte [ebp + thread_data.datasock.sin_port + 1]
movzx eax, byte [ebp + thread_data.datasock.sin_port]
call dword_to_ascii
mov al, ','
stosb
movzx eax, byte [ebp + thread_data.datasock.sin_port]
movzx eax, byte [ebp + thread_data.datasock.sin_port+1]
call dword_to_ascii
; ')', 13, 10, 0
mov eax, ')' + 0x000a0d00
843,14 → 843,11
; Now the same with portnumber
inc esi
call ascii_to_byte
mov bh, al
mov byte[ebp + thread_data.datasock.sin_port], al
inc esi
call ascii_to_byte
mov bl, al
mov byte[ebp + thread_data.datasock.sin_port+1], al
 
; Save it in datasock too
mov [ebp + thread_data.datasock.sin_port], bx
 
; We will open the socket, but do not connect yet!
mov [ebp + thread_data.datasock.sin_family], AF_INET4
mcall socket, AF_INET4, SOCK_STREAM, 0
/kernel/branches/net/applications/ftpd/ftpd.asm
126,8 → 126,10
mov [serverip], ebx
 
invoke ini.get_int, path, str_ftpd, str_port, 21
xchg al, ah
mov [sockaddr1.port], ax
 
xchg al, ah
invoke con_printf, str1, eax
add esp, 8
 
378,7 → 380,7
 
sockaddr1:
dw AF_INET4
.port dw 21
.port dw 0
.ip dd 0
rb 10
.length = $ - sockaddr1
/kernel/branches/net/applications/libraries/network/network.asm
689,7 → 689,7
push 0
push 0 ; sin_zero
push esi ; sin_addr
push AF_INET4 + (53 shl 16)
push AF_INET4 + (53 shl 24)
; sin_family and sin_port in network byte order
; 8c. Connect.
mcall 75, 4, , esp, sizeof.sockaddr_in
1204,7 → 1204,7
; Just copy port from input __gai_reqdata to output addrinfo.
push edx
mov edx, [ebx+__gai_reqdata.service]
xchg dl, dh ; convert to network byte order
xchg dl, dh ; convert to network byte order ;;;;; CHECKME
mov [edi+sizeof.addrinfo+sockaddr_in.sin_port], dx
pop edx
ret
/kernel/branches/net/applications/synergyc/synergyc.asm
29,7 → 29,9
__DEBUG__ equ 1 ; enable/disable
__DEBUG_LEVEL__ equ 1 ; 1 = all, 2 = errors
 
 
BUFFERSIZE equ 1024
DEFAULTPORT equ 24800
 
include '../macros.inc'
purge mov,add,sub
79,7 → 81,8
test eax, eax
jnz error
 
invoke ini.get_int, path, str_remote, str_port, 24800
invoke ini.get_int, path, str_remote, str_port, DEFAULTPORT
xchg al, ah
mov [sockaddr1.port], ax
 
push str1
337,7 → 340,7
 
sockaddr1:
dw AF_INET4
.port dw 24800
.port dw 0
.ip dd 192 + 168 shl 8 + 1 shl 16 + 115 shl 24
rb 10
 
/kernel/branches/net/applications/tcpserv/tcpserv.asm
135,7 → 135,7
 
sockaddr1:
dw AF_INET4
.port dw 23
.port dw 0x1700 ; 23
.ip dd 0
rb 10
.length = $ - sockaddr1
/kernel/branches/net/applications/telnet/telnet.asm
264,7 → 264,7
 
sockaddr1:
dw AF_INET4
.port dw 23
.port dw 0x1700 ; 23
.ip dd 0
rb 10
 
/kernel/branches/net/applications/tftpc/tftpc.asm
451,7 → 451,7
 
sockaddr:
dw AF_INET4
dw 69
dw 0x4500 ; 69
IP db 192,168,1,115
sockaddr_len = $ - sockaddr
 
/kernel/branches/net/applications/vncc/vncc.asm
238,7 → 238,7
 
sockaddr1:
dw AF_INET4
.port dw 5900
.port dw 0x0c17 ; 5900
.ip dd 0
rb 10
 
/kernel/branches/net/applications/zeroconf/zeroconf.asm
548,7 → 548,7
sockaddr1:
 
dw AF_INET4
dw 68 ; local port
dw 68 shl 8 ; local port
dd 0 ; local IP
 
rb 10
557,7 → 557,7
sockaddr2:
 
dw AF_INET4
dw 67 ; destination port
dw 67 shl 8 ; destination port
dd -1 ; destination IP
 
rb 10