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

Merge remote-tracking branch 'sf/master' into rpl-patch

Browse source 
Conflicts:
	core/net/tcpip.c
This commit is contained in:
Nicolas Tsiftes 2011-12-08 15:26:11 +01:00
commit d0ebeb409e
117 changed files with 8260 additions and 6932 deletions
Download patch file Download diff file Expand all files Collapse all files

4
examples/ipv6/rpl-udp/udp-client.c
View file

@ -161,6 +161,10 @@ PROCESS_THREAD(udp_client_process, ev, data)
/* new connection with remote host */
client_conn = udp_new(NULL, UIP_HTONS(UDP_SERVER_PORT), NULL);
if(client_conn == NULL) {
PRINTF("No UDP connection available, exiting the process!\n");
PROCESS_EXIT();
}
udp_bind(client_conn, UIP_HTONS(UDP_CLIENT_PORT));
PRINTF("Created a connection with the server ");

4
examples/ipv6/rpl-udp/udp-server.c
View file

@ -151,6 +151,10 @@ PROCESS_THREAD(udp_server_process, ev, data)
NETSTACK_MAC.off(1);
server_conn = udp_new(NULL, UIP_HTONS(UDP_CLIENT_PORT), NULL);
if(server_conn == NULL) {
PRINTF("No UDP connection available, exiting the process!\n");
PROCESS_EXIT();
}
udp_bind(server_conn, UIP_HTONS(UDP_SERVER_PORT));
PRINTF("Created a server connection with remote address ");