Updated API for uiplib and resolv to use uip_ipaddr_t instead of uint16_t for compability with IPv6

This commit is contained in:
nifi 2010-05-31 15:22:08 +00:00
parent c13bb8666b
commit b54c6e673b
22 changed files with 194 additions and 106 deletions

View file

@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
* $Id: www.c,v 1.12 2010/02/13 10:39:57 oliverschmidt Exp $
* $Id: www.c,v 1.13 2010/05/31 15:22:08 nifi Exp $
*
*/
@ -258,7 +258,7 @@ open_url(void)
static char host[32];
char *file;
register char *urlptr;
static u16_t addr[2];
static uip_ipaddr_t addr;
/* Trim off any spaces in the end of the url. */
urlptr = url + strlen(url) - 1;
@ -312,7 +312,7 @@ open_url(void)
#if UIP_UDP
/* Try to lookup the hostname. If it fails, we initiate a hostname
lookup and print out an informative message on the statusbar. */
if(uiplib_ipaddrconv(host, (unsigned char *)addr) == 0) {
if(uiplib_ipaddrconv(host, &addr) == 0) {
if(resolv_lookup(host) == NULL) {
resolv_query(host);
show_statustext("Resolving host...");
@ -320,7 +320,7 @@ open_url(void)
}
}
#else /* UIP_UDP */
uiplib_ipaddrconv(host, (unsigned char *)addr);
uiplib_ipaddrconv(host, &addr);
#endif /* UIP_UDP */
/* The hostname we present in the hostname table, so we send out the