X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fsocket.c;h=1fc868cab51499a4e5a81d901781b2ca5777b852;hb=4f7c3b759e3889870c5b5e7d09b3ffcc168e5632;hp=63c3aef9885431a10ef513ab426d60cc0386db93;hpb=2db9473a09d3bf99f10bf0c89ecdb003e8746779;p=palacios.git diff --git a/palacios/src/geekos/socket.c b/palacios/src/geekos/socket.c index 63c3aef..1fc868c 100644 --- a/palacios/src/geekos/socket.c +++ b/palacios/src/geekos/socket.c @@ -1,49 +1,86 @@ +/* Northwestern University */ +/* (c) 2008, Jack Lange */ +/* (c) 2008, Lei Xia */ + #include #include -#include #include #include #include -#include #include -#include +#include +#include + #define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define MAX_SOCKS 1024 +#define BUF_SIZE 1000 struct socket sockets[MAX_SOCKS]; +void socket_appcall(void); +#ifndef UIP_APPCALL +#define UIP_APPCALL socket_appcall +#endif /* UIP_APPCALL */ + + -int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt) ; -void init_network() { +static int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt); +static void periodic_caller(int timer_id); + +void init_socket_layer() { int i = 0; + bool iflag; + for (i = 0; i < MAX_SOCKS; i++) { - sockets[i].in_use = 0; - init_queue(&(sockets[i].send_queue)); - init_queue(&(sockets[i].recv_queue)); + sockets[i].in_use = 0; + sockets[i].send_buf = NULL; + sockets[i].recv_buf = NULL; + sockets[i].state = CLOSED; } - - //initiate uIP - uip_init(); - uip_arp_init(); - - // set up interrupt handler - // set up device driver - - Init_Ne2k(&Packet_Received); - - + + + + //initiate uIP + uip_init(); + uip_arp_init(); + + //setup device driver + Init_Ne2k(&Packet_Received); + + iflag = Begin_Int_Atomic(); + Start_Timer(2, periodic_caller); + End_Int_Atomic(iflag); + } + + + +void set_ip_addr(uchar_t addr[4]) { + uip_ipaddr_t ipaddr; + uip_ipaddr(ipaddr, addr[0], addr[1], addr[2], addr[3]); /* Local IP address */ + uip_sethostaddr(ipaddr); +} + + static int allocate_socket_fd() { int i = 0; for (i = 0; i < MAX_SOCKS; i++) { if (sockets[i].in_use == 0) { sockets[i].in_use = 1; + sockets[i].send_buf = create_ring_buffer(BUF_SIZE); + if (sockets[i].send_buf == NULL) + return -1; + sockets[i].recv_buf = create_ring_buffer(BUF_SIZE); + if (sockets[i].recv_buf == NULL){ + free_ring_buffer(sockets[i].send_buf); + return -1; + } return i; } } @@ -52,11 +89,16 @@ static int allocate_socket_fd() { } static int release_socket_fd(int sockfd){ - if ((sockfd >= 0) && (sockfd < MAX_SOCKS)) { - sockets[sockfd].in_use = 0; - } - - return 0; + if (sockfd >= 0 && sockfd < MAX_SOCKS){ + sockets[sockfd].in_use = 0; + free_ring_buffer(sockets[sockfd].send_buf); + free_ring_buffer(sockets[sockfd].recv_buf); + sockets[sockfd].send_buf = NULL; + sockets[sockfd].recv_buf = NULL; + sockets[sockfd].state = CLOSED; + } + + return 0; } @@ -65,53 +107,92 @@ struct socket * get_socket_from_fd(int fd) { } + +static void periodic_caller(int timer_id) { + int i; + //handle the periodic calls of uIP + + //PrintBoth("Timer CALLBACK handler\n"); + + for(i = 0; i < UIP_CONNS; ++i) { + uip_periodic(i); + if(uip_len > 0) { + //devicedriver_send(); + PrintBoth("Sending Packet\n"); + 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); + } + } +} + + int connect(const uchar_t ip_addr[4], ushort_t port) { int sockfd = -1; - uip_ipaddr_t ipaddr; - sockfd = allocate_socket_fd(); + static 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)); + sockets[sockfd].con = uip_connect(&ipaddr, htons(port)); + if (sockets[sockfd].con == NULL){ release_socket_fd(sockfd); return -1; } + + PrintBoth("Connection start\n"); + Wait(&(sockets[sockfd].recv_wait_queue)); + + + PrintBoth("Connected\n"); + + + + return sockfd; } +int recv(int sockfd, void * buf, uint_t len){ + uint_t recvlen; -void timer_int_Handler(struct Interrupt_State * state){ - int i; - //handle the periodic calls of uIP + struct socket *sock = get_socket_from_fd(sockfd); - for(i = 0; i < UIP_CONNS; ++i) { - uip_periodic(i); - if(uip_len > 0) { - NE2K_Transmit(uip_len); - } + // here we need some lock mechnism, just disable interrupt may not work properly because recv() will be run as a kernel thread +buf_read: + recvlen = rb_read(sock->recv_buf, buf, len); + + if (recvlen == 0){ + Wait(&(sock->recv_wait_queue)); + goto buf_read; } + return recvlen; +} - for(i = 0; i < UIP_UDP_CONNS; i++) { - uip_udp_periodic(i); - if(uip_len > 0) { - NE2K_Transmit(uip_len); - } - } -} // a series of utilities to handle conncetion states -static void connected(int sockfd){ +static void connected(int sockfd) { + struct socket * sock = get_socket_from_fd(sockfd); + PrintBoth("Connected Interrupt\n"); + + sock->state = ESTABLISHED; + + Wake_Up(&(sock->recv_wait_queue)); } static void closed(int sockfd){ @@ -123,41 +204,71 @@ static void acked(int sockfd){ } static void newdata(int sockfd){ + uint_t len; + char *dataptr; + uint_t wrlen; + struct socket *sock; + + len = uip_datalen(); + dataptr = (char *)uip_appdata; + + if (len == 0) + return; + + sock = get_socket_from_fd(sockfd); + + wrlen = rb_write(sock->recv_buf, dataptr, len); + + if (wrlen < len){ //write error, what should I do? + return; + } + + Wake_Up(&(sock->recv_wait_queue)); + + return; } // 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); +static void send_to_driver(int sockfd) { + + PrintBoth("Sending data to driver\n"); + +} + + + +int send(int sockfd, void * buf, uint_t len) { + struct socket * sock = get_socket_from_fd(sockfd); + //int mss = uip_mss(); + //int pending_bytes = rb_data_len(sock->send_buf); + //int len = (mss < pending_bytes) ? mss: pending_bytes; + int bytes_read = 0; + uchar_t * send_buf = uip_appdata; + + bytes_read = rb_peek(sock->send_buf, send_buf, len); + + if (bytes_read == 0) { + // no packet for send + return -1; + } + + uip_send(send_buf, len); + + return len; } //get the socket id by the local tcp port -static int get_socket_from_port(ushort_t lport) { +static int get_socket_from_port(ushort_t lport) { int i; + for (i = 0; i < MAX_SOCKS; i++){ - if (sockets[i].con->lport == lport) + if (sockets[i].con->lport == lport) { return i; + } } return -1; @@ -165,73 +276,89 @@ static int get_socket_from_port(ushort_t lport) { +void socket_appcall(void) { -void -socket_appcall(void) -{ int sockfd; - + sockfd = get_socket_from_port(uip_conn->lport); + PrintBoth("Appcall\n"); + + if (sockfd == -1) { return; } - if(uip_connected()) { + if (uip_connected()) { connected(sockfd); + } - if(uip_closed() ||uip_aborted() ||uip_timedout()) { + if (uip_closed() ||uip_aborted() ||uip_timedout()) { closed(sockfd); return; } - if(uip_acked()) { + if (uip_acked()) { acked(sockfd); } - if(uip_newdata()) { + if (uip_newdata()) { newdata(sockfd); } - if(uip_rexmit() || - uip_newdata() || - uip_acked() || - uip_connected() || - uip_poll()) { - senddata(sockfd); + if (uip_rexmit() || + uip_newdata() || + uip_acked() || + uip_connected() || + uip_poll()) { + send_to_driver(sockfd); } } -int Packet_Received(struct NE2K_Packet_Info * info, uchar_t * pkt) { - int i; - + +static 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); - } + // for (i = 0; i < info->size; i++) { + // uip_buf[i] = *(pkt + i); + //} + + PrintBoth("Packet REceived\n"); + + memcpy(uip_buf, pkt, uip_len); + Free(pkt); if (BUF->type == htons(UIP_ETHTYPE_ARP)) { + PrintBoth("ARP PACKET\n"); + uip_arp_arpin(); + if (uip_len > 0) { + PrintBoth("Transmitting\n"); NE2K_Transmit(uip_len); - } + } + } else { - + PrintBoth("Data PACKET\n"); uip_arp_ipin(); uip_input(); + if (uip_len > 0) { + PrintBoth("Transmitting\n"); uip_arp_out(); NE2K_Transmit(uip_len); } - } + + } + return 0; }