X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Finclude%2Fpalacios%2Fvmm_socket.h;h=2108d57af67d72a0ba82ef0a7dd1e726063ea830;hp=bfc71238a8f4d500adbd2f60f393dbbd52a2ae53;hb=3b67b03716ad6bfdda5c95c8a0ef9004da1b3913;hpb=36fb65749158643467beb8ebc82276b2b29412d1

diff --git a/palacios/include/palacios/vmm_socket.h b/palacios/include/palacios/vmm_socket.h
index bfc7123..2108d57 100644
--- a/palacios/include/palacios/vmm_socket.h
+++ b/palacios/include/palacios/vmm_socket.h
@@ -23,208 +23,234 @@
 
 #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_UDP_Socket() ({				\
+	    extern struct v3_socket_hooks * sock_hooks;		\
+	    int 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);		\
-      }							\
-      sock;						\
-    })
+#define V3_Create_TCP_Socket() ({				\
+	    extern struct v3_socket_hooks * sock_hooks;		\
+	    int sock = 0;					\
+	    if ((sock_hooks) && (sock_hooks)->tcp_socket) {	\
+		sock = (sock_hooks)->tcp_socket(0,1,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_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() (-1)
-#define V3_Select_Socket() (-1)
-
-
-
-#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;							\
-    })
+	    extern struct v3_socket_hooks * sock_hooks;		\
+	    int ret = -1;					\
+	    if ((sock_hooks) && (sock_hooks)->bind_socket) {	\
+		ret = (sock_hooks)->bind_socket(sock, port);	\
+	    }							\
+	    ret;						\
+	})
+
+
+#define V3_Listen_Socket(sock, backlog) ({			\
+	    extern struct v3_socket_hooks * sock_hooks;		\
+	    int ret = -1;					\
+	    if ((sock_hooks) && (sock_hooks)->listen) {		\
+		ret = (sock_hooks)->listen(sock, backlog);	\
+	    }							\
+	    ret;						\
+	})
+
+
+#define V3_Accept_Socket(sock, ip_ptr, port_ptr) ({			\
+	    extern struct v3_socket_hooks * sock_hooks;			\
+	    int client_sock = 0;					\
+	    if ((sock_hooks) && (sock_hooks)->accept) {			\
+		client_sock = (sock_hooks)->accept(sock, ip_ptr, port_ptr); \
+	    }								\
+	    client_sock;						\
+	})
+
+
+#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;								\
-    })
+	    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;							\
-    })
+	    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;							\
-    })
+	    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;								\
-    })
+	    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;								\
-    })
+	    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;								\
-    })
+	    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;								\
-    })
+	    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;							\
+	})
 
 
-#endif
 
+#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)))
 
-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_set * next;
-};
+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);
+
 
-struct v3_sock_set {
-  unsigned int num_socks;
-  struct v3_sock_entry * socks;
-};
 
+#endif
 
-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.
+struct v3_timeval {
+    long    tv_sec;         /* seconds */
+    long    tv_usec;        /* and microseconds */
+};
 
 
+#define V3_SOCK_SETSIZE    1000
 
-#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)
+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
-  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 */
+    int (*tcp_socket)(const int bufsize, const int nodelay, const int nonblocking);
+    int (*udp_socket)(const int bufsize, const int nonblocking);
+
+    /* Socket Destruction */
+    void (*close)(int sock);
 
-  // Socket Destruction
-  void (*close)(V3_SOCK sock);
+    /* Network Server Calls */
+    int (*bind_socket)(const int sock, const int port);
 
-  // Network Server Calls
-  int (*bind_socket)(const V3_SOCK sock, const int port);
+    int (*listen)(const int sock, int backlog);
   
-  int (*accept)(const V3_SOCK const sock, unsigned int * remote_ip);
-  // 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);
+    int (*accept)(const int 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 int sock, const int hostip, const int port);
+    int (*connect_to_host)(const int sock, const char * hostname, const int port);
+
+    /* TCP Data Transfer */
+    int (*send)(const int sock, const char * buf, const int len);
+    int (*recv)(const int 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 int sock, const char * hostname, const int port, 
+		       const char * buf, const int len);
+    int (*sendto_ip)(const int 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 int sock, const char * hostname, const int port, 
 			 char * buf, const int len);
+    int (*recvfrom_ip)(const int sock, const int ip_addr, const int port, 
+		       char * buf, const int len);
 };
 
 
-void V3_Init_Socket(struct v3_socket_hooks * hooks);
-
+extern void V3_Init_Sockets(struct v3_socket_hooks * hooks);
 
 #endif