ttynvt version 0.14

Patch by FRJ.

configure.ac

@@ -1,4 +1,4 @@
-m4_define([pkg_version],  [0.11])
+m4_define([pkg_version],  [0.14])
 #m4_define([pkg_revision], [005])
 m4_define([pkg_version],  m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version]))
 

telnet.h

@@ -31,7 +31,7 @@ extern tn_ctx_t *telnet_ctx_init(void *cctx, srv_tx_f * ftx, srv_rx_f * frx,
 
 extern int      telnet_open(tn_ctx_t * tcc);
 
-extern int      telnet_rx(tn_ctx_t * tcc, char *buf, size_t * plen);
+extern int      telnet_rx(tn_ctx_t * tcc, char *buf, int *plen);
 extern int      telnet_tx(tn_ctx_t * tcc, const char *buf, int len);
 
 extern void     telnet_set_opt(tn_ctx_t * tcc, int opt, int prm,
@@ -42,10 +42,10 @@ extern void     telnet_rfc2217_handle_opt(tn_ctx_t * tcc, int opt,
 
 extern void     telnet_rfc2217_cfg(tn_ctx_t * tcc, int cmd,
                                    const void *val, int nd);
-extern void     telnet_rfc2217_ctl(tn_ctx_t * tcc, int cmd);
+extern void     telnet_rfc2217_ctl(tn_ctx_t * tcc, unsigned int val);
 
 /*RFC2217 modem state*/
-#define TNS_STATE_CD     0x80
+#define TNS_STATE_DCD    0x80
 #define TNS_STATE_RI     0x40
 #define TNS_STATE_DSR    0x20
 #define TNS_STATE_CTS    0x10

telnet_basic.c

@@ -121,18 +121,18 @@ static void _telnet_handle_opt(tn_ctx_t * tcc, int opt,
     }
 }
 
-int telnet_rx(tn_ctx_t * tcc, char *buf, size_t * plen)
+int telnet_rx(tn_ctx_t * tcc, char *buf, int *plen)
 {
     char           *s, *p;
     unsigned char  *pu;
-    size_t          len, rem;
+    int             len, rem;
     int             np, nd;
     int             b1, b2;
 
     len = *plen;
     tcc->bytes_rx += len;
 
-    if (len < (size_t) tcc->off_rx)
+    if (len < (int)tcc->off_rx)
         tcc->off_rx = 0;
 
     for (s = buf + tcc->off_rx, rem = len - tcc->off_rx; rem > 0; s = p)

telnet_rfc2217.c

@@ -43,10 +43,12 @@ void telnet_rfc2217_cfg(tn_ctx_t * tcc, int cmd, const void *val, int nd)
     telnet_set_opt(tcc, TNO_CPCO, cmd, val, nd);
 }
 
-void telnet_rfc2217_ctl(tn_ctx_t * tcc, int cmd)
+void telnet_rfc2217_ctl(tn_ctx_t * tcc, unsigned int val)
 {
+    unsigned char byte = val;
+
     if (!tcc->mode_rfc2217)
         return;
 
-    telnet_set_opt(tcc, TNO_CPCO, TNS_SET_CONTROL, &cmd, 1);
+    telnet_set_opt(tcc, TNO_CPCO, TNS_SET_CONTROL, &byte, 1);
 }

ttynvt.c

@@ -24,6 +24,7 @@
 #include <sys/ioctl.h>
 #include <sys/poll.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <sys/types.h>
 
 #include "telnet.h"
@@ -32,8 +33,8 @@
 #define TMP_BUF_SIZE 1024
 
 #define FD_NET     0
-#define FD_SLAVE   1
-#define FD_MASTER  2
+#define FD_MASTER  1
+#define FD_SLAVE   2
 
 #define _PRF_N_(no) __attribute__((__format__(__printf__, (no), (no) + 1)))
 #define _PRF2_ _PRF_N_(2)
@@ -45,6 +46,7 @@ static struct ttynvt_param {
     const char     *dev_name;
     char           *server;
     unsigned int    debug;
+    int             logstd;
     /* Derived */
     char            host[64];
     unsigned int    port;
@@ -55,23 +57,29 @@ static struct ttynvt_param {
 typedef struct {
     pthread_mutex_t tty_lock;
     pthread_mutex_t poll_lock;
-    pthread_t       thread_id;
+    pthread_t       ptid_poll;
+    pthread_t       ptid_read;
 
     struct fuse_pollhandle *ph;
 
+    volatile int    rel_pending;
+    volatile int    slave_suspended;    /*waiting for application to read data */
+    volatile int    master_suspended;   /*server is not ready to receive data */
     struct pollfd   fds[3];
 
     char            net_buf[NET_BUF_SIZE];
-    size_t          net_cnt;
-    char            tmp_buf[TMP_BUF_SIZE];
+    int             net_cnt;
 
     struct termios  tio;
-    int             cmcr;
-    int             epipe;
 
-    volatile int    smcr;
-    volatile int    error;
+    int             cmcr;       /* Commanded by ioctl */
+    volatile int    smcr;       /* Status from modem */
+    int             smcr_last;
+
     volatile int    pollin;
+    volatile int    pollout;
+    volatile int    error;
+    int             epipe;
 
     tn_ctx_t       *tn;
 } ttynvt_t;
@@ -79,25 +87,82 @@ typedef struct {
 #include <sys/syscall.h>
 #define gettid() (pid_t)syscall(__NR_gettid)
 
+static const char *_hms_txt(char *buf, unsigned int len)
+{
+    struct timeval  tv;
+    unsigned int    sod, hh, mm, ss;
+
+    gettimeofday(&tv, NULL);
+
+    sod = tv.tv_sec % (24 * 3600);
+    hh = sod / 3600;
+    mm = (sod - hh * 3600) / 60;
+    ss = sod - hh * 3600 - mm * 60;
+    snprintf(buf, len, "%02d:%02d:%02d.%06d",
+             hh, mm, ss, (unsigned int)tv.tv_usec);
+
+    return buf;
+}
+
 _PRF2_ static void _log(int prio, const char *fmt, ...)
 {
     va_list         arg;
-    char            buf[256];
+    char            buf[256], buft[64];
 
     va_start(arg, fmt);
-#if 0
-    vsyslog(prio, fmt, arg);
-#else
     vsnprintf(buf, sizeof(buf), fmt, arg);
+
+    if (ttynvt_param.logstd)
+    {
+        printf("%s: [%d] %d: %s",
+               _hms_txt(buft, sizeof(buft)), gettid(), prio, buf);
+    }
+    else
+    {
         syslog(prio, "[%d] %s", gettid(), buf);
-#endif
+    }
+
     va_end(arg);
 }
 
+#define BPL 16                  /* Bytes per line */
+
+void _log_buf(int prio, const char *txt, const void *ptr_, unsigned int len)
+{
+    unsigned int    ix, i, imax;
+    int             l, n;
+    char            buf[128];
+    const unsigned char *ptr = ptr_;
+
+    for (ix = 0; ix < len || (len == 0 && ix == 0); ix += BPL)
+    {
+        n = snprintf(buf, sizeof(buf), "%s: %04x:", txt, ix);
+        if (n <= 0)
+            return;             /* Just playing it safe */
+        imax = (len - ix < BPL) ? len - ix : BPL;
+        for (i = 0; i < imax; i++)
+        {
+            l = snprintf(buf + n, sizeof(buf) - n, " %02x", *ptr++);
+            if (l <= 0)
+                return;         /* Just playing it safe */
+            n += l;
+        }
+        _log(prio, "%s\n", buf);
+    }
+}
+
 #define DBG(...) \
     if (ttynvt_param.debug > 0) _log(LOG_DEBUG, __VA_ARGS__)
 #define DBG2(...) \
     if (ttynvt_param.debug > 1) _log(LOG_DEBUG, __VA_ARGS__)
+#define DBG2_BUF(txt, ptr, len) \
+    if (ttynvt_param.debug > 1) _log_buf(LOG_DEBUG, txt, ptr, len)
+
+static void _fd_close(int fd)
+{
+    if (fd >= 0)
+        close(fd);
+}
 
 static volatile char _is_interrupted = 0;
 
@@ -105,6 +170,8 @@ static void sig_handler(int sig)
 {
     DBG("Interruped, signal = %d\n", sig);
     _is_interrupted = 1;
+    if (sig != SIGUSR2)
+        exit(0);
 }
 
 static void set_signal_handler(void)
@@ -116,6 +183,7 @@ static void set_signal_handler(void)
     sigemptyset(&(sa.sa_mask));
     sa.sa_flags = 0;
     sigaction(SIGUSR2, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
 }
 
 static void ttynvt_interrupted(fuse_req_t req, void *data)
@@ -147,12 +215,13 @@ static void ttynvt_release(fuse_req_t req, struct fuse_file_info *info)
 
     _log(LOG_INFO, "connection closed\n");
 
-    close(tty->fds[FD_NET].fd);
-    close(tty->fds[FD_MASTER].fd);
-    close(tty->fds[FD_SLAVE].fd);
+    tty->rel_pending = 1;
+    _fd_close(tty->fds[FD_NET].fd);
+    _fd_close(tty->fds[FD_MASTER].fd);
+    _fd_close(tty->fds[FD_SLAVE].fd);
 
-    pthread_cancel(tty->thread_id);
-    pthread_join(tty->thread_id, NULL);
+    pthread_cancel(tty->ptid_poll);
+    pthread_join(tty->ptid_poll, NULL);
     pthread_mutex_destroy(&tty->tty_lock);
     pthread_mutex_destroy(&tty->poll_lock);
 
@@ -187,68 +256,117 @@ static void _update_notify(ttynvt_t * tty, struct fuse_pollhandle *ph)
         fuse_pollhandle_destroy(tmp_ph);
 }
 
+static int _net_read_check_exit(ttynvt_t * tty)
+{
+    if ((tty->tio.c_cflag & CLOCAL) == 0 &&
+        (tty->smcr_last & TIOCM_CD) != 0 && (tty->smcr & TIOCM_CD) == 0)
+    {
+        /* CLOCAL is not set (i.e. do not ignore modem control lines) AND
+         * DCD dropped */
+        DBG("GOT DCD DROP\n");
+        close(tty->fds[FD_MASTER].fd);
+        tty->fds[FD_MASTER].fd = -1;
+        return 1;
+    }
+
+    return 0;
+}
+
 static void    *_read_net(void *arg)
 {
     ttynvt_t       *tty = (ttynvt_t *) arg;
-    ssize_t         res;
+    char            buf[TMP_BUF_SIZE];
+    int             res;
 
     pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+    DBG2("%s: net_cnt=%d\n", __func__, tty->net_cnt);
 
-    while (1)
+    while (!tty->rel_pending)
     {
+        tty->fds[FD_NET].revents = tty->fds[FD_MASTER].revents =
+            tty->fds[FD_SLAVE].revents = 0;
+        tty->fds[FD_SLAVE].events = tty->slave_suspended ? POLLPRI : POLLIN;
+        tty->fds[FD_MASTER].events = tty->master_suspended ? POLLPRI : POLLIN;
+
         res = poll(tty->fds, 3, -1);
+        DBG2("%s: res=%d events-N/M/S=%x:%x/%x:%x/%x:%x SS=%d MS=%d\n",
+             __func__, res, tty->fds[FD_NET].events, tty->fds[FD_NET].revents,
+             tty->fds[FD_MASTER].events, tty->fds[FD_MASTER].revents,
+             tty->fds[FD_SLAVE].events, tty->fds[FD_SLAVE].revents,
+             tty->slave_suspended, tty->master_suspended);
         if (res < 0)
         {
             if (errno == EINTR)
                 continue;
-            else
             break;
         }
+        if (tty->rel_pending)
+            break;
+
         if (tty->fds[FD_NET].revents & POLLIN)
         {
             res = read(tty->fds[FD_NET].fd, tty->net_buf + tty->net_cnt,
                        NET_BUF_SIZE - tty->net_cnt);
             if (res < 0)
             {
-                _log(LOG_ERR, "net read error: %s\n", strerror(errno));
+                _log(LOG_ERR, "net read error: %m\n");
                 break;
             }
-            else if (res == 0)
+            if (res == 0)
             {
                 _log(LOG_INFO, "Connection closed by remote host\n");
                 break;
             }
             tty->net_cnt += res;
+            DBG2_BUF("Serv in A", tty->net_buf, tty->net_cnt);
             res = telnet_rx(tty->tn, tty->net_buf, &tty->net_cnt);
+            DBG2_BUF("Serv in B", tty->net_buf, tty->net_cnt);
             if (tty->net_cnt > 0 && res == 0)
             {
+                DBG2_BUF("TtyM out ", tty->net_buf, tty->net_cnt);
                 res =
                     write(tty->fds[FD_MASTER].fd, tty->net_buf, tty->net_cnt);
                 if (res < 0)
                 {
-                    _log(LOG_ERR, "master write error:%s\n", strerror(errno));
+                    _log(LOG_ERR, "master write error: %m\n");
                     break;
                 }
                 tty->net_cnt = 0;
             }
-        }
-        if (tty->fds[FD_MASTER].revents & POLLIN)
-        {
-            res = read(tty->fds[FD_MASTER].fd, tty->tmp_buf, TMP_BUF_SIZE);
-            if (res < 0)
-            {
-                _log(LOG_ERR, "master read error:%s\n", strerror(errno));
+            if (_net_read_check_exit(tty))
                 break;
         }
-            telnet_tx(tty->tn, tty->tmp_buf, res);
+
+        if ((tty->fds[FD_MASTER].revents & POLLIN) && !tty->master_suspended)
+        {
+            res = read(tty->fds[FD_MASTER].fd, buf, TMP_BUF_SIZE);
+            DBG("%s: read res=%d pollout=%d\n", __func__, res, tty->pollout);
+            if (res < 0)
+            {
+                _log(LOG_ERR, "master read error: %m\n");
+                break;
             }
+            if (tty->pollout == 0)
+            {
+                tty->pollout = 1;
+                _notify(tty);
+            }
+            DBG2_BUF("TtyM in  ", buf, res);
+            telnet_tx(tty->tn, buf, res);
+        }
+
         if (tty->fds[FD_SLAVE].revents & POLLIN)
         {
             tty->pollin = 1;
+            tty->slave_suspended = 1;   /* Disable polling of Slave */
             _notify(tty);
         }
     }
 
+    DBG2("%s: done\n", __func__);
+    if (tty->ptid_read)
+        pthread_kill(tty->ptid_read, SIGUSR2);
+
     tty->error = 1;
     _notify(tty);
 
@@ -264,14 +382,14 @@ static int _srv_connect(const char *host, unsigned int port)
     sockfd = socket(AF_INET, SOCK_STREAM, 0);
     if (sockfd < 0)
     {
-        _log(LOG_ERR, "Socket open failed: %s\n", strerror(errno));
+        _log(LOG_ERR, "Socket open failed: %m\n");
         return sockfd;
     }
 
     server = gethostbyname(host);
     if (server == NULL)
     {
-        _log(LOG_ERR, "Cannot resolve host name: %s\n", strerror(errno));
+        _log(LOG_ERR, "Cannot resolve host name: %m\n");
         close(sockfd);
         return -1;
     }
@@ -285,8 +403,7 @@ static int _srv_connect(const char *host, unsigned int port)
     err = connect(sockfd, (struct sockaddr *)&serveraddr, sizeof(serveraddr));
     if (err < 0)
     {
-        _log(LOG_ERR, "Failed to connect to: %s:%u:%s\n",
-             host, port, strerror(errno));
+        _log(LOG_ERR, "Failed to connect to: %s:%u: %m\n", host, port);
         close(sockfd);
         return -1;
     }
@@ -299,8 +416,13 @@ static int _srv_write(void *cctx, const void *buf, int len)
     ttynvt_t       *tty = cctx;
     int             res;
 
+    DBG2_BUF("Serv out ", buf, len);
+
     res = write(tty->fds[FD_NET].fd, buf, len);
 
+    DBG2("%s: fd=%d: len=%u: res=%d\n", __func__,
+         tty->fds[FD_NET].fd, len, res);
+
     return res;
 }
 
@@ -309,9 +431,12 @@ static int _srv_read(void *cctx, int timeout)
     ttynvt_t       *tty = cctx;
     int             res;
 
+    DBG2("%s: net_cnt=%d\n", __func__, tty->net_cnt);
     while (1)
     {
         res = poll(&tty->fds[FD_NET], 1, timeout);
+        DBG("%s: res=%d events-N=%#x\n",
+            __func__, res, tty->fds[FD_NET].revents);
         if (res <= 0)
             return res;
 
@@ -319,10 +444,15 @@ static int _srv_read(void *cctx, int timeout)
         {
             res = read(tty->fds[FD_NET].fd, tty->net_buf + tty->net_cnt,
                        NET_BUF_SIZE - tty->net_cnt);
+            DBG2("%s: fd=%d: res=%d net_cnt=%d\n", __func__,
+                 tty->fds[FD_NET].fd, res, tty->net_cnt);
             if (res <= 0)
                 return res;
-            tty->net_cnt += (size_t) res;
+            tty->net_cnt += res;
+            DBG2_BUF("Serv in a", tty->net_buf, tty->net_cnt);
             res = telnet_rx(tty->tn, tty->net_buf, &tty->net_cnt);
+            DBG2_BUF("Serv in b", tty->net_buf, tty->net_cnt);
+            DBG2("%s: res=%d net_cnt=%d\n", __func__, res, tty->net_cnt);
             if (res == 0)
                 break;
         }
@@ -335,21 +465,25 @@ static void _modem_status_cb(void *cctx, int status)
     ttynvt_t       *tty = cctx;
     int             mcr = 0;
 
-    DBG("MCR: DSR=%c CTS=%c RI=%c CD=%c\n",
-        status & TNS_STATE_DSR ? '1' : '0',
-        status & TNS_STATE_CTS ? '1' : '0',
-        status & TNS_STATE_RI ? '1' : '0', status & TNS_STATE_CD ? '1' : '0');
+    DBG("MCR: CTS=%c DSR=%c RI=%c DCD=%c\n",
+        status & TNS_STATE_CTS ? '1' : '0', status & TNS_STATE_DSR ? '1' : '0',
+        status & TNS_STATE_RI ? '1' : '0', status & TNS_STATE_DCD ? '1' : '0');
 
-    if (status & TNS_STATE_CD)
+    if (status & TNS_STATE_DCD)
         mcr |= TIOCM_CD;
     if (status & TNS_STATE_RI)
         mcr |= TIOCM_RI;
-    if (status & TNS_STATE_CTS)
-        mcr |= TIOCM_CTS;
     if (status & TNS_STATE_DSR)
         mcr |= TIOCM_DSR;
+    if (status & TNS_STATE_CTS)
+        mcr |= TIOCM_CTS;
+
+    tty->master_suspended = (mcr & TIOCM_CTS) ? 0 : 1;
+    DBG("%s: tty=%p mcr=%x MS=%d\n", __func__, tty, mcr,
+        tty->master_suspended);
 
     pthread_mutex_lock(&tty->tty_lock);
+    tty->smcr_last = tty->smcr;
     tty->smcr = mcr;
     pthread_mutex_unlock(&tty->tty_lock);
 }
@@ -369,7 +503,7 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
     int             res;
     int             n;
 
-    DBG2("open: thread:%lu\n", pthread_self());
+    DBG("%s\n", __func__);
 
     tty = calloc(1, sizeof(*tty));
     if (!tty)
@@ -380,6 +514,8 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
     for (n = 0; n < 3; n++)
         tty->fds[n].fd = -1;
 
+    tty->pollout = 1;
+
     tty->tn = telnet_ctx_init(tty, _srv_write, _srv_read, _modem_status_cb);
     if (!tty->tn)
     {
@@ -407,6 +543,8 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
     tty->fds[FD_MASTER].fd = fd;
     tty->fds[FD_MASTER].events = POLLIN;
 
+    memset(&ios, 0, sizeof(ios));
+
     ios.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | ISTRIP
                      | INLCR | IGNCR | ICRNL | IXON);
     ios.c_oflag &= ~OPOST;
@@ -424,6 +562,11 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
     if ((fd = open(slave_name, O_RDWR | O_NOCTTY)) < 0) /* open slave */
         goto open_err;
 
+    ioctl(fd, TCGETS, &tty->tio);
+    tty->tio.c_cflag &= ~(CSIZE | PARENB);
+    tty->tio.c_cflag |= B115200 | CS8 | CREAD | CLOCAL;
+    ioctl(fd, TCSETS, &tty->tio);
+
     tty->fds[FD_SLAVE].fd = fd;
     tty->fds[FD_SLAVE].events = POLLIN;
 
@@ -435,7 +578,7 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
     }
     if ((res = pthread_mutex_init(&tty->tty_lock, NULL) < 0) ||
         (res = pthread_mutex_init(&tty->poll_lock, NULL) < 0) ||
-        (res = pthread_create(&tty->thread_id, NULL, &_read_net, tty)))
+        (res = pthread_create(&tty->ptid_poll, NULL, &_read_net, tty)))
     {
         errno = res;
         goto open_err;
@@ -454,12 +597,11 @@ static void ttynvt_open(fuse_req_t req, struct fuse_file_info *info)
 
   open_err:
 
-    _log(LOG_INFO, "Connection to server: %s:%d failed:%s\n",
-         ttynvt_param.host, ttynvt_param.port, strerror(errno));
+    _log(LOG_INFO, "Connection to server: %s:%d failed: %m\n",
+         ttynvt_param.host, ttynvt_param.port);
 
     for (n = 0; n < 3; n++)
-        if (tty->fds[n].fd >= 0)
-            close(tty->fds[n].fd);
+        _fd_close(tty->fds[n].fd);
 
     free(tty->tn);
     free(tty);
@@ -471,16 +613,19 @@ ttynvt_read(fuse_req_t req, size_t size, off_t off,
             struct fuse_file_info *info)
 {
     ttynvt_t       *tty = (ttynvt_t *) (uintptr_t) info->fh;
-    int             res;
+    char            buf[TMP_BUF_SIZE];
+    int             res, nr;
+
+    DBG2("%s\n", __func__);
 
     if (tty->error)
     {
-        DBG2("read (slave) in error state, thread:%lu\n", pthread_self());
+        DBG2("%s: tty->error=%d\n", __func__, tty->error);
         if (tty->epipe == 0)
         {
             _log(LOG_WARNING, "Rx EPIPE\n");
             tty->epipe = 1;
-            fuse_reply_buf(req, tty->tmp_buf, 0);
+            fuse_reply_buf(req, NULL, 0);
         }
         else
             fuse_reply_err(req, EBADFD);
@@ -491,21 +636,34 @@ ttynvt_read(fuse_req_t req, size_t size, off_t off,
     if (size > TMP_BUF_SIZE)
         size = TMP_BUF_SIZE;
 
-    fuse_req_interrupt_func(req, ttynvt_interrupted, (void *)pthread_self());
-    res =
-        _is_interrupted ? -2 : read(tty->fds[FD_SLAVE].fd, tty->tmp_buf, size);
+    tty->ptid_read = pthread_self();
+    fuse_req_interrupt_func(req, ttynvt_interrupted, (void *)tty->ptid_read);
+    res = _is_interrupted ? -2 : read(tty->fds[FD_SLAVE].fd, buf, size);
     _is_interrupted = 0;
+    tty->ptid_read = 0;
+    tty->slave_suspended = 0;   /* Enable polling of Slave */
     fuse_req_interrupt_func(req, NULL, NULL);
+    if (res < (int)size)
+    {
+        tty->pollin = 0;
+    }
+    else
+    {
+        nr = 0;
+        ioctl(tty->fds[FD_SLAVE].fd, FIONREAD, &nr);
+        tty->pollin = nr > 0;
+    }
     if (res < 0)
     {
-        DBG2("read (slave) error: %s\n", strerror(errno));
+        DBG2("%s: error: %m\n", __func__);
         fuse_reply_err(req, errno);
         return;
     }
 
-    DBG2("read (slave): size:%d, thread:%lu\n", res, pthread_self());
+    DBG2("%s: fd=%d: sz=%u/%u: '%.*s'\n", __func__,
+         tty->fds[FD_SLAVE].fd, res, (int)size, res, buf);
 
-    fuse_reply_buf(req, tty->tmp_buf, res);
+    fuse_reply_buf(req, buf, res);
 }
 
 static void
@@ -513,8 +671,10 @@ ttynvt_write(fuse_req_t req, const char *data, size_t size, off_t off,
              struct fuse_file_info *info)
 {
     ttynvt_t       *tty = (ttynvt_t *) (uintptr_t) info->fh;
-    ssize_t         res;
+    int             res;
 
+    DBG2("%s: fd=%d: sz=%u: '%.*s'\n", __func__,
+         tty->fds[FD_SLAVE].fd, (int)size, (int)size, data);
 
     if (size == 0)
     {
@@ -524,6 +684,7 @@ ttynvt_write(fuse_req_t req, const char *data, size_t size, off_t off,
 
     if (tty->error)
     {
+        DBG2("%s: tty->error=%d\n", __func__, tty->error);
         fuse_reply_err(req, EPIPE);
         return;
     }
@@ -531,13 +692,15 @@ ttynvt_write(fuse_req_t req, const char *data, size_t size, off_t off,
     res = write(tty->fds[FD_SLAVE].fd, data, size);
     if (res < 0)
     {
-        DBG2("write (slave) error: %s\n", strerror(errno));
+        DBG2("%s: error: %m\n", __func__);
         tty->error = 1;
         fuse_reply_err(req, errno);
         return;
     }
-
-    DBG2("write (slave): size:%d, thread:%lu\n", (int)size, pthread_self());
+    else if (res != (int)size)
+    {
+        tty->pollout = 0;
+    }
 
     fuse_reply_write(req, res);
 }
@@ -580,9 +743,6 @@ static const char *_ioctl_name(int cmd)
         CASE(TIOCINQ);
         CASE(TIOCOUTQ);
         CASE(TCFLSH);
-        CASE(TCIFLUSH);
-        CASE(TCOFLUSH);
-        CASE(TCIOFLUSH);
         CASE(TIOCMGET);
         CASE(TIOCMBIS);
         CASE(TIOCMBIC);
@@ -590,6 +750,9 @@ static const char *_ioctl_name(int cmd)
         CASE(TCSBRK);
         CASE(TIOCGWINSZ);
         CASE(TIOCSWINSZ);
+        /* Controlling terminal */
+        CASE(TIOCSCTTY);
+        CASE(TIOCNOTTY);
         /* Exclusive mode */
         CASE(TIOCEXCL);
         CASE(TIOCGEXCL);
@@ -602,6 +765,71 @@ static const char *_ioctl_name(int cmd)
     }
 }
 
+static unsigned int _tio_parity(const struct termios *tio)
+{
+    unsigned int    par;
+
+    if (tio->c_cflag & PARENB && tio->c_iflag & IGNPAR)
+        par = 1;
+#ifdef CMSPAR
+    else if (tio->c_cflag & PARENB && tio->c_iflag & CMSPAR)
+    {
+        if (tio->c_cflag & PARODD)
+            par = 4;
+        else
+            par = 5;
+    }
+#endif
+    else if (tio->c_cflag & PARENB)
+        par = 3;
+    else
+        par = 1;
+
+    return par;
+}
+
+static unsigned int _tio_baud(const struct termios *tio)
+{
+    return baudrate(tio->c_cflag & (CBAUD | CBAUDEX));
+}
+
+static unsigned int _tio_csize(const struct termios *tio)
+{
+    unsigned int    csize;
+
+    if ((tio->c_cflag & CSIZE) == CS5)
+        csize = 5;
+    else if ((tio->c_cflag & CSIZE) == CS6)
+        csize = 6;
+    else if ((tio->c_cflag & CSIZE) == CS7)
+        csize = 7;
+    else
+        csize = 8;
+
+    return csize;
+}
+
+static unsigned int _tio_stopb(const struct termios *tio)
+{
+    unsigned int    stopb;
+
+    if (tio->c_cflag & CSTOPB)
+        stopb = 2;
+    else
+        stopb = 1;
+
+    return stopb;
+}
+
+static void _show_termios(const char *txt, const struct termios *tio)
+{
+    DBG("%s: %u%c%u%u %cCTSRTS %cCREAD %cHUPCL %cCLOCAL\n", txt,
+        _tio_baud(tio), pstr[_tio_parity(tio)], _tio_csize(tio),
+        _tio_stopb(tio),
+        tio->c_cflag & CRTSCTS ? '+' : '-', tio->c_cflag & CREAD ? '+' : '-',
+        tio->c_cflag & HUPCL ? '+' : '-', tio->c_cflag & CLOCAL ? '+' : '-');
+}
+
 #define CHECK_BUF_IN(sz) \
     if (in_bufsz < sz)  do { in_bufsz  = sz; goto retry_in;  } while(0)
 #define CHECK_BUF_OUT(sz) \
@@ -613,14 +841,14 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
              const void *in_buf, size_t in_bufsz, size_t out_bufsz)
 {
     ttynvt_t       *tty = (ttynvt_t *) (uintptr_t) info->fh;
+    struct termios *tio = &tty->tio;
     struct winsize  ws;
     unsigned int    tiocm = 0;
     int             mcr;
-    static struct termios tio = {
-        .c_cflag = B115200 | CS8 | PARODD | CREAD | CLOCAL,
-    };
     int             val;
     int             res;
+    unsigned char   byte;
+    unsigned int    byte4;
 
     DBG("%s: cmd=%s arg=%p ibuf=%p:%u obuf=:%u\n", __func__,
         _ioctl_name(cmd), arg, in_buf,
@@ -633,72 +861,46 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
     case TCSETS:
         CHECK_BUF_IN(sizeof(struct termios));
         {
-            speed_t         speed;
-            int             csize, par, sb;
+            memcpy(tio, in_buf, in_bufsz);
 
-            memcpy(&tio, in_buf, in_bufsz);
+            byte4 = htonl(_tio_baud(tio));
+            telnet_rfc2217_cfg(tty->tn, TNS_SET_BAUDRATE, &byte4, 4);
 
-            speed = tio.c_cflag & (CBAUD | CBAUDEX);
-            val = htonl(baudrate(speed));
-            telnet_rfc2217_cfg(tty->tn, TNS_SET_BAUDRATE, &val, 4);
+            byte = _tio_csize(tio);
+            telnet_rfc2217_cfg(tty->tn, TNS_SET_DATASIZE, &byte, 1);
 
-            if ((tio.c_cflag & CSIZE) == CS5)
-                csize = 5;
-            else if ((tio.c_cflag & CSIZE) == CS6)
-                csize = 6;
-            else if ((tio.c_cflag & CSIZE) == CS7)
-                csize = 7;
-            else
-                csize = 8;
-            telnet_rfc2217_cfg(tty->tn, TNS_SET_DATASIZE, &csize, 1);
+            byte = _tio_parity(tio);
+            telnet_rfc2217_cfg(tty->tn, TNS_SET_PARITY, &byte, 1);
 
-            if (tio.c_cflag & PARENB && tio.c_iflag & IGNPAR)
-                par = 1;
-#ifdef CMSPAR
-            else if (tio.c_cflag & PARENB && tio.c_iflag & CMSPAR)
+            byte = _tio_stopb(tio);
+            telnet_rfc2217_cfg(tty->tn, TNS_SET_STOPSIZE, &byte, 1);
+
+            if (tio->c_cflag & CRTSCTS)
             {
-                if (tio.c_cflag & PARODD)
-                    par = 4;
-                else
-                    par = 5;
-            }
-#endif
-            else if (tio.c_cflag & PARENB)
-                par = 3;
-            else
-                par = 1;
-            telnet_rfc2217_cfg(tty->tn, TNS_SET_PARITY, &par, 1);
-
-            if (tio.c_cflag & CSTOPB)
-                sb = 2;
-            else
-                sb = 1;
-            telnet_rfc2217_cfg(tty->tn, TNS_SET_STOPSIZE, &sb, 1);
-
-            if (tio.c_cflag & CRTSCTS)
+                tty->cmcr |= TIOCM_RTS;
                 telnet_rfc2217_ctl(tty->tn, TNS_CTL_CTSRTS);
+            }
 
-            if (!(tty->cmcr & TIOCM_DTR) && speed != B0)
+            if (!(tty->cmcr & TIOCM_DTR) && _tio_baud(tio) != 0)
             {
                 tty->cmcr |= TIOCM_DTR;
                 telnet_rfc2217_ctl(tty->tn, TNS_CTL_DTR_ON);
             }
 
-            DBG("termios: %u%c%u%u %cCTSRTS %cCREAD %cHUPCL %cCLOCAL\n",
-                baudrate(speed), pstr[par], csize, sb,
-                tio.c_cflag & CRTSCTS ? '+' : '-',
-                tio.c_cflag & CREAD ? '+' : '-',
-                tio.c_cflag & HUPCL ? '+' : '-',
-                tio.c_cflag & CLOCAL ? '+' : '-');
+            _show_termios("TCSETS", tio);
+            ioctl(tty->fds[FD_SLAVE].fd, cmd, tio);
 
-            ioctl(tty->fds[FD_SLAVE].fd, cmd, &tio);
+            if (cmd == TCSETSF)
+                tty->slave_suspended = 0;       /* Re-enable polling of Slave */
 
             fuse_reply_ioctl(req, 0, 0, 0);
         }
         break;
     case TCGETS:
         CHECK_BUF_OUT(sizeof(struct termios));
-        fuse_reply_ioctl(req, 0, &tio, sizeof(struct termios));
+        ioctl(tty->fds[FD_SLAVE].fd, TCGETS, tio);
+        _show_termios("TCGETS", tio);
+        fuse_reply_ioctl(req, 0, tio, sizeof(struct termios));
         break;
     case TIOCINQ:              /* Get the number of bytes in the input
                                  * buffer */
@@ -713,33 +915,25 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
         fuse_reply_ioctl(req, 0, &val, sizeof(int));
         break;
     case TCFLSH:
-        if (arg == TCIFLUSH)
+        switch ((size_t) arg)
         {
-            /*todo */
-        }
-        else if ((size_t) arg == TCOFLUSH)
-        {
-            /*todo */
-        }
-        else if ((size_t) arg == TCIOFLUSH)
-        {
-            /*todo */
-        }
-        fuse_reply_ioctl(req, 0, 0, 0);
-        break;
+        default:
         case TCIFLUSH:
-        val = 1;
-        telnet_rfc2217_cfg(tty->tn, TNS_SET_PURGE, &val, 1);
-        fuse_reply_ioctl(req, 0, 0, 0);
+            byte = 1;
+            tty->slave_suspended = 0;   /* Re-enable polling of Slave */
             break;
         case TCOFLUSH:
-        val = 2;
-        telnet_rfc2217_cfg(tty->tn, TNS_SET_PURGE, &val, 1);
-        fuse_reply_ioctl(req, 0, 0, 0);
+            byte = 2;
+            tty->pollout = 1;
             break;
         case TCIOFLUSH:
-        val = 3;
-        telnet_rfc2217_cfg(tty->tn, TNS_SET_PURGE, &val, 1);
+            byte = 3;
+            tty->slave_suspended = 0;   /* Re-enable polling of Slave */
+            tty->pollout = 1;
+            break;
+        }
+        telnet_rfc2217_cfg(tty->tn, TNS_SET_PURGE, &byte, 1);
+        ioctl(tty->fds[FD_SLAVE].fd, TCFLSH, arg);
         fuse_reply_ioctl(req, 0, 0, 0);
         break;
     case TIOCMGET:
@@ -794,9 +988,9 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
                            TNS_CTL_RTS_ON : TNS_CTL_RTS_OFF);
         goto show_mctl;
       show_mctl:
-        DBG("MCR: DTR=%c RTS=%c\n",
-            tty->cmcr & TIOCM_DTR ? '1' : '0',
-            tty->cmcr & TIOCM_RTS ? '1' : '0');
+        DBG("MCR: RTS=%c DTR=%c\n",
+            tty->cmcr & TIOCM_RTS ? '1' : '0',
+            tty->cmcr & TIOCM_DTR ? '1' : '0');
         break;
     case TCSBRK:
         fuse_reply_ioctl(req, 0, 0, 0);
@@ -838,7 +1032,6 @@ ttynvt_ioctl(fuse_req_t req, int cmd, void *arg,
     case TIOCSETD:
         CHECK_BUF_IN(sizeof(int));
         val = *(int *)in_buf;
-
         res = ioctl(tty->fds[FD_SLAVE].fd, TIOCSETD, &val);
         if (res < 0)
             fuse_reply_err(req, errno);
@@ -888,21 +1081,29 @@ ttynvt_poll(fuse_req_t req, struct fuse_file_info *info,
     ttynvt_t       *tty = (ttynvt_t *) (uintptr_t) info->fh;
     int             revents = 0;
 
+    DBG2("%s: tty->pollin=%d tty->error/epipe=%d/%d\n",
+         __func__, tty->pollin, tty->error, tty->epipe);
+
     _update_notify(tty, ph);
 
+    if (tty->pollout)
+    {
+        revents = POLLOUT;
+    }
     if (tty->pollin)
     {
-        tty->pollin = 0;
         revents |= POLLIN;
     }
     if (tty->error)
     {
         if (tty->epipe == 0)
-            revents = POLLHUP | POLLIN;
+            revents |= POLLHUP | POLLIN;
         else
             revents = 0;
     }
 
+    DBG2("%s: revents=%#x\n", __func__, revents);
+
     fuse_reply_poll(req, revents);
 }
 
@@ -920,6 +1121,7 @@ static const struct cuse_lowlevel_ops ttynvt_op = {
 
 static const struct fuse_opt ttynvt_opts[] = {
     TTYNET_OPT("-D %d", debug, 1),
+    TTYNET_OPT("-E", logstd, 1),
     TTYNET_OPT("-M %u", major, 1),
     TTYNET_OPT("--maj=%u", major, 1),
     TTYNET_OPT("-m %u", minor, 1),
@@ -937,6 +1139,7 @@ static void print_help(void)
 {
     fprintf(stderr, "ttynvt Usage:\n"
             "\t-D level\tEnable debug\n"
+            "\t-E\t\tPrint debug to stdout (default is syslog)\n"
             "\t-M major, --maj=major\n"
             "\t-m minor, --min=minor\n"
             "\t-n name, --name=name (default: ttyNVT0)\n"
@@ -1018,14 +1221,14 @@ int main(int argc, char *argv[])
     switch (cpid)
     {
     case -1:
-        _log(LOG_ERR, "fork(): %m");
+        _log(LOG_ERR, "fork(): %m\n");
         return -1;
 
     case 0:                    /* Child */
         DBG("Child proceeding...\n");
         rc = cuse_lowlevel_main(args.argc, args.argv, &ci, &ttynvt_op, NULL);
         if (rc != 0)
-            _log(LOG_ERR, "ttynvt failed rc=%d", rc);
+            _log(LOG_ERR, "ttynvt failed rc=%d\n", rc);
         else
             DBG("Child exited\n");
         return rc;