X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fsocket.c;h=8315a191a99f4021345f9b65ed610e9a7d71ab46;hb=b1a2026094d16135da97686e18fa99bfeeec70eb;hp=255afb3c0bed2407455ffb080b58407797d07b97;hpb=032b20f0bfb2f1f057d69087151b9e49ce4c2776;p=palacios.releases.git

diff --git a/palacios/src/geekos/socket.c b/palacios/src/geekos/socket.c
index 255afb3..8315a19 100644
--- a/palacios/src/geekos/socket.c
+++ b/palacios/src/geekos/socket.c
@@ -1,22 +1,40 @@
 #include <geekos/socket.h>
+#include <geekos/malloc.h>
+#include <palacios/vmm_types.h>
+#include <geekos/ne2k.h>
+#include <uip/uip.h>
+#include <uip/uip_arp.h>
+#include <geekos/int.h>
+#include <geekos/vmm_stubs.h>
+#include <geekos/queue.h>
+
+#define BUF ((struct uip_eth_hdr *)&uip_buf[0])
 
 #define MAX_SOCKS 1024
 
-struct socket sockets[1024];
+struct socket sockets[MAX_SOCKS];
 
 
-void init_network() {
-  int i = 0;
+int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt) ;
 
-  for (i = 0; i < MAX_SOCKS; i++) {
-    sockets[i].in_use = 0;
-    init_queue(&(sockets[i].send_queue))
-    init_queue(&(sockets[i].recv_queue))
-  }
+void init_network() {
+   int i = 0;
+   
+   for (i = 0; i < MAX_SOCKS; i++) {
+      sockets[i].in_use = 0;
+      init_queue(&(sockets[i].send_queue));
+      init_queue(&(sockets[i].recv_queue));
+   }
+
+  //initiate uIP
+    uip_init();
+    uip_arp_init();
 
   // set up interrupt handler
   // set up device driver
 
+    Init_Ne2k(&Packet_Received);
+
 
 }
 
@@ -33,23 +51,177 @@ static int allocate_socket_fd() {
   return -1;
 }
 
+static int release_socket_fd(int sockfd){
+       if (sockfd >= 0 && sockfd < MAX_SOCKS)
+		sockets[sockfd].in_use = 0;
 
-struct socket * get_socket_from_fd(int fd) {
-  return &(sockets[fd]);
+	return 0;
 }
 
 
+struct socket * get_socket_from_fd(int fd) {
+  return &(sockets[fd]);
+}
 
 
-int connect(const uint_t ip_addr) {
+int connect(const uchar_t ip_addr[4], ushort_t port) {
   int sockfd = -1;
   sockfd = allocate_socket_fd();
-
+  uip_ipaddr_t ipaddr;
+  
   if (sockfd == -1) {
     return -1;
   }
 
+  uip_ipaddr(&ipaddr, ip_addr[0], ip_addr[1], ip_addr[2], ip_addr[3]);  
+  
+  sockets[sockfd].con = uip_connect((uip_ipaddr_t *)&ip_addr, htons(port));
+
+  if (sockets[sockfd].con == NULL){
+  	release_socket_fd(sockfd);
+	return -1;
+  }
+
+  return sockfd;
+}
+
+
+void timer_int_Handler(struct Interrupt_State * state){
+	int i;
+	//handle the periodic calls of uIP
+	for(i = 0; i < UIP_CONNS; ++i) {
+	       uip_periodic(i);
+		if(uip_len > 0) {
+		     //devicedriver_send();
+		     NE2K_Transmit(uip_len);
+		}
+  	}
+	for(i = 0; i < UIP_UDP_CONNS; i++) {
+		 uip_udp_periodic(i);
+		 if(uip_len > 0) {
+		     //devicedriver_send();
+		     NE2K_Transmit(uip_len);
+		}
+	}
+}
+
+// a series of utilities to handle conncetion states
+static void connected(int sockfd){
+
+}
+
+static void closed(int sockfd){
+
+}
+
+static void acked(int sockfd){
+
+}
+
+static void newdata(int sockfd){
+
+}
+
+// not finished yet
+static void
+senddata(int sockfd){
+    /*uchar_t *bufptr;
+    int len = 0;
+    addr_t pkt;
+
+    struct sockets *sock = get_socket_from_fd(sockfd);
+
+    pkt = dequeue(sock->send_queue);
+    if (pkt == 0)  // no packet for send
+		return;
+
+    bufptr = uip_appdata;
+  
+    if(len < uip_mss()) {
+      // memcpy(bufptr, data, len);
+    } else {
+
+    }*/
+  //uip_send(uip_appdata,len);
+}
+
+
+
+//get the socket id by the local tcp port
+static int  get_socket_from_port(ushort_t lport) {
+  int i;
+  
+  for (i = 0; i<MAX_SOCKS; i++){
+  	if (sockets[i].con->lport == lport) 
+		return i;
+  }
+  
+  return -1;
+}
+
+
+
+
+void
+socket_appcall(void)
+{
+  int sockfd; 
+
+  sockfd = get_socket_from_port(uip_conn->lport);
+
+  if (sockfd == -1) return;
+    
+  if(uip_connected()) {
+  	connected(sockfd);
+  }
+  
+  if(uip_closed() ||uip_aborted() ||uip_timedout()) {
+     closed(sockfd);
+     return;
+  }
+  
+  if(uip_acked()) {
+     acked(sockfd);
+  }
+  
+  if(uip_newdata()) {
+     newdata(sockfd);
+  }
+  
+  if(uip_rexmit() ||
+     uip_newdata() ||
+     uip_acked() ||
+     uip_connected() ||
+     uip_poll()) {
+     senddata(sockfd);
+  }
+}
 
 
 
+int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt) 
+{
+	  int i;
+
+	  uip_len = info->size; 
+	  for(i = 0; i < info->size; i++) {
+	    uip_buf[i] = *(pkt+i);
+	  }
+	  Free(pkt);
+	  if(BUF->type == htons(UIP_ETHTYPE_ARP)) {
+		uip_arp_arpin();
+		if (uip_len > 0){
+			//ethernet_devicedriver_send();
+			NE2K_Transmit(uip_len);
+      		}					
+	   } else {
+		uip_arp_ipin();
+		uip_input();
+		if(uip_len > 0) {
+		       uip_arp_out();
+		     //ethernet_devicedriver_send();
+			NE2K_Transmit(uip_len);
+	       }
+	}			  
+	  return 0;
 }