deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
apps/telnet/simpletelnet.c
View file

@ -29,7 +29,7 @@
*
* This file is part of the Contiki desktop environment
*
* $Id: simpletelnet.c,v 1.5 2008/02/08 22:52:43 oliverschmidt Exp $
* $Id: simpletelnet.c,v 1.6 2010/05/31 15:22:08 nifi Exp $
*
*/
@ -151,7 +151,7 @@ show(char *text)
static void
connect(void)
{
u16_t addr[2], *addrptr;
uip_ipaddr_t addr, *addrptr;
u16_t port;
char *cptr;
struct uip_conn *conn;
@ -161,9 +161,9 @@ connect(void)
for(cptr = telnethost; *cptr != ' ' && *cptr != 0; ++cptr);
*cptr = 0;
addrptr = &addr[0];
addrptr = &addr;
#if UIP_UDP
if(uiplib_ipaddrconv(telnethost, (unsigned char *)addr) == 0) {
if(uiplib_ipaddrconv(telnethost, &addr) == 0) {
addrptr = resolv_lookup(telnethost);
if(addrptr == NULL) {
resolv_query(telnethost);
@ -172,7 +172,7 @@ connect(void)
}
}
#else /* UIP_UDP */
uiplib_ipaddrconv(telnethost, (unsigned char *)addr);
uiplib_ipaddrconv(telnethost, &addr);
#endif /* UIP_UDP */
port = 0;
@ -185,7 +185,7 @@ connect(void)
}
conn = tcp_connect((uip_ipaddr_t *)addrptr, htons(port), &ts_appstate);
conn = tcp_connect(addrptr, htons(port), &ts_appstate);
if(conn == NULL) {
show("Out of memory error");
return;