Merge new network stack with trunk

git-svn-id: svn://kolibrios.org@3545 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/libraries/network/network.inc

@@ -1,22 +1,27 @@
 ; Socket types
 SOCK_STREAM	= 1
 SOCK_DGRAM	= 2
-SOCK_RAW	= 3	; not supported by the kernel
+SOCK_RAW	= 3
+
+; Socket options
+SO_NONBLOCK	= 1 shl 31
 
 ; IP protocols
 IPPROTO_IP	= 0
-IPPROTO_ICMP	= 1	; not supported by the kernel
+IPPROTO_ICMP	= 1
 IPPROTO_TCP	= 6
 IPPROTO_UDP	= 17
 
 ; Address families
 AF_UNSPEC	= 0
-AF_INET		= 2	; IPv4
-;AF_INET6	= 28	; IPv6 (not supported)
+AF_LOCAL	= 1
+AF_INET4	= 2	; IPv4
+AF_INET6	= 28	; IPv6 (not supported yet)
 
 PF_UNSPEC	= AF_UNSPEC
-PF_INET		= AF_INET
-;PF_INET6	= AF_INET6
+PF_LOCAL	= AF_LOCAL
+PF_INET4	= AF_INET4
+PF_INET6	= AF_INET6
 
 ; Flags for addrinfo
 AI_PASSIVE	= 1
@@ -28,9 +33,17 @@ AI_ADDRCONFIG	= 0x400
 ; internal definition
 AI_SUPPORTED	= 0x40F
 
+; for system function 76
+API_ETH 	= 0 shl 16
+API_IPv4	= 1 shl 16
+API_ICMP	= 2 shl 16
+API_UDP 	= 3 shl 16
+API_TCP 	= 4 shl 16
+API_ARP 	= 5 shl 16
+API_PPPOE	= 6 shl 16
+
 struct sockaddr_in
-	sin_len		db	?	; uint8_t
-	sin_family	db	?	; sa_family_t
+	sin_family	dw	?	; sa_family_t
 	sin_port	dw	?	; in_port_t
 	sin_addr	dd	?	; struct in_addr
 	sin_zero	rb	8	; zero
@@ -43,8 +56,8 @@ struct addrinfo
 	ai_protocol	dd	?	; 0 or IPPROTO_*
 	ai_addrlen	dd	?	; length of ai_addr
 	ai_canonname	dd	?	; char*
-	ai_addr		dd	?	; struct sockaddr*
-	ai_next		dd	?	; struct addrinfo*
+	ai_addr 	dd	?	; struct sockaddr*
+	ai_next 	dd	?	; struct addrinfo*
 ends
 
 EAI_ADDRFAMILY	= 1
@@ -59,3 +72,23 @@ EAI_SOCKTYPE	= 10
 EAI_BADHINTS	= 12
 EAI_PROTOCOL	= 13
 EAI_OVERFLOW	= 14
+
+socket		fix 75, 0
+close		fix 75, 1
+bind		fix 75, 2
+listen		fix 75, 3
+connect 	fix 75, 4
+accept		fix 75, 5
+send		fix 75, 6
+recv		fix 75, 7
+setsockopt	fix 75, 8
+getsockopt	fix 75, 9
+socketpair	fix 75, 10
+
+
+struct	ARP_entry
+	IP	dd ?
+	MAC	dp ?
+	status	dw ?
+	TTL	dw ?
+ends