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

Added support for network.obj library

Browse Source 
git-svn-id: svn://kolibrios.org@4282 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
esevece 2013-11-22 18:41:04 +00:00
parent f34b044d15
commit ed1000aa19
3 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
programs/develop/libraries/menuetlibc/include/menuet/net.h
View File

@ -71,7 +71,7 @@ extern "C" {
struct in_addr { struct in_addr {
unsigned long s_addr; unsigned int s_addr;
}; };
struct sockaddr { struct sockaddr {
@ -79,22 +79,22 @@ struct sockaddr {
char sa_data[14]; // 14 bytes of protocol address char sa_data[14]; // 14 bytes of protocol address
}; };
struct sockaddr_in { struct sockaddr_in { // IPv4 only, we need sockaddr_in6 for IPv6
short sin_family; // sa_family_t short int sin_family; // Address family, AF_INET
unsigned short sin_port; // in_port_t unsigned short int sin_port; // Port number
struct in_addr sin_addr; struct in_addr sin_addr; // Internet address
char sin_zero[8]; unsigned char sin_zero[8]; // Same size as struct sockaddr
}; };
struct addrinfo { struct addrinfo {
int ai_flags; // bitmask of AI_* int ai_flags; // AI_PASSIVE, AI_CANONNAME, etc.
int longai_family; // PF_* int ai_family; // AF_INET, AF_INET6, AF_UNSPEC
int ai_socktype; //SOCK_* int ai_socktype; // SOCK_STREAM, SOCK_DGRAM
int ai_protocol; // 0 or IPPROTO_* int ai_protocol; // use 0 for "any"
int ai_addrlen; // length of ai_addr int ai_addrlen; // size of ai_addr in bytes
char *ai_canonname; struct sockaddr *ai_addr; // struct sockaddr_in or _in6
struct sockaddr *ai_addr; // struct sockaddr* char *ai_canonname; // full canonical hostname
struct addrinfo *ai_next; // struct addrinfo* struct addrinfo *ai_next; // linked list, next node
}; };
#define EAI_ADDRFAMILY 1 #define EAI_ADDRFAMILY 1
@ -129,7 +129,6 @@ struct addrinfo {
#define ECONNABORTED 53 #define ECONNABORTED 53
unsigned long inet_addr(char *cp);
int socket(int domain, int type, int protocol); int socket(int domain, int type, int protocol);
int closesocket(int s); int closesocket(int s);
int bind(int sockfd, struct sockaddr *my_addr, int addrlen); int bind(int sockfd, struct sockaddr *my_addr, int addrlen);
@ -138,11 +137,17 @@ int connect(int sockfd, const struct sockaddr *serv_addr, int addrlen);
int accept(int s, struct sockaddr *addr, int *addrlen); int accept(int s, struct sockaddr *addr, int *addrlen);
int send(int s, const void *buf, int len, int flags); int send(int s, const void *buf, int len, int flags);
int recv(int sockfd, void *buf, int len, int flags); int recv(int sockfd, void *buf, int len, int flags);
// Review int setsockopt(int s, int level, int optname, const void *optval, socklen_t optlen);
// Review int getsockopt(int s, int level, int optname, void *optval, socklen_t *optlen); // extern from src/libc/menuetos/netowrk.c
// Add socketpair() #define __stdcall __attribute__((stdcall))
extern void NETWORK_INIT();
extern void (* __stdcall freeaddrinfo)(struct addrinfo* ai);
extern int (* __stdcall getaddrinfo)( const char* hostname, const char* servname, const struct addrinfo* hints, struct addrinfo **res);
extern char * (* __stdcall inet_ntoa)(struct in_addr in);
extern unsigned long (* __stdcall inet_addr)( const char* hostname);
// Old stuff
//--------------------------------------------- //---------------------------------------------
#define __NET_stack_rd_cfg_word 0 #define __NET_stack_rd_cfg_word 0

2
programs/develop/libraries/menuetlibc/src/libc/menuetos/Makefile
View File

@ -1,6 +1,6 @@
THIS_SRCS = backgr.c bar.c button.c clock.c date.c delay.c dga.c \ THIS_SRCS = backgr.c bar.c button.c clock.c date.c delay.c dga.c \
event.c exit.c file.c image.c ipc.c irq.c keyb.c line.c \ event.c exit.c file.c image.c ipc.c irq.c keyb.c line.c \
mpu401.c param.c pixel.c process.c screen.c sound.c systree.c \ mpu401.c network.c param.c pixel.c process.c screen.c sound.c systree.c \
text.c thread.c window.c pci.c alloca.s cofflib.c debug.c text.c thread.c window.c pci.c alloca.s cofflib.c debug.c
include $(MENUET_LIBC_TOPDIR)/Make.rules include $(MENUET_LIBC_TOPDIR)/Make.rules

14
programs/develop/libraries/menuetlibc/src/libc/net/socket.c
View File

@ -1,16 +1,6 @@
#include <menuet/net.h> #include <menuet/net.h>
unsigned long inet_addr(char *cp)
{
// Adapted from here http://stackoverflow.com/a/1684635
unsigned long __ret;
unsigned int c1,c2,c3,c4;
sscanf(cp, "%d.%d.%d.%d", &c1,&c2,&c3,&c4);
__ret = (unsigned long)c4+c3*256+c2*256*256+c1*256*256*256;
return htonl(__ret);
}
int socket(int domain, int type, int protocol) int socket(int domain, int type, int protocol)
{ {
int __ret; int __ret;
@ -47,6 +37,10 @@ int recv(int sockfd, void *buf, int len, int flags)
return __ret; return __ret;
} }
// -------------------------------------------------------------- // --------------------------------------------------------------
__u32 __menuet__open_UDP_socket(__u32 local_port,__u32 remote_port,__u32 remote_ip) __u32 __menuet__open_UDP_socket(__u32 local_port,__u32 remote_port,__u32 remote_ip)