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

fixed slip stuffing bug when sending over prefix to border router

Browse source
This commit is contained in:
joxe 2010-11-29 18:14:54 +00:00
parent 33ebdab053
commit bc8513d4d6
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/tunslip6.c
View file

@ -29,7 +29,7 @@
* *
* This file is part of the uIP TCP/IP stack. * This file is part of the uIP TCP/IP stack.
* *
* $Id: tunslip6.c,v 1.5 2010/07/30 20:44:24 dak664 Exp $ * $Id: tunslip6.c,v 1.6 2010/11/29 18:14:54 joxe Exp $
* *
*/ */
@ -67,6 +67,7 @@ int ssystem(const char *fmt, ...)
void write_to_serial(int outfd, void *inbuf, int len); void write_to_serial(int outfd, void *inbuf, int len);
void slip_send(int fd, unsigned char c); void slip_send(int fd, unsigned char c);
void slip_send_char(int fd, unsigned char c);
//#define PROGRESS(s) fprintf(stderr, s) //#define PROGRESS(s) fprintf(stderr, s)
#define PROGRESS(s) do { } while (0) #define PROGRESS(s) do { } while (0)
@ -229,7 +230,8 @@ serial_to_tun(FILE *inslip, int outfd)
slip_send(slipfd, '!'); slip_send(slipfd, '!');
slip_send(slipfd, 'P'); slip_send(slipfd, 'P');
for(i = 0; i < 8; i++) { for(i = 0; i < 8; i++) {
slip_send(slipfd, addr.s6_addr[i]); /* need to call the slip_send_char for stuffing */
slip_send_char(slipfd, addr.s6_addr[i]);
} }
slip_send(slipfd, SLIP_END); slip_send(slipfd, SLIP_END);
} }
@ -312,6 +314,24 @@ serial_to_tun(FILE *inslip, int outfd)
unsigned char slip_buf[2000]; unsigned char slip_buf[2000];
int slip_end, slip_begin; int slip_end, slip_begin;
void
slip_send_char(int fd, unsigned char c)
{
switch(c) {
case SLIP_END:
slip_send(fd, SLIP_ESC);
slip_send(fd, SLIP_ESC_END);
break;
case SLIP_ESC:
slip_send(fd, SLIP_ESC);
slip_send(fd, SLIP_ESC_ESC);
break;
default:
slip_send(fd, c);
break;
}
}
void void
slip_send(int fd, unsigned char c) slip_send(int fd, unsigned char c)
{ {