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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2009. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2010. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  STACK.INC                                                      ;;
 ;;                                                                 ;;
 ;;  BASIC TCP/IP stack for KolibriOS                               ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-$Revision: 1483 $
+$Revision: 1514 $
 __DEBUG_LEVEL_OLD__  equ __DEBUG_LEVEL__
 __DEBUG_LEVEL__ equ 1			; this sets the debug level for network part of kernel
 uglobal
-	last_1sTick	db ?
+	net_10ms       dd ?
+	net_tmr_count  dw ?
-	last_1hsTick	dd ?
+endg
 endg
 MAX_NET_DEVICES 	equ 16
-MAX_NET_DEVICES 	equ 16
-QUEUE_BEFORE_SENDING	equ 0		; 1 or 0 (enable or disable) currently only affects ethernet
+ETH_QUEUE		equ 0		; 1 = enable / 0 = disable
+MIN_EPHEMERAL_PORT equ 49152
 MAX_EPHEMERAL_PORT equ 61000
 MIN_EPHEMERAL_PORT equ 49152
-MAX_EPHEMERAL_PORT equ 61000
+; Ethernet protocol numbers
 ETHER_ARP	equ 0x0608
-ETHER		equ 1337		; TODO: find another value for this (how does it work in posix ?)
+ETHER_IPv4	equ 0x0008		; Reversed from 0800 for intel
 ETHER_ARP	equ 0x0608
 ;Protocol family
 AF_UNSPEC	equ 0
 AF_UNIX 	equ 1
 AF_INET4	equ 2
 ;AF_AX25         equ 3
 ;AF_IPX          equ 4
+;AF_APPLETALK    equ 5
-;AF_APPLETALK    equ 5
+;AF_NETROM       equ 6
-;AF_NETROM       equ 6
+;AF_BRIDGE       equ 7
-;AF_BRIDGE       equ 7
+;AF_AAL5         equ 8
-;AF_AAL5         equ 8
+;AF_X25          equ 9
-;AF_X25          equ 9
+AF_INET6	equ 10
-;AF_INET6        equ 10
+;AF_MAX          equ 12
-;AF_MAX          equ 12
+; Internet protocol numbers
-IP_PROTO_IP	equ 0
-IP_PROTO_ICMP	equ 1
-IP_PROTO_TCP	equ 6
-IP_PROTO_UDP	equ 17
-; Socket types
-SOCK_STREAM	= 1
-SOCK_DGRAM	= 2
-SOCK_RAW	= 3
-TCB_LISTEN		equ 1
-TCB_SYN_SENT		equ 2
-TCB_SYN_RECEIVED	equ 3
-TCB_ESTABLISHED 	equ 4
-TCB_FIN_WAIT_1		equ 5
-TCB_FIN_WAIT_2		equ 6
-TCB_CLOSE_WAIT		equ 7
-TCB_CLOSING		equ 8
-TCB_LAST_ACK		equ 9
-TCB_TIMED_WAIT		equ 10
-TCB_CLOSED		equ 11
-TH_FIN			equ 1 shl 0
-TH_SYN			equ 1 shl 1
-TH_RST			equ 1 shl 2
-TH_PUSH 		equ 1 shl 3
-TH_ACK			equ 1 shl 4
-TH_URG			equ 1 shl 5
+IP_PROTO_IP	equ 0
+IP_PROTO_ICMP	equ 1
+IP_PROTO_TCP	equ 6
-macro inc_INET reg {
+IP_PROTO_UDP	equ 17
-	add	byte [reg + 3], 1
-	adc	byte [reg + 2], 0
-	adc	byte [reg + 1], 0
-	adc	byte [reg], 0
+; Socket types
-}
+SOCK_STREAM	equ 1
+SOCK_DGRAM	equ 2
+SOCK_RAW	equ 3
+; Socket options
+SO_ACCEPTCON equ 1
+SOCKET_MAXDATA	equ 4096
+; Network driver types
 NET_TYPE_ETH	equ 1
-macro add_INET reg {
+NET_TYPE_SLIP	equ 2
 	add	byte [reg + 3], cl
 	adc	byte [reg + 2], ch
-	adc	byte [reg + 1], 0
+virtual at 0
 	adc	byte [reg], 0
+	NET_DEVICE:
-	rol	ecx, 16
+	.type		dd ?
+	.end:
-	add	byte [reg + 1], cl
-	adc	byte [reg], ch
+end virtual
-	rol	ecx, 16
+; Exactly as it says..
+macro pseudo_random reg {
+	add	reg, [esp]
+	rol	reg, 5
+	xor	reg, [timer_ticks]
+	imul	reg, 214013
+	xor	reg, 0xdeadbeef
 	rol	reg, 9
+}
+macro ntohld reg {
 	rol	word reg, 8
-macro pseudo_random reg {
+	rol	dword reg, 16
-	add	reg, [esp]
-	rol	reg, 5
-	xor	reg, [timer_ticks]
+	rol	word reg, 8
 	imul	reg, 214013
+}
+macro ntohlw reg {
+	rol	word reg, 8
+}
+include "queue.inc"
+include "ethernet.inc"
+;include "slip.inc"
+include "ARP.inc"
-	xor	reg, 0xdeadbeef
+include "IPv4.inc"
 	rol	reg, 9
 include "icmp.inc"
-	pushd	reg
+include "udp.inc"
+;
 ;-----------------------------------------------------------------
 align 4
 stack_init:
+; Init the network drivers list
+	xor	eax, eax
+	mov	edi, NET_RUNNING
+	mov	ecx, MAX_NET_DEVICES + 1
+	rep	stosd
+; Call other init procedures
+	call	ETH_init
+;        call    SLIP_init
 	call	ETH_init
+	call	IPv4_init
+	call	ICMP_init
 	call	IPv4_init
 	call	ARP_init
 	call	UDP_init
 	call	TCP_init
 	call	ICMP_init
-	call	socket_init
-	mov	al, 0		      ; set up 1s timer
-	out	0x70, al
+	call	socket_init
 	in	al, 0x71
-	mov	[last_1sTick], al
 	mov	[net_tmr_count], 0
 	ret
 	ret
 ;-----------------------------------------------------------------
+;
 ; stack_handler
+;
-;  This function calls all network init procedures
+;  This function is called in kernel loop
+;
 ;  IN:  /
 ;  OUT: /
+;
 ;-----------------------------------------------------------------
 align 4
 stack_handler:
+	cmp	[NET_RUNNING], 0
-	cmp	[ETH_RUNNING], 0
+	je	.exit
-	je	.exit
-	; Test for 10ms tick
-	mov	eax, [timer_ticks]
+	; Test for 10ms tick
-	cmp	eax, [last_1hsTick]
+	mov	eax, [timer_ticks]
-	je	.exit
+	cmp	eax, [net_10ms]
-	mov	[last_1hsTick], eax
-	call	ETH_handler		    ; handle all queued ethernet packets
-if QUEUE_BEFORE_SENDING
-	call	ETH_send_queued
-end if
-	call	TCP_send_queued
+	je	.exit
-  .sec_tick:
+	mov	[net_10ms], eax
+   if ETH_QUEUE
+	call	ETH_handler
 	call	ETH_send_queued
-	; Test for 1 second tick
+   end if
-	mov	al, 0
+	call	TCP_10ms
+	inc	[net_tmr_count]
+	cmp	[net_tmr_count], 50
+	je	.500ms
+	cmp	[net_tmr_count], 100
-	out	0x70, al
+	jne	.exit
 	in	al, 0x71
+	call	ARP_decrease_entry_ttls
+	call	IPv4_decrease_fragment_ttls
+	call	TCP_timer_1000ms
+	mov	[net_tmr_count], 0
+  .500ms:
+	call	TCP_500ms
+  .exit:
+	ret
+;-----------------------------------------------------------------
+;
+; NET_Add_Device:
+;
+;  This function is called by the network drivers,
+;  to register each running NIC to the kernel
+;
+;  IN:  Pointer to device structure in ebx
+;  OUT: Device num in eax, -1 on error
+;
+;-----------------------------------------------------------------
+align 4
+NET_add_device:
+	DEBUGF	1,"NET_Add_Device: %x\n", ebx
+	mov	eax, [NET_RUNNING]
+	cmp	eax, MAX_NET_DEVICES
+	jge	.error
+;----------------------------------
+; Check if device is already listed
+	mov	eax, ebx
+	mov	ecx, MAX_NET_DEVICES	  ; We need to check whole list because a device may be removed without re-organizing list
+	mov	edi, NET_DRV_LIST
+	repne	scasd			  ; See if device is already in the list
+	jz	.error
+;----------------------------
+; Find empty slot in the list
+	xor	eax, eax
+	mov	ecx, MAX_NET_DEVICES
+	mov	edi, NET_DRV_LIST
+	repne	scasd
+	jnz	.error
+	sub	edi, 4
+	cmp	[ebx + NET_DEVICE.type], NET_TYPE_ETH
+	je	.ethernet
+	cmp	[ebx + NET_DEVICE.type], NET_TYPE_SLIP
+	je	.slip
+	DEBUGF	1,"Unknown network device type: %u\n", [ebx + NET_DEVICE.type]
+	jmp	.error
+  .ethernet:
+	DEBUGF	1,"Trying to add an ethernet driver\n"
+	inc	[ETH_RUNNING]		  ; Indicate that one more ethernet device is up and running
+	jmp	.add_it
+  .slip:
+	DEBUGF	1,"Trying to add a slip driver\n"
+	;;;;
+	jmp	.error
+  .add_it:
+;-----------------------------
+; Add device to the found slot
+	mov	[edi], ebx		  ; add device to list
+	sub	edi, NET_DRV_LIST	  ; Calculate device number in eax
+	mov	eax, edi		  ;
+	shr	eax, 2
+	inc	[NET_RUNNING]		  ; Indicate that one more network device is up and running
+	DEBUGF	1,"Device number: %u\n",eax
+	ret
+  .error:
+	or	eax, -1
+	DEBUGF	2,"Adding network device failed\n"
+	ret
+;-----------------------------------------------------------------
+;
+; NET_Remove_Device:
+;
+;  This function is called by etwork drivers,
+;  to unregister network devices from the kernel
+;
+;  IN:  Pointer to device structure in ebx
+;  OUT: eax: -1 on error
+;
+;-----------------------------------------------------------------
+align 4
+NET_remove_device:
+	cmp	[NET_RUNNING], 0
+	je	.error
+;----------------------------
+; Find the driver in the list
+	mov	eax, ebx
+	mov	ecx, MAX_NET_DEVICES
+	mov	edi, NET_DRV_LIST
+	repne	scasd
+	jnz	.error
+;------------------------
+; Remove it from the list
+	xor	eax, eax
+	mov	dword [edi-4], eax
+	dec	[NET_RUNNING]
+	ret
+  .error:
+	or	eax, -1
+	ret
+;-----------------------------------------------------------------
+;
+; NET_ptr_to_num
+;
+; IN:  ebx = ptr to device struct
+; OUT: edi = -1 on error, device number otherwise
+;
+;-----------------------------------------------------------------
+align 4
+NET_ptr_to_num:
+	push	ecx
+	mov	ecx, MAX_NET_DEVICES
+	mov	edi, NET_DRV_LIST
+  .loop:
+	cmp	ebx, [edi]
+	jz	.found
+	add	edi, 4
+	dec	ecx
+	jnz	.loop
+	; repnz  scasd could work too if eax is used instead of ebx!
+	or	edi, -1
+	pop	ecx
+	ret
+  .found:
+	sub	edi, NET_DRV_LIST
+	shr	edi, 2
+	pop	ecx
+	ret
+;--------------------------
+;
+; NET_send
+;
+; IN:   ebx = ptr to device struct
+;      [esp] = data ptr
+;    [esp + 4] = data size
+;
+; OUT: /
+;
+;--------------------------
+align 4
-	cmp	al, [last_1sTick]
+NET_send:
 	je	.exit
 	call	[ebx + ETH_DEVICE.transmit] ;;;;
 	mov	[last_1sTick], al
 ;;; TODO:check if packet was sent ok
 sys_network:
 	cmp	ebx, -1
 	jne	@f
-	mov	eax, [ETH_RUNNING]
+	mov	eax, [NET_RUNNING]
 	jmp	.return
    @@:
 	cmp	bh, MAX_NET_DEVICES		 ; Check if device number exists
 	jge	.doesnt_exist
 	mov	esi, ebx
 	and	esi, 0x0000ff00
 	shr	esi, 6
-	cmp	dword [esi + ETH_DRV_LIST], 0 ; check if driver is running
+	cmp	dword [esi + NET_DRV_LIST], 0 ; check if driver is running
 	je	.doesnt_exist
-	test	bl, bl			; 0 = Get device type (ethernet/token ring/...)
+	test	bl, bl			 ; 0 = Get device type (ethernet/token ring/...)
 	jnz	@f
-					 ; todo
 	xor	eax, eax
 	jmp	.return
   @@:
 	dec	bl			; 2 = Reset the device
 	jnz	@f
-	mov	esi, [esi + ETH_DRV_LIST]
+	mov	esi, [esi + NET_DRV_LIST]
 	call	[esi + ETH_DEVICE.reset]
 	jmp	.return
   @@:
 	dec	bl			; 3 = Stop driver for this device
 	jnz	@f
 	ret
 ;----------------------------------------------------------------
+;
-;  System Function To work with Protocols  (75)
+;  System function to work with protocols  (75)
+;
 ;----------------------------------------------------------------
 align 4
 sys_protocols:
 	cmp	bh, MAX_NET_DEVICES		; Check if device number exists
 	jge	.doesnt_exist
 	mov	esi, ebx
 	and	esi, 0x0000ff00
-	shr	esi, 6
+	shr	esi, 6				; now we have the device num * 4 in esi
-	cmp	dword [esi + ETH_DRV_LIST], 0	; check if driver is running TODO: check other lists too
+	cmp	dword [esi + NET_DRV_LIST], 0	; check if driver is running
 	je	TCP_API
 	cmp	ax , ETHER_ARP
 	je	ARP_API
-	cmp	ax , ETHER
+	cmp	ax , 1337
 	je	ETH_API

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/network/stack.inc – Rev 1483 → 1514