Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


one of these days I'll commit without breaking the build...
[palacios.git] / palacios / src / geekos / socket.c
index 0301b93..63b3ce1 100644 (file)
@@ -1,3 +1,7 @@
+/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
+/* (c) 2008, Lei Xia <xiaxlei@gmail.com> */
+/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+
 #include <geekos/socket.h>
 #include <geekos/malloc.h>
 #include <geekos/ne2k.h>
@@ -26,7 +30,7 @@ void socket_appcall(void);
 static int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt);
 static void periodic_caller(int timer_id);
 
-void init_network() {
+void init_socket_layer() {
    int i = 0;
    bool iflag;
 
@@ -149,7 +153,7 @@ int connect(const uchar_t ip_addr[4], ushort_t port) {
 
 
   PrintBoth("Connection start\n");
-  Wait(&(sock->recv_wait_queue));
+  Wait(&(sockets[sockfd].recv_wait_queue));
   
     
   PrintBoth("Connected\n");