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

tapdev: Log to stderr; add tracing

Browse source 
Use stderr for logging to avoid polluting stdout.
Add some DEBUG tracing.
This commit is contained in:
François Revol 2012-11-12 23:13:07 +01:00
parent 877b059bc7
commit 22bcb07c61
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cpu/native/net/tapdev.c
View file

@ -69,6 +69,13 @@ static unsigned long lasttime;
#define BUF ((struct uip_eth_hdr *)&uip_buf[0]) #define BUF ((struct uip_eth_hdr *)&uip_buf[0])
#define DEBUG 0
#if DEBUG
#define PRINTF(...) fprintf(stderr, __VA_ARGS__)
#else
#define PRINTF(...)
#endif
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int
tapdev_fd(void) tapdev_fd(void)
@ -83,7 +90,7 @@ remove_route(void)
char buf[1024]; char buf[1024];
snprintf(buf, sizeof(buf), "route delete -net 172.18.0.0"); snprintf(buf, sizeof(buf), "route delete -net 172.18.0.0");
system(buf); system(buf);
printf("%s\n", buf); fprintf(stderr, "%s\n", buf);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -112,7 +119,7 @@ tapdev_init(void)
snprintf(buf, sizeof(buf), "ifconfig tap0 inet 172.18.0.1/16"); snprintf(buf, sizeof(buf), "ifconfig tap0 inet 172.18.0.1/16");
system(buf); system(buf);
printf("%s\n", buf); fprintf(stderr, "%s\n", buf);
#ifdef linux #ifdef linux
/* route add for linux */ /* route add for linux */
snprintf(buf, sizeof(buf), "route add -net 172.18.0.0/16 dev tap0"); snprintf(buf, sizeof(buf), "route add -net 172.18.0.0/16 dev tap0");
@ -122,7 +129,7 @@ tapdev_init(void)
#endif /* linux */ #endif /* linux */
system(buf); system(buf);
printf("%s\n", buf); fprintf(stderr, "%s\n", buf);
atexit(remove_route); atexit(remove_route);
lasttime = 0; lasttime = 0;
@ -149,6 +156,7 @@ tapdev_poll(void)
return 0; return 0;
} }
ret = read(fd, uip_buf, UIP_BUFSIZE); ret = read(fd, uip_buf, UIP_BUFSIZE);
PRINTF("tapdev_poll: read %d bytes\n", ret);
if(ret == -1) { if(ret == -1) {
perror("tapdev_poll: read"); perror("tapdev_poll: read");
@ -171,11 +179,12 @@ tapdev_send(void)
#if DROP #if DROP
drop++; drop++;
if(drop % 8 == 7) { if(drop % 8 == 7) {
printf("Dropped an output packet!\n"); fprintf(stderr, "Dropped an output packet!\n");
return; return;
} }
#endif /* DROP */ #endif /* DROP */
PRINTF("tapdev_send: sending %d bytes\n", uip_len);
ret = write(fd, uip_buf, uip_len); ret = write(fd, uip_buf, uip_len);
if(ret == -1) { if(ret == -1) {