Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions canutils/slcan/slcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ static int caninit(char *candev, int *s, struct sockaddr_can *addr,
syslog(LOG_ERR, "Error opening CAN socket\n");
return -1;
}
strncpy(ifr.ifr_name, candev, 4);
ifr.ifr_name[4] = '\0';
strlcpy(ifr.ifr_name, candev, IFNAMSIZ);
Comment thread
xiaoxiang781216 marked this conversation as resolved.
ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name);
if (!ifr.ifr_ifindex)
{
Expand Down Expand Up @@ -317,9 +316,22 @@ int main(int argc, char *argv[])
{
/* open CAN interface */

mode = 1;
debug_print("Open interface\n");
ok_return(fd);
struct ifreq ifr;

strlcpy(ifr.ifr_name, argv[1], IFNAMSIZ);

Comment thread
xiaoxiang781216 marked this conversation as resolved.
ifr.ifr_flags = IFF_UP;
if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0)
{
syslog(LOG_ERR, "Open interface failed\n");
fail_return(fd);
}
else
{
mode = 1;
debug_print("Open interface\n");
ok_return(fd);
}
}
else if (buf[0] == 'S')
{
Expand Down Expand Up @@ -395,9 +407,22 @@ int main(int argc, char *argv[])
{
/* close interface */

mode = 0;
debug_print("Close interface\n");
ok_return(fd);
struct ifreq ifr;

strlcpy(ifr.ifr_name, argv[1], IFNAMSIZ);

ifr.ifr_flags = 0;
if (ioctl(s, SIOCSIFFLAGS, &ifr) < 0)
{
syslog(LOG_ERR, "Close interface failed\n");
fail_return(fd);
}
else
{
mode = 0;
debug_print("Close interface\n");
ok_return(fd);
}
}
else if (buf[0] == 'T')
{
Expand Down