sven
/
can-utils
mirror of https://github.com/linux-can/can-utils.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

slcanpty: Add support for the Unix 98 pseudo-terminal interface 

Most Linux distributions do not configure their kernels to use the BSD
pseudo-terminal interface (/dev/pty* and /dev/tty*) anymore; they uses the
Unix 98 pseudo-terminal interface instead (/dev/ptmx and /dev/pts/*).

http://www.kernel.org/doc/man-pages/online/pages/man4/pts.4.html

This change follows the slcan_attach changes:
http://sourceforge.net/tracker/index.php?func=detail&aid=3467521&group_id=146269&atid=764681

Signed-off-by: Ulrich Escher<git@myvdr.de>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
pull/7/head
Oliver Hartkopp 2012-12-20 11:37:43 +01:00
parent ddef031408
commit 221794dbe8
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
slcanpty.c
View File

@ -22,6 +22,9 @@
* *
*/ */
/* To get ptsname grantpt and unlockpt definitions from stdlib.h */
#define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -40,6 +43,7 @@
/* maximum rx buffer len: extended CAN frame with timestamp */ /* maximum rx buffer len: extended CAN frame with timestamp */
#define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1) #define SLC_MTU (sizeof("T1111222281122334455667788EA5F\r")+1)
#define DEVICE_NAME_PTMX "/dev/ptmx"
#define DEBUG #define DEBUG
@ -383,6 +387,8 @@ int main(int argc, char **argv)
fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]); fprintf(stderr, "Usage: %s <pty> <can interface>\n", argv[0]);
fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates" fprintf(stderr, "e.g. '%s /dev/ptyc0 can0' creates"
" /dev/ttyc0 for the slcan application\n", argv[0]); " /dev/ttyc0 for the slcan application\n", argv[0]);
fprintf(stderr, "e.g. for pseudo-terminal '%s %s can0' creates"
" /dev/pts/N\n", argv[0], DEVICE_NAME_PTMX);
fprintf(stderr, "\n"); fprintf(stderr, "\n");
return 1; return 1;
} }
@ -404,6 +410,29 @@ int main(int argc, char **argv)
ECHONL | ECHOPRT | ECHOKE | ICRNL); ECHONL | ECHOPRT | ECHOKE | ICRNL);
tcsetattr(p, TCSANOW, &topts); tcsetattr(p, TCSANOW, &topts);
/* Support for the Unix 98 pseudo-terminal interface /dev/ptmx /dev/pts/N */
if (strcmp(argv[1], DEVICE_NAME_PTMX) == 0) {
char *name_pts = NULL; /* slave pseudo-terminal device name */
if (grantpt(p) < 0) {
perror("grantpt");
return 1;
}
if (unlockpt(p) < 0) {
perror("unlockpt");
return 1;
}
name_pts = ptsname(p);
if (name_pts == NULL) {
perror("ptsname");
return 1;
}
printf("open: %s: slave pseudo-terminal is %s\n", argv[1], name_pts);
}
/* open socket */ /* open socket */
s = socket(PF_CAN, SOCK_RAW, CAN_RAW); s = socket(PF_CAN, SOCK_RAW, CAN_RAW);
if (s < 0) { if (s < 0) {