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

Fixed the repressentation of IP addresses: IP addresses are uip_ipaddr_t nowadays

Browse source
This commit is contained in:
adamdunkels 2008-11-28 00:14:57 +00:00
parent 589a03b0e5
commit 3713d1fcf9
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/irc/irc.c
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: irc.c,v 1.9 2008/11/06 20:48:08 oliverschmidt Exp $ * $Id: irc.c,v 1.10 2008/11/28 00:14:57 adamdunkels Exp $
*/ */
#include <string.h> #include <string.h>
@ -79,7 +79,7 @@ static struct ctk_window setupwindow;
#define SETUPWINDOW_HEIGHT 9 #define SETUPWINDOW_HEIGHT 9
#define MAX_SERVERLEN 32 #define MAX_SERVERLEN 32
#define MAX_NICKLEN 16 #define MAX_NICKLEN 16
static u16_t serveraddr[2]; static uip_ipaddr_t serveraddr;
static char server[MAX_SERVERLEN + 1]; static char server[MAX_SERVERLEN + 1];
static char nick[MAX_NICKLEN + 1]; static char nick[MAX_NICKLEN + 1];
static struct ctk_label serverlabel = static struct ctk_label serverlabel =
@ -200,7 +200,7 @@ ircc_sent(struct ircc_state *s)
PROCESS_THREAD(irc_process, ev, data) PROCESS_THREAD(irc_process, ev, data)
{ {
ctk_arch_key_t c; ctk_arch_key_t c;
u16_t *ipaddr; uip_ipaddr_t *ipaddr;
PROCESS_BEGIN(); PROCESS_BEGIN();
@ -244,14 +244,14 @@ PROCESS_THREAD(irc_process, ev, data)
} else if(data == (process_data_t)&connectbutton) { } else if(data == (process_data_t)&connectbutton) {
ctk_window_close(&setupwindow); ctk_window_close(&setupwindow);
ctk_window_open(&window); ctk_window_open(&window);
ipaddr = serveraddr; ipaddr = &serveraddr;
#if UIP_UDP #if UIP_UDP
if(uiplib_ipaddrconv(server, (u8_t *)serveraddr) == 0) { if(uiplib_ipaddrconv(server, (u8_t *)&serveraddr) == 0) {
ipaddr = resolv_lookup(server); ipaddr = (uip_ipaddr_t *)resolv_lookup(server);
if(ipaddr == NULL) { if(ipaddr == NULL) {
resolv_query(server); resolv_query(server);
} else { } else {
uip_ipaddr_copy(serveraddr, ipaddr); uip_ipaddr_copy(&serveraddr, ipaddr);
} }
} }
#else /* UIP_UDP */ #else /* UIP_UDP */
@ -259,18 +259,18 @@ PROCESS_THREAD(irc_process, ev, data)
#endif /* UIP_UDP */ #endif /* UIP_UDP */
if(ipaddr != NULL) { if(ipaddr != NULL) {
ircc_connect(&s, server, serveraddr, nick); ircc_connect(&s, server, &serveraddr, nick);
} }
} }
#if UIP_UDP #if UIP_UDP
} else if(ev == resolv_event_found) { } else if(ev == resolv_event_found) {
ipaddr = resolv_lookup(server); ipaddr = (uip_ipaddr_t *)resolv_lookup(server);
if(ipaddr == NULL) { if(ipaddr == NULL) {
ircc_text_output(&s, server, "hostname not found"); ircc_text_output(&s, server, "hostname not found");
} else { } else {
uip_ipaddr_copy(serveraddr, ipaddr); uip_ipaddr_copy(&serveraddr, ipaddr);
ircc_connect(&s, server, serveraddr, nick); ircc_connect(&s, server, &serveraddr, nick);
} }
#endif /* UIP_UDP */ #endif /* UIP_UDP */
} else if(ev == ctk_signal_keypress) { } else if(ev == ctk_signal_keypress) {

4
apps/irc/ircc.h
View file

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: ircc.h,v 1.1 2006/06/17 22:41:11 adamdunkels Exp $ * $Id: ircc.h,v 1.2 2008/11/28 00:14:57 adamdunkels Exp $
*/ */
#ifndef __IRCC_H__ #ifndef __IRCC_H__
#define __IRCC_H__ #define __IRCC_H__
@ -59,7 +59,7 @@ void ircc_init(void);
void ircc_appcall(void *s); void ircc_appcall(void *s);
struct ircc_state *ircc_connect(struct ircc_state *s, struct ircc_state *ircc_connect(struct ircc_state *s,
char *server, u16_t *ipaddr, char *nick); char *server, uip_ipaddr_t *ipaddr, char *nick);
void ircc_join(struct ircc_state *s, char *channel); void ircc_join(struct ircc_state *s, char *channel);
void ircc_part(struct ircc_state *s); void ircc_part(struct ircc_state *s);