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

More uip_ipaddr_t fixes (and avoid compiler warning).

Browse source
This commit is contained in:
oliverschmidt 2006-08-21 21:37:37 +00:00
parent 5c83d00fb4
commit df0bcd5555
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/ftp/ftpc.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: ftpc.c,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $ * $Id: ftpc.c,v 1.2 2006/08/21 21:37:37 oliverschmidt Exp $
*/ */
#include "contiki.h" #include "contiki.h"
#include "ftpc.h" #include "ftpc.h"
@ -143,7 +143,7 @@ ftpc_connect(u16_t *ipaddr, u16_t port)
c->dataconn.port = DATAPORT; c->dataconn.port = DATAPORT;
tcp_listen(HTONS(DATAPORT)); tcp_listen(HTONS(DATAPORT));
if(tcp_connect(ipaddr, port, c) == NULL) { if(tcp_connect((uip_ipaddr_t *)ipaddr, port, c) == NULL) {
memb_free(&connections, c); memb_free(&connections, c);
return NULL; return NULL;
} }
@ -273,29 +273,29 @@ senddata(struct ftp_connection *c)
case STATE_SEND_USER: case STATE_SEND_USER:
strcpy(uip_appdata, "USER "); strcpy(uip_appdata, "USER ");
strncpy((char *)uip_appdata + 5, ftpc_username(), uip_mss() - 7); strncpy((char *)uip_appdata + 5, ftpc_username(), uip_mss() - 7);
len = strlen(ftpc_username()); len = (u16_t)strlen(ftpc_username());
strcpy((char *)uip_appdata + 5 + len, "\r\n"); strcpy((char *)uip_appdata + 5 + len, "\r\n");
uip_send(uip_appdata, len + 2 + 5); uip_send(uip_appdata, len + 2 + 5);
break; break;
case STATE_SEND_PASS: case STATE_SEND_PASS:
strcpy(uip_appdata, "PASS "); strcpy(uip_appdata, "PASS ");
strncpy((char *)uip_appdata + 5, ftpc_password(), uip_mss() - 7); strncpy((char *)uip_appdata + 5, ftpc_password(), uip_mss() - 7);
len = strlen(ftpc_password()); len = (u16_t)strlen(ftpc_password());
strcpy((char *)uip_appdata + 5 + len, "\r\n"); strcpy((char *)uip_appdata + 5 + len, "\r\n");
uip_send(uip_appdata, len + 2 + 5); uip_send(uip_appdata, len + 2 + 5);
break; break;
case STATE_SEND_PORT: case STATE_SEND_PORT:
len = sprintf(uip_appdata, "PORT %d,%d,%d,%d,%d,%d\n", len = sprintf(uip_appdata, "PORT %d,%d,%d,%d,%d,%d\n",
uip_ipaddr1(uip_hostaddr), uip_ipaddr1(&uip_hostaddr),
uip_ipaddr2(uip_hostaddr), uip_ipaddr2(&uip_hostaddr),
uip_ipaddr3(uip_hostaddr), uip_ipaddr3(&uip_hostaddr),
uip_ipaddr4(uip_hostaddr), uip_ipaddr4(&uip_hostaddr),
(c->dataconn.port) >> 8, (c->dataconn.port) >> 8,
(c->dataconn.port) & 0xff); (c->dataconn.port) & 0xff);
uip_send(uip_appdata, len); uip_send(uip_appdata, len);
break; break;
case STATE_SEND_OPTIONS: case STATE_SEND_OPTIONS:
len = strlen(options.commands[c->optionsptr]); len = (u16_t)strlen(options.commands[c->optionsptr]);
uip_send(options.commands[c->optionsptr], len); uip_send(options.commands[c->optionsptr], len);
break; break;
case STATE_SEND_NLST: case STATE_SEND_NLST: