added new copyright and license

[palacios.git] / palacios / src / geekos / socket.c

diff --git a/palacios/src/geekos/socket.c b/palacios/src/geekos/socket.c
index 63b3ce1..f042064 100644 (file)
--- a/palacios/src/geekos/socket.c
+++ b/palacios/src/geekos/socket.c
@@ -1,6 +1,23 @@
-/* (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> */
-/* (c) 2008, Lei Xia <xiaxlei@gmail.com> */
-/* (c) 2008, The V3VEE Project <http://www.v3vee.org> */
+/*
+ * This file is part of the Palacios Virtual Machine Monitor developed
+ * by the V3VEE Project with funding from the United States National 
+ * Science Foundation and the Department of Energy.  
+ *
+ * The V3VEE Project is a joint project between Northwestern University
+ * and the University of New Mexico.  You can find out more at 
+ * http://www.v3vee.org
+ *
+ * Copyright (c) 2008, Jack Lange <jarusl@cs.northwestern.edu> 
+ * Copyright (c) 2008, Lei Xia <xiaxlei@gmail.com>
+ * Copyright (c) 2008, The V3VEE Project <http://www.v3vee.org> 
+ * All rights reserved.
+ *
+ * Author: Jack Lange <jarusl@cs.northwestern.edu>
+ * Author: Lei Xia <xiaxlei@gmail.com>
+ *
+ * This is free software.  You are permitted to use,
+ * redistribute, and modify it as specified in the file "V3VEE_LICENSE".
+ */
 
 #include <geekos/socket.h>
 #include <geekos/malloc.h>
@@ -28,7 +45,7 @@ void socket_appcall(void);
 
 
 static int Packet_Received(struct NE2K_Packet_Info* info, uchar_t *pkt);
-static void periodic_caller(int timer_id);
+static void periodic_caller(int timer_id, void * arg);
 
 void init_socket_layer() {
    int i = 0;
@@ -52,7 +69,7 @@ void init_socket_layer() {
     Init_Ne2k(&Packet_Received);
 
     iflag = Begin_Int_Atomic();
-    Start_Timer(2, periodic_caller);
+    Start_Timer(2, periodic_caller, NULL);
     End_Int_Atomic(iflag);
 
 }
@@ -108,7 +125,7 @@ struct socket * get_socket_from_fd(int fd) {
 
 
 
-static void periodic_caller(int timer_id) {
+static void periodic_caller(int timer_id, void * arg) {
   int i;
   //handle the periodic calls of uIP