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

 ;;         GNU GENERAL PUBLIC LICENSE                              ;;
 ;;          Version 2, June 1991                                   ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1536 $
+$Revision: 1541 $
 virtual at 0
 	je	.udp
 	cmp	edx, IP_PROTO_TCP
+	je	.tcp
+	cmp	edx, SOCK_RAW
-	je	.tcp
+	je	.raw
   .no_inet4:
 	ret
 	push	eax
 	init_queue (eax + SOCKET_QUEUE_LOCATION)
 	pop	eax
 	mov	[eax + SOCKET.snd_proc], SOCKET_send_udp
+	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
+	ret
+  .raw:
+;        test    esi, esi
+;        jz      .ip
+	cmp	esi, IP_PROTO_ICMP
+	je	.icmp
+	ret
+;  .ip:
+;        push    eax
+;        init_queue (eax + SOCKET_QUEUE_LOCATION)
+;        pop     eax
+;
+;        mov     [eax + SOCKET.snd_proc], SOCKET_send_ip
+;        mov     [eax + SOCKET.rcv_proc], SOCKET_receive_dgram
+;
+;        ret
+  .icmp:
+	push	eax
+	init_queue (eax + SOCKET_QUEUE_LOCATION)
+	pop	eax
+	mov	[eax + SOCKET.snd_proc], SOCKET_send_icmp
-	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_udp
+	mov	[eax + SOCKET.rcv_proc], SOCKET_receive_dgram
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_connect:
-	DEBUGF	1,"socket_connect: socknum: %u sockaddr: %x, length: %u\n", ecx, edx, esi
+	DEBUGF	1,"SOCKET_connect: socknum: %u sockaddr: %x, length: %u\n", ecx, edx, esi
 	call	SOCKET_num_to_ptr
 	je	.udp
 	cmp	[eax + SOCKET.Type], IP_PROTO_TCP
+	je	.tcp
+	cmp	[eax + SOCKET.Type], SOCK_RAW
-	je	.tcp
+	je	.raw
 	jmp	s_error
 	mov	[eax + SOCKET.lock], 0
 	mov	dword [esp+32], 0	; success!
+	ret
+  .raw:
+	push	dword [edx + 4]
+	pop	dword [eax + IP_SOCKET.RemoteIP]
+	mov	dword [esp+32], 0	; success!
 	ret
 ;-----------------------------------------------------------------
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_listen:
-	DEBUGF	1,"Socket_listen: socknum: %u backlog: %u\n", ecx, edx
+	DEBUGF	1,"SOCKET_listen: socknum: %u backlog: %u\n", ecx, edx
 	call	SOCKET_num_to_ptr
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_accept:
-	DEBUGF	1,"Socket_accept: socknum: %u sockaddr: %x, length: %u\n", ecx, edx, esi
+	DEBUGF	1,"SOCKET_accept: socknum: %u sockaddr: %x, length: %u\n", ecx, edx, esi
 	call	SOCKET_num_to_ptr
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_close:
-	DEBUGF	1,"socket_close: socknum: %u\n", ecx
+	DEBUGF	1,"SOCKET_close: socknum: %u\n", ecx
 	call	SOCKET_num_to_ptr
 	jz	s_error
-	jmp	[eax + SOCKET.rcv_proc]
 	jmp	[eax + SOCKET.rcv_proc]
 align 4
-SOCKET_receive_udp:
+SOCKET_receive_dgram:
 	jmp	s_error
 align 4
 SOCKET_receive_tcp:
-	DEBUGF	1,"type: TCP\n"
+	DEBUGF	1,"SOCKET_receive: TCP\n"
 	mov	ecx, esi
+;
 ;-----------------------------------------------------------------
 align 4
 SOCKET_send:
-	DEBUGF	1,"SOCKET_send: socknum: %u sockaddr: %x, length: %u, flags: %x, ", ecx, edx, esi, edi
+	DEBUGF	1,"SOCKET_send: socknum: %u data ptr: %x, length: %u, flags: %x, ", ecx, edx, esi, edi
 	call	SOCKET_num_to_ptr
-	jz	s_error
 	jz	s_error
 	jmp	[eax + SOCKET.snd_proc]
+	jmp	[eax + SOCKET.snd_proc]
 align 4
 align 4
 SOCKET_send_tcp:
-	DEBUGF	1,"type: TCP\n"
+	DEBUGF	1,"SOCKET_send: TCP\n"
 	mov	[esp+32], eax
+	ret
+;align 4
+;SOCKET_send_ip:
+;
+;        DEBUGF  1,"type: IP\n"
+;
+;        mov     ecx, esi
+;        mov     esi, edx
+;
+;        call    IPv4_output_raw
+;
+;        mov     dword [esp+32], eax
+;        ret
+align 4
+SOCKET_send_icmp:
+	DEBUGF	1,"SOCKET_send: ICMP\n"
+	mov	ecx, esi
+	call	ICMP_output_raw
+	mov	dword [esp+32], 0
 	ret
 	push	esi
 	mov	esi, esp
 	add_to_queue (eax + SOCKET_QUEUE_LOCATION), SOCKET_QUEUE_SIZE, socket_queue_entry.size, SOCKET_input.full
-	DEBUGF	1,"Queued packet successfully\n"
+	DEBUGF	1,"SOCKET_input: queued packet successfully\n"
 	add	esp, socket_queue_entry.size
 	mov	[eax + SOCKET.lock], 0
 	jmp	SOCKET_notify_owner
   .full:
-	DEBUGF	2,"Socket %x is full!\n", eax
+	DEBUGF	2,"SOCKET_input: socket %x is full!\n", eax
 	mov	[eax + SOCKET.lock], 0
 	cmp	[eax + RING_BUFFER.size], SOCKET_MAXDATA
 	jg	.too_large
   .copy:
 	mov	edi, [eax + RING_BUFFER.write_ptr]
-	DEBUGF	2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
+	DEBUGF	2,"SOCKET_ring_write: %u bytes from %x to %x\n", ecx, esi, edi
 	push	ecx
 	shr	ecx, 1
 	mov	[eax + RING_BUFFER.size], SOCKET_MAXDATA	; update size, we will fill buffer completely
 	jmp	.copy
   .full:
-	DEBUGF	2,"Ring buffer is full!\n"
+	DEBUGF	2,"SOCKET_ring_write: ring buffer is full!\n"
 	xor	ecx, ecx
 	jg	.less_data
   .copy:
 	mov	esi, [eax + RING_BUFFER.read_ptr]
-	DEBUGF	2,"Copying %u bytes from %x to %x\n", ecx, esi, edi
+	DEBUGF	2,"SOCKET_ring_read: %u bytes from %x to %x\n", ecx, esi, edi
 	push	ecx
 	shr	ecx, 1
 	jnc	.nb
 	push	ebx
 	lea	ebx, [eax + SOCKET.lock]
 	call	wait_mutex
-	DEBUGF	1, "freeing socket..\n"
+	DEBUGF	1, "SOCKET_free: freeing socket..\n"
 	push	eax				; this will be passed to kernel_free
 	mov	ebx, [eax + SOCKET.NextPtr]
 	mov	eax, [eax + SOCKET.PrevPtr]
-	DEBUGF	1, "linking socket %x to socket %x\n", eax, ebx
+	DEBUGF	1, "SOCKET_free: linking socket %x to socket %x\n", eax, ebx
 	test	eax, eax
        @@:
 	call	kernel_free
 	pop	ebx
-	DEBUGF	1, "socket is gone!\n"
+	DEBUGF	1, "SOCKET_free: success!\n"

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/socket.inc – Rev 1536 → 1541