Skip to content

Commit

Permalink
Increase fixed filename sizes in SLIP tunnels
Browse files Browse the repository at this point in the history
Long serial port names like
  /dev/serial/by-id/usb-FTDI_FT230X_Basic_UART_DN0038W8-if00-port0
cause crashes.  This is the simplest fix to avoid the problem.
  • Loading branch information
jimparis committed Jul 8, 2014
1 parent b5f37e8 commit 21b78de
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions tools/tapslip6.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void write_to_serial(int outfd, void *inbuf, int len);

#define USAGE_STRING "usage: tapslip6 [-B baudrate] [-s siodev] [-t tundev] ipaddress netmask"

char tundev[32] = { "tap0" };
char tundev[1024] = { "tap0" };

int
ssystem(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2)));
Expand Down Expand Up @@ -360,7 +360,7 @@ stty_telos(int fd)
int
devopen(const char *dev, int flags)
{
char t[32];
char t[1024];
strcpy(t, "/dev/");
strcat(t, dev);
return open(t, flags);
Expand Down
4 changes: 2 additions & 2 deletions tools/tunslip.c
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ in_addr_t giaddr;
in_addr_t netaddr;
in_addr_t circuit_addr;

char tundev[32] = { "tun0" };
char tundev[1024] = { "tun0" };

struct sockaddr_in dhaddr;
int dhsock = -1;
Expand Down Expand Up @@ -747,7 +747,7 @@ stty_telos(int fd)
int
devopen(const char *dev, int flags)
{
char t[32];
char t[1024];
strcpy(t, "/dev/");
strcat(t, dev);
return open(t, flags);
Expand Down
4 changes: 2 additions & 2 deletions tools/tunslip6.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void slip_send_char(int fd, unsigned char c);
//#define PROGRESS(s) fprintf(stderr, s)
#define PROGRESS(s) do { } while (0)

char tundev[32] = { "" };
char tundev[1024] = { "" };

int
ssystem(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2)));
Expand Down Expand Up @@ -497,7 +497,7 @@ stty_telos(int fd)
int
devopen(const char *dev, int flags)
{
char t[32];
char t[1024];
strcpy(t, "/dev/");
strncat(t, dev, sizeof(t) - 5);
return open(t, flags);
Expand Down

0 comments on commit 21b78de

Please sign in to comment.