From b943e73b9b41e47c339a4999527df1456efc1c20 Mon Sep 17 00:00:00 2001 From: oliverschmidt Date: Fri, 15 Oct 2010 21:14:18 +0000 Subject: [PATCH] Made default IP config identical to minimal-net and log the IP config similar to minimal-net. --- platform/win32/contiki-main.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c index 1fb66d976..6d9433d1a 100644 --- a/platform/win32/contiki-main.c +++ b/platform/win32/contiki-main.c @@ -30,13 +30,18 @@ * * Author: Oliver Schmidt * - * $Id: contiki-main.c,v 1.17 2008/02/10 22:48:17 oliverschmidt Exp $ + * $Id: contiki-main.c,v 1.18 2010/10/15 21:14:18 oliverschmidt Exp $ */ #define WIN32_LEAN_AND_MEAN #include +#include #include +/* Avoid 'conflicting types' errors. */ +#define htonl +#define htons + #include "contiki-net.h" #include "sys/clock.h" @@ -102,17 +107,21 @@ main(void) #if 1 { uip_ipaddr_t addr; - uip_ipaddr(&addr, 192,168,0,222); + uip_ipaddr(&addr, 10,1,1,1); uip_sethostaddr(&addr); + log_message("IP Address: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 255,255,255,0); + uip_ipaddr(&addr, 255,0,0,0); uip_setnetmask(&addr); + log_message("Subnet Mask: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 192,168,0,1); + uip_ipaddr(&addr, 10,1,1,100); uip_setdraddr(&addr); + log_message("Def. Router: ", inet_ntoa(*(struct in_addr*)&addr)); - uip_ipaddr(&addr, 192,168,0,1); + uip_ipaddr(&addr, 10,1,1,100); resolv_conf(&addr); + log_message("DNS Server: ", inet_ntoa(*(struct in_addr*)&addr)); } #endif