sdongles/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

TCPserv: code cleanup.

Browse Source 
git-svn-id: svn://kolibrios.org@5859 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2015-10-25 12:32:30 +00:00
parent 026a30e72b
commit e68914572d
1 changed files with 33 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
programs/network/tcpserv/tcpserv.asm
View File

@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; Copyright (C) KolibriOS team 2010-2013. All rights reserved. ;; ;; Copyright (C) KolibriOS team 2010-2015. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; tcpserv.asm - TCP demo program for KolibriOS ;; ;; tcpserv.asm - TCP demo program for KolibriOS ;;
@ -43,29 +43,22 @@ start:
jnz exit jnz exit
; initialize console ; initialize console
push 1 invoke con_start, 1
call [con_start] invoke con_init, 80, 25, 80, 25, title
push title
push 25
push 80
push 25
push 80
call [con_init]
mcall 40, 1 shl 7 ; we only want network events mcall 40, EVM_STACK
push str1 invoke con_write_asciiz, str1
call [con_write_asciiz]
mcall socket, AF_INET4, SOCK_STREAM, 0 mcall socket, AF_INET4, SOCK_STREAM, 0
cmp eax, -1 cmp eax, -1
je sock_err je sock_err
mov [socketnum], eax mov [socketnum], eax
;; mcall setsockopt, [socketnum], SOL_SOCKET, SO_REUSEADDR, &yes, ; This socket option is not implemented in kernel yet.
;; cmp eax, -1 ; mcall setsockopt, [socketnum], SOL_SOCKET, SO_REUSEADDR, &yes,
;; je opt_err ; cmp eax, -1
; je opt_err
mcall bind, [socketnum], sockaddr1, sockaddr1.length mcall bind, [socketnum], sockaddr1, sockaddr1.length
cmp eax, -1 cmp eax, -1
@ -75,19 +68,13 @@ start:
cmp eax, -1 cmp eax, -1
je listen_err je listen_err
push str2 invoke con_write_asciiz, str2
call [con_write_asciiz]
mcall 10
mcall accept, [socketnum], sockaddr1, sockaddr1.length mcall accept, [socketnum], sockaddr1, sockaddr1.length
cmp eax, -1 cmp eax, -1
je acpt_err je acpt_err
mov [socketnum2], eax mov [socketnum2], eax
;; mcall close, [socketnum]
mcall send, [socketnum2], hello, hello.length mcall send, [socketnum2], hello, hello.length
.loop: .loop:
@ -95,51 +82,51 @@ start:
cmp eax, -1 cmp eax, -1
je .loop je .loop
mov byte [buffer + eax], 0 mov byte[buffer+eax], 0
invoke con_write_asciiz, buffer
push buffer
call [con_write_asciiz]
jmp .loop jmp .loop
acpt_err: acpt_err:
push str8 invoke con_write_asciiz, str8
call [con_write_asciiz]
jmp done jmp done
listen_err: listen_err:
push str3 invoke con_write_asciiz, str3
call [con_write_asciiz]
jmp done jmp done
bind_err: bind_err:
push str4 invoke con_write_asciiz, str4
call [con_write_asciiz]
jmp done jmp done
sock_err: sock_err:
push str6 invoke con_write_asciiz, str6
call [con_write_asciiz]
jmp done jmp done
done: done:
call [con_getch2] invoke con_getch2 ; Wait for user input
push 1 invoke con_exit, 1
call [con_exit]
exit: exit:
cmp [socketnum], 0
je @f
mcall close, [socketnum]
@@:
cmp [socketnum2], 0
je @f
mcall close, [socketnum2]
@@:
mcall -1 mcall -1
; data ; data
title db 'TCP stream server - test',0 title db 'TCP stream server demo',0
str1 db 'Opening socket',10, 0 str1 db 'Opening socket',10, 0
str2 db 'Listening for incoming connections...',10,0 str2 db 'Listening for incoming connections...',10,0
str3 db 'Listen error',10,10,0 str3 db 'Listen error',10,10,0
str4 db 'Bind error',10,10,0 str4 db 'Bind error',10,10,0
str5 db 'Setsockopt error.',10,10,0 str5 db 'Setsockopt error',10,10,0
str6 db 'Could not open socket',10,10,0 str6 db 'Could not open socket',10,10,0
str7 db 'Got data!',10,10,0 str7 db 'Got data',10,10,0
str8 db 'Error accepting connection',10,10,0 str8 db 'Error accepting connection',10,10,0
hello db 'Hello world!',0 hello db 'Hello world!',0
@ -147,7 +134,7 @@ hello db 'Hello world!',0
sockaddr1: sockaddr1:
dw AF_INET4 dw AF_INET4
.port dw 0x1700 ; 23 .port dw 23 shl 8 ; port 23 - network byte order
.ip dd 0 .ip dd 0
rb 10 rb 10
.length = $ - sockaddr1 .length = $ - sockaddr1
@ -170,8 +157,8 @@ import console, \
con_set_cursor_pos, 'con_set_cursor_pos' con_set_cursor_pos, 'con_set_cursor_pos'
i_end: i_end:
socketnum dd ? socketnum dd 0
socketnum2 dd ? socketnum2 dd 0
buffer rb BUFFERSIZE buffer rb BUFFERSIZE
.length = BUFFERSIZE .length = BUFFERSIZE