Add higher baud rates, fix occasional buffer overflow

This commit is contained in:
David Kopf 2011-07-10 10:23:45 -04:00
parent 4cf9514aa9
commit c699ccbe30

View file

@ -283,7 +283,7 @@ is_sensible_string(const unsigned char *s, int len)
void void
serial_to_wpcap(FILE *inslip) serial_to_wpcap(FILE *inslip)
{ {
u16_t buf_aligned[BUF_SIZE/2]; u16_t buf_aligned[BUF_SIZE/2 + 42]; //extra for possible eth_hdr and ip_process expansion
u8_t *buf = (u8_t *)buf_aligned; u8_t *buf = (u8_t *)buf_aligned;
static int inbufptr = 0; static int inbufptr = 0;
@ -1120,6 +1120,15 @@ main(int argc, char **argv)
case 115200: case 115200:
b_rate = B115200; b_rate = B115200;
break; break;
case 230400:
b_rate = B230400;
break;
case 460800:
b_rate = B460800;
break;
case 921600:
b_rate = B921600;
break;
default: default:
err(1, "unknown baudrate %d", baudrate); err(1, "unknown baudrate %d", baudrate);
break; break;