WebSVN – Kolibri OS – Diff – /kernel/branches/net/network/socket.inc

 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1249 $
+$Revision: 1254 $
 struct	SOCKET_head
 	 .PrevPtr		dd ? ; pointer to previous socket in list
 	 .LocalPort		dw ? ; In INET byte order
 	 .RemotePort		dw ? ; In INET byte order
 	 .backlog		dw ? ; Backlog
+;         .OrigRemoteIP          dd ? ; original remote IP address (used to reset to LISTEN state)
+;         .OrigRemotePort        dw ? ; original remote port (used to reset to LISTEN state)
+	 .wndsizeTimer		dd ? ; window size timer
-	 .OrigRemoteIP		dd ? ; original remote IP address (used to reset to LISTEN state)
-	 .OrigRemotePort	dw ? ; original remote port (used to reset to LISTEN state)
+	; Transmission control block
-	 .TCBState		dd ? ; TCB state
+	 .state 		dd ? ; TCB state
-	 .TCBTimer		dd ? ; TCB timer (seconds)
+	 .timer 		dd ? ; TCB timer (seconds)
-	 .ISS			dd ? ; initial send sequence
+	 .ISS			dd ? ; initial send sequence number
-	 .IRS			dd ? ; initial receive sequence
+	 .IRS			dd ? ; initial receive sequence number
 	 .SND_UNA		dd ? ; sequence number of unack'ed sent Packets
 	 .SND_NXT		dd ? ; next send sequence number to use
 	 .SND_WND		dd ? ; send window
 	 .RCV_NXT		dd ? ; next receive sequence number to use
 	 .RCV_WND		dd ? ; receive window
-	 .SEG_LEN		dd ? ; segment length
-	 .SEG_WND		dd ? ; segment window
+	 .SEG_LEN		dd ? ; segment length
-	 .wndsizeTimer		dd ? ; window size timer
+	 .SEG_WND		dd ? ; segment window
 	mov	[last_TCP_port], MIN_EPHEMERAL_PORT
 	ret
-;-----------------------------------------------------------------------------
+;-----------------------------------------------
 ;
 ; Socket API (function 74)
+;
+;-----------------------------------------------
+align 4
+sys_socket:
+	and	ebx, 0x000000FF ; should i remove this line ?
+	cmp	bl , 7		; highest possible number
+	jg	s_error
+	lea	ebx, [.table + 4*ebx]
+	jmp	dword [ebx]
+.table:
+	dd	socket_open	; 0
+	dd	socket_close	; 1
+	dd	socket_bind	; 2
+	dd	socket_listen	; 3
+	dd	socket_connect	; 4
+	dd	socket_accept	; 5
-;-----------------------------------------------------------------------------
-align 4
-sys_socket:
-	test	bl, bl
-	jz	socket_open	; 0
-	dec	bl
-	jz	socket_close	; 1
-	dec	bl
-	jz	socket_bind	; 2
-	dec	bl
-	jz	socket_listen	; 3
-	dec	bl
-	jz	socket_connect	; 4
-	dec	bl
-	jz	socket_accept	; 5
-	dec	bl
-	jz	socket_send	; 6
-	dec	bl
-	jz	socket_recv	; 7
+	dd	socket_send	; 6
-	dec	bl
+	dd	socket_recv	; 7
-;        jz      socket_get_opt  ; 8
+;        dd      socket_get_opt  ; 8
-	dec	bl
-;        jz      socket_set_opt  ; 9
 ;        dd      socket_set_opt  ; 9
 s_error:
 	mov	dword [esp+32],-1
 s_error:
-	ret
+	mov	dword [esp+32],-1
 	mov	[eax + SOCKET_head.Protocol], esi
 	stdcall net_socket_addr_to_num, eax
+	DEBUGF	1,", socketnumber: %u\n", eax
-	DEBUGF	1,", socketnumber: %u\n", eax
+	; TODO: if it is txcp socket, set state to TCB_CLOSED
   .af_unix:
 	; TODO: write code here
 	; TODO: write code here
 	stdcall net_socket_num_to_addr, ecx
 	cmp	eax, -1
 	jz	s_error
-	cmp	esi, 2
+	cmp	esi, 8
 	jl	s_error
 	cmp	word [edx], AF_INET4
-	je	.af_inet4
-	jmp	s_error
 	je	.af_inet4
   .af_inet4:
-	cmp	esi, 8
-	jl	s_error
 	jmp	s_error
 	cmp	[eax + SOCKET_head.Type], IP_PROTO_UDP
-	je	.udp
+  .af_inet4:
 	DEBUGF	1,"remote ip: %u.%u.%u.%u\n",[edx+4]:1,[edx+5]:1,[edx+6]:1,[edx+7]:1
 	mov	dword [esp+32],0
-	ret
+	ret
-    .icmp:
+  .tcp:
+	; TODO: set sequence number to random value
+	; fill in remote port and IP
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.wndsizeTimer], 0	   ; Reset the window timer.
-	; TODO: write code here
+											   ; TODO: figure out WTF this is
+	mov	bx , word [edx + 2]
-	ret
-  .tcp:
-;local sockAddr dd ?
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.RemotePort], bx
-;        cmp     esi, SOCKET_PASSIVE
+	DEBUGF	1,"remote port: %x ",bx
-;        jne     .skip_port_check
-;
-;        push    ebx
-;        mov     eax, ebx
-;        xchg    al, ah
-;        mov     ebx, net_sockets
-;
-;  .next_socket:
-;        mov     ebx, [ebx + SOCKET.NextPtr]
-;        or      ebx, ebx
-;        jz      .last_socket
-;        cmp     [ebx + SOCKET.TCBState], TCB_LISTEN
-;        jne     .next_socket
-;        cmp     [ebx + SOCKET.LocalPort], ax
+	mov	ebx, dword [edx + 4]
-;        jne     .next_socket
-;
-;        xchg    al, ah
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.RemoteIP], ebx
-;        DEBUGF  1, "K : error: port %u is listened by 0x%x\n", ax, ebx
-;        pop     ebx
+	; check if local port and IP is ok
-;        jmp     .error
-;
-;  .last_socket:
-;        pop     ebx
-;
-;  .skip_port_check:
-;        mov     [eax + SOCKET.wndsizeTimer], 0     ; Reset the window timer.
-;
-;        xchg    bh, bl
-;        mov     [eax + SOCKET.LocalPort], bx
-;        xchg    ch, cl
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.LocalIP], 0
-;        mov     [eax + SOCKET.RemotePort], cx
+	jne	@f
-;        mov     [eax + SOCKET.OrigRemotePort], cx
-;        mov     ebx, [IP_LIST]
-;        mov     [eax + SOCKET.LocalIP], ebx
-;        mov     [eax + SOCKET.RemoteIP], edx
+	push	[IP_LIST]	    ; device zero = default
-;        mov     [eax + SOCKET.OrigRemoteIP], edx
+	pop	[eax + SOCKET_head.end + IPv4_SOCKET.LocalIP]
+       @@:
-;        mov     ebx, TCB_LISTEN
-;        cmp     esi, SOCKET_PASSIVE
-;        je      @f
-;        mov     ebx, TCB_SYN_SENT
-;    @@: mov     [eax + SOCKET.TCBState], ebx            ; Indicate the state of the TCB
-;        cmp     ebx, TCB_LISTEN
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort], 0
-;        je      .exit
+	jne	@f
-	; Now, if we are in active mode, then we have to send a SYN to the specified remote port
-;        mov     eax, EMPTY_QUEUE
-;        call    dequeue
-;        cmp     ax, NO_BUFFER
-;        je      .exit
-;        push    eax
+	mov	ecx, [eax + SOCKET_head.Type]
-;        mov     bl, TH_SYN
+	call	socket_find_port
-;        xor     ecx, ecx
-;        stdcall build_tcp_Packet, [sockAddr]
-;        mov     eax, NET1OUT_QUEUE
-;        mov     edx, [IP_LIST]
-;        mov     ecx, [sockAddr]
+	test	bx, bx
-;        cmp     edx, [ecx + SOCKET.RemoteIP]
+	jz	s_error
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort], bx
-;        jne     .not_local
+       @@:
 	stdcall net_socket_num_to_addr, ecx
 	cmp	eax, -1
+	jz	s_error
+	cmp	word [eax + SOCKET_head.Domain], AF_INET4
+	jne	s_error
+	cmp	[eax + SOCKET_head.Type], IP_PROTO_TCP
-	jz	s_error
+	jne	s_error
 	cmp	edx, MAX_backlog
 	jl	.ok
 	mov	dx , 20
-  .ok:
+  .ok:
 	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog], dx
 	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.backlog], dx
+	ret
-	ret
-  .tcp:
-if 1 = 0
-;local sockAddr dd ?
-;        DEBUGF  1, "K : socket_close_tcp (0x%x)\n", ebx
-	; first, remove any resend entries
-	pusha
-	mov	esi, resendQ
-	mov	ecx, 0
-  .next_resendq:
-	cmp	ecx, NUMRESENDENTRIES
-	je	.last_resendq	    ; None left
-	cmp	[esi + 4], ebx
-	je	@f		    ; found one
-	inc	ecx
-	add	esi, 8
-	jmp	.next_resendq
-    @@: mov	dword[esi + 4], 0
-	inc	ecx
-	add	esi, 8
-	jmp	.next_resendq
-  .last_resendq:
-	popa
-	mov	ebx, eax
+  .tcp:
-;        mov     [sockAddr], eax
+	; first, remove all resend entries for this socket
-	cmp	[eax + SOCKET.TCBState], TCB_LISTEN
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_LISTEN
-	je	.destroy_tcb
-	cmp	[eax + SOCKET.TCBState], TCB_SYN_SENT
-	je	.destroy_tcb
-; Now construct the response, and queue for sending by IP
-	mov	eax, EMPTY_QUEUE
-	call	dequeue
+	je	.destroy_tcb
-	cmp	ax, NO_BUFFER
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_SENT
-	je	.error
-	push	eax
 	je	.destroy_tcb
-	mov	bl, TH_FIN
-	xor	ecx, ecx
+	; Now construct the response, and queue for sending by IP
 	xor	esi, esi
-	stdcall build_tcp_Packet, [sockAddr]
+	mov	bl, TH_FIN
-	mov	 ebx, [sockAddr]
+	call	TCP_send_ack
-	; increament SND.NXT in socket
-	lea	esi, [ebx + SOCKET.SND_NXT]
+	; increament SND.NXT in socket
-	call	inc_inet_esi
+	lea	esi, [eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.SND_NXT]
 	inc_INET esi
-	; Get the socket state
-	mov	eax, [ebx + SOCKET.TCBState]
+	; Get the socket state
-	cmp	eax, TCB_SYN_RECEIVED
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_SYN_RECEIVED
 	je	.fin_wait_1
-	cmp	eax, TCB_ESTABLISHED
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_ESTABLISHED
 	je	.fin_wait_1
-	; assume CLOSE WAIT
-	; Send a fin, then enter last-ack state
-	mov	[ebx + SOCKET.TCBState], TCB_LAST_ACK
-	jmp	.send
-  .fin_wait_1:
-	; Send a fin, then enter finwait2 state
-	mov	[ebx + SOCKET.TCBState], TCB_FIN_WAIT_1
-  .send:
-	mov	eax, NET1OUT_QUEUE
-	mov	edx, [IP_LIST]
+	; assume CLOSE WAIT
-;        mov     ecx, [sockAddr]
+	; Send a fin, then enter last-ack state
-	cmp	edx, [ecx + SOCKET.RemoteIP]
-	jne	.not_local
-	mov	eax, IPIN_QUEUE
-  .not_local:
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.state], TCB_LAST_ACK
-	; Send it.
+	jmp	.send
 ;       datalength in esi
 ;       flags in edi
 ;  OUT: -1 on error
+;
 ;-----------------------------------------------
 align 4
 socket_send:
 	cmp	word [eax + SOCKET_head.Domain], AF_INET4
 	je	.af_inet4
-	jmp	s_error
 	jmp	s_error
 ;---------
   .af_inet4:
 	DEBUGF	1,"Socket type:%u\n", [eax + SOCKET_head.Type]:4
 	cmp	[eax + SOCKET_head.Type], SOCK_RAW
 	je	.raw
 	jmp	s_error
-;--------
+	jmp	s_error
 	mov	[esp+32], eax
 	ret
+  .tcp:
+	cmp	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort],0
+	jne	@f
+	push	esi
+	mov	ecx, [eax + SOCKET_head.Type]
+	call	socket_find_port
+	test	bx, bx
+	pop	esi
+	je	s_error
+	mov	[eax + SOCKET_head.end + IPv4_SOCKET.end + TCP_SOCKET.LocalPort], bx
+     @@:
+	mov	ecx, esi
+	mov	esi, edx
-  .tcp:
+	call	TCP_socket_send
-	mov	[esp+32], eax
-	ret
+	mov	[esp+32], eax
 	ret
 ;--------
   .raw:
 	cmp	[eax + SOCKET_head.Protocol], IP_PROTO_IP
 	je	.raw_ip
 	cmp	[eax + SOCKET_head.Protocol], IP_PROTO_ICMP
+	cmp	[eax + SOCKET_head.Protocol], IP_PROTO_ICMP
+	je	.raw_icmp
 	je	.raw_icmp
 	jmp	s_error
 	jmp	s_error

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 1249 → 1254