#include <palacios/vmm.h>
-#define V3_SOCK void *
#ifdef __V3VEE__
-#define V3_Create_UDP_Socket() ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- V3_SOCK sock = 0; \
- if ((sock_hooks) && (sock_hooks)->udp_socket) { \
- sock = (sock_hooks)->udp_socket(0,0); \
- } \
- sock; \
- })
-
-
-
-#define V3_Create_TCP_Socket() ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- V3_SOCK sock = 0; \
- if ((sock_hooks) && (sock_hooks)->tcp_socket) { \
- sock = (sock_hooks)->tcp_socket(0,0,0); \
- } \
- sock; \
- })
-
-
-#define V3_Close_Socket(sock) \
- do { \
- extern struct v3_socket_hooks * sock_hooks; \
- if ((sock_hooks) && (sock_hooks)->close) { \
- (sock_hooks)->close(sock); \
- } \
- } while (0);
-
-
-
-#define V3_Bind_Socket(sock, port) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->bind) { \
- ret = (sock_hooks)->bind(sock, port); \
- } \
- ret; \
- })
-
-
-#define V3_Accept_Socket(sock, ip_ptr) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->accept) { \
- ret = (sock_hooks)->accept(sock, ip_ptr); \
- } \
- ret; \
- })
-
-
-#define V3_Select_Socket(rset,wset,eset,tv) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->select) { \
- ret = (sock_hooks)->select(rset, wset, eset, tv); \
- } \
- ret; \
- })
-
-
-
-#define V3_Connect_To_IP(sock, ip, port) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->connect_to_ip) { \
- ret = (sock_hooks)->connect_to_ip(sock, ip, port); \
- } \
- ret; \
- })
-
-
-#define V3_Connect_To_Host(sock, hostname, port) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->connect_to_host) { \
- ret = (sock_hooks)->connect_to_host(sock, hostname, port); \
- } \
- ret; \
- })
-
-
-#define V3_Send(sock, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->send) { \
- ret = (sock_hooks)->send(sock, buf, len); \
- } \
- ret; \
- })
-
-#define V3_Recv(sock, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->recv) { \
- ret = (sock_hooks)->recv(sock, buf, len); \
- } \
- ret; \
- })
-
-#define V3_SendTo_Host(sock, hostname, port, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->sendto_host) { \
- ret = (sock_hooks)->sendto_host(sock, hostname, port, buf, len); \
- } \
- ret; \
- })
-
-
-#define V3_SendTo_IP(sock, ip, port, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->sendto_ip) { \
- ret = (sock_hooks)->sendto_ip(sock, ip, port, buf, len); \
- } \
- ret; \
- })
-
-
-#define V3_RecvFrom_Host(sock, hostname, port, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->recvfrom_host) { \
- ret = (sock_hooks)->recvfrom_host(sock, hostname, port, buf, len); \
- } \
- ret; \
- })
-
-
-#define V3_RecvFrom_IP(sock, ip, port, buf, len) ({ \
- extern struct v3_socket_hooks * sock_hooks; \
- int ret = -1; \
- if ((sock_hooks) && (sock_hooks)->recvfrom_ip) { \
- ret = (sock_hooks)->recvfrom_ip(sock, ip, port, buf, len); \
- } \
- ret; \
- })
+typedef void * v3_sock_t;
-#endif
+v3_sock_t v3_create_udp_socket(struct v3_vm_info * vm);
+v3_sock_t v3_create_tcp_socket(struct v3_vm_info * vm);
+
+void v3_socket_close(v3_sock_t sock);
+
+int v3_socket_bind(v3_sock_t sock, uint16_t port);
+int v3_socket_listen(const v3_sock_t sock, int backlog);
+v3_sock_t v3_socket_accept(const v3_sock_t sock, uint32_t * remote_ip, uint32_t * port);
+
+int v3_connect_to_ip(const v3_sock_t sock, const uint32_t hostip, const uint16_t port);
+int v3_connect_to_host(const v3_sock_t sock, const char * hostname, const uint16_t port);
+
+
+int v3_socket_send(const v3_sock_t sock, const uint8_t * buf, const uint32_t len);
+int v3_socket_recv(const v3_sock_t sock, uint8_t * buf, const uint32_t len);
+
+
+int v3_socket_send_to_host(const v3_sock_t sock, const char * hostname, const uint16_t port,
+ const uint8_t * buf, const uint32_t len);
+int v3_socket_send_to_ip(const v3_sock_t sock, const uint32_t ip, const uint16_t port,
+ const uint8_t * buf, const uint32_t len);
+int v3_socket_recv_from_host(const v3_sock_t sock, const char * hostname, const uint16_t port,
+ uint8_t * buf, const uint32_t len);
+int v3_socket_recv_from_ip(const v3_sock_t sock, const uint32_t ip, const uint16_t port,
+ uint8_t * buf, const uint32_t len);
+
+
+#define V3_Select_Socket(rset,wset,eset,tv) ({ \
+ extern struct v3_socket_hooks * sock_hooks; \
+ int ret = -1; \
+ if ((sock_hooks) && (sock_hooks)->select) { \
+ ret = (sock_hooks)->select(rset, wset, eset, tv); \
+ } \
+ ret; \
+ })
-struct v3_timeval {
- long tv_sec; /* seconds */
- long tv_usec; /* and microseconds */
-};
-struct v3_sock_entry {
- V3_SOCK sock;
- unsigned int is_set;
- struct v3_sock_entry * next;
-};
-struct v3_sock_set {
- unsigned int num_socks;
- struct v3_sock_entry * socks;
-};
-void v3_init_sock_set(struct v3_sock_set * sock_set);
-void v3_set_sock(struct v3_sock_set * sock_set, V3_SOCK sock); // adds socket to the sockset
-void v3_clr_sock(struct v3_sock_set * sock_set, V3_SOCK sock); // deletes socket from sockset
-int v3_isset_sock(struct v3_sock_set * sock_set, V3_SOCK sock); // checks is_set vairable
-void v3_zero_sockset(struct v3_sock_set * sock_set); // clears all is_set variables.
+#define V3_SOCK_SET(n, p) ((p)->fd_bits[(n) / 8] |= (1 << ((n) & 7)))
+#define V3_SOCK_CLR(n, p) ((p)->fd_bits[(n) / 8] &= ~(1 << ((n) & 7)))
+#define V3_SOCK_ISSET(n,p) ((p)->fd_bits[(n) / 8] & (1 << ((n) & 7)))
+#define V3_SOCK_ZERO(p) memset((void *)(p), 0, sizeof(*(p)))
+uint32_t v3_inet_addr(const char * ip_str);
+char * v3_inet_ntoa(uint32_t addr);
+uint16_t v3_htons(uint16_t s);
+uint16_t v3_ntohs(uint16_t s);
+uint32_t v3_htonl(uint32_t s);
+uint32_t v3_ntohl(uint32_t s);
-#define v3_foreach_sock(/* (struct v3_sock_set *) */ sock_set, /* (struct v3_sock_entry *) */ iter) \
- for (iter = sock_set->socks; iter != NULL; iter = iter->next)
+
+
+
+#endif
+
+
+struct v3_timeval {
+ long tv_sec; /* seconds */
+ long tv_usec; /* and microseconds */
+};
+
+
+#define V3_SOCK_SETSIZE 1000
+
+typedef struct v3_sock_set {
+ /* This format needs to match the standard posix FD_SET format, so it can be cast */
+ unsigned char fd_bits [(V3_SOCK_SETSIZE + 7) / 8];
+} v3_sock_set;
struct v3_socket_hooks {
- // Socket creation routines
-xsxsxsxsxs V3_SOCK (*tcp_socket)(const int bufsize, const int nodelay, const int nonblocking);
- V3_SOCK (*udp_socket)(const int bufsize, const int nonblocking);
+ /* Socket creation routines */
+ void *(*tcp_socket)(const int bufsize, const int nodelay, const int nonblocking, void * priv_data);
+ void *(*udp_socket)(const int bufsize, const int nonblocking, void * priv_data);
- // Socket Destruction
- void (*close)(V3_SOCK sock);
+ /* Socket Destruction */
+ void (*close)(void * sock);
- // Network Server Calls
- int (*bind_socket)(const V3_SOCK sock, const int port);
+ /* Network Server Calls */
+ int (*bind)(const void * sock, const int port);
- int (*listen)(const V3_SOCK sock, int backlog);
+ int (*listen)(const void * sock, int backlog);
- V3_SOCK (*accept)(const V3_SOCK const sock, unsigned int * remote_ip, unsigned int * port);
- // This going to suck
- int (*select)(struct v3_sock_set * rset, \
- struct v3_sock_set * wset, \
- struct v3_sock_set * eset, \
- struct v3_timeval tv);
-
- // Connect calls
- int (*connect_to_ip)(const V3_SOCK sock, const int hostip, const int port);
- int (*connect_to_host)(const V3_SOCK sock, const char * hostname, const int port);
-
- // TCP Data Transfer
- int (*send)(const V3_SOCK sock, const char * buf, const int len);
- int (*recv)(const V3_SOCK sock, char * buf, const int len);
+ void *(*accept)(const void * sock, unsigned int * remote_ip, unsigned int * port);
+ /* This going to suck */
+ int (*select)(struct v3_sock_set * rset, \
+ struct v3_sock_set * wset, \
+ struct v3_sock_set * eset, \
+ struct v3_timeval tv);
+
+ /* Connect calls */
+ int (*connect_to_ip)(const void * sock, const int hostip, const int port);
+ int (*connect_to_host)(const void * sock, const char * hostname, const int port);
+
+ /* TCP Data Transfer */
+ int (*send)(const void * sock, const char * buf, const int len);
+ int (*recv)(const void * sock, char * buf, const int len);
- // UDP Data Transfer
- int (*sendto_host)(const V3_SOCK sock, const char * hostname, const int port,
- const char * buf, const int len);
- int (*sendto_ip)(const V3_SOCK sock, const int ip_addr, const int port,
- const char * buf, const int len);
+ /* UDP Data Transfer */
+ int (*sendto_host)(const void * sock, const char * hostname, const int port,
+ const char * buf, const int len);
+ int (*sendto_ip)(const void * sock, const int ip_addr, const int port,
+ const char * buf, const int len);
- int (*recvfrom_host)(const V3_SOCK sock, const char * hostname, const int port,
- char * buf, const int len);
- int (*recvfrom_ip)(const V3_SOCK sock, const int ip_addr, const int port,
+ int (*recvfrom_host)(const void * sock, const char * hostname, const int port,
char * buf, const int len);
+ int (*recvfrom_ip)(const void * sock, const int ip_addr, const int port,
+ char * buf, const int len);
};
extern void V3_Init_Sockets(struct v3_socket_hooks * hooks);
-
#endif
