commit 36377f367dde0ce31403f7349bae436e7f7f31e8
author uid93195 <uid93195> lun. févr. 16 21:27:17 2004 +0000
committer uid93195 <uid93195> lun. févr. 16 21:27:17 2004 +0000
tree a3089f3982561a432bfbff040a5aac637cf70a66
parent 7a67b79dcbe2f7320b2fa95c4ae7c18aba5b1463

Added ek_clock

contiki-gtk/contiki-main.c

diff --git a/contiki-gtk/contiki-main.c b/contiki-gtk/contiki-main.c
index 3a2ef40..eb4c65a 100644
--- a/contiki-gtk/contiki-main.c
+++ b/contiki-gtk/contiki-main.c
@@ -32,7 +32,7 @@
  *
  * This file is part of the Contiki desktop environment 
  *
- * $Id: contiki-main.c,v 1.9 2003/09/04 19:19:36 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.10 2004/02/16 21:27:17 uid93195 Exp $
  *
  */
 
@@ -94,13 +94,13 @@
 
   
   uip_init();
-  resolv_init();
+  resolv_init(NULL);
 
   /* XXX: just for making it easier to test. */
-  uip_ipaddr(addr, 192,168,1,2);
+  uip_ipaddr(addr, 192,168,2,2);
   uip_sethostaddr(addr);
 
-  uip_ipaddr(addr, 192,168,1,1);
+  uip_ipaddr(addr, 192,168,2,1);
   uip_setdraddr(addr);
 
   uip_ipaddr(addr, 255,255,255,0);
@@ -144,6 +144,9 @@
   
   /*  ctk_redraw();*/
  /* maze_init();*/
+
+  telnetd_init();
+  webserver_init();
   gtk_main();
     
   return 0;
@@ -152,3 +155,16 @@
   argc = argc;
 }
 /*-----------------------------------------------------------------------------------*/
+#include <sys/time.h>
+ 
+ek_clock_t
+ek_clock(void)
+{
+  struct timeval tv;
+  struct timezone tz;
+   
+  gettimeofday(&tv, &tz);
+ 
+  return tv.tv_sec * 1000 + tv.tv_usec / 1000;
+}
+/*-----------------------------------------------------------------------------------*/