Merge pull request knxd#616 from dallmair/fix/485-606-ft12-startup-se…

…gfault

Fix FT 1.2 segmentation fault and make FT 1.2 and NCN5120 compatible with more USB-to-serial adapters

.mailmap

@@ -1,5 +1,5 @@
 Stefan Hoffmeister <[email protected]>
-Michael Markstaller <[email protected]>
+Michael Markstaller <[email protected]> <[email protected]>
 Joerg Mattiello <[email protected]> <[email protected]>
 Patrik Pfaffenbauer <[email protected]> <[email protected]>
 Timo Wingender <[email protected]>

AUTHORS

@@ -39,7 +39,6 @@ Harald Leithner <[email protected]>
 Tobias Lorenz <[email protected]>
 MagicBear <[email protected]>
 Michael Markstaller <[email protected]>
-Michael Markstaller <[email protected]>
 Joerg Mattiello <[email protected]>
 Race666 <[email protected]>
 Sebastian <[email protected]>

src/backend/ft12.cpp

@@ -44,7 +44,7 @@ class FT12serial : public LLserial
   void termios_settings (struct termios &t1)
   {
     t1.c_cflag = CS8 | CLOCAL | CREAD | PARENB;
-    t1.c_iflag = IGNBRK | INPCK | ISIG;
+    t1.c_iflag = IGNBRK | ISIG;
     t1.c_oflag = 0;
     t1.c_lflag = 0;
     t1.c_cc[VTIME] = 1;
@@ -120,7 +120,8 @@ FT12wrap::setup()
           ERRORPRINTF (t, E_ERROR | 5, "Don't specify both device and IP options!");
           return false;
         }
-      iface = new FT12serial(this, cfg);
+      ll_serial = new FT12serial(this, cfg);
+      iface = ll_serial;
     }
   else
     {
@@ -325,6 +326,10 @@ FT12wrap::process_read(bool is_timeout)
                   const uint8_t reset[1] = { 0xA0 };
                   CArray c = CArray (reset, sizeof (reset));
                   t->TracePacket (0, "RecvReset", c);
+                  if (ll_serial != nullptr)
+                    {
+                      ll_serial->enable_input_parity_check();
+                    }
                   LowLevelFilter::recv_Data (c);
                 }
               akt.deletepart (0, 4);
@@ -444,5 +449,3 @@ FT12CEMIDriver::cmdOpen()
   const uint8_t t1[] = { 0xF6, 0x00, 0x08, 0x01, 0x34, 0x10, 0x01, 0x00 };
   send_Local (CArray (t1, sizeof (t1)),1);
 }
-
-

src/backend/ft12.h

@@ -24,6 +24,7 @@
 
 #include "iobuf.h"
 #include "lowlevel.h"
+#include "llserial.h"
 #include "emi_common.h"
 #include "lowlatency.h"
 #include "link.h"
@@ -125,6 +126,9 @@ class FT12wrap : public LowLevelFilter
   void do_send_Local (CArray& l, int raw = 0);
 
   void sendReset();
+
+private:
+  LLserial *ll_serial = nullptr;
 };
 
 #endif

src/backend/ncn5120.cpp

@@ -34,7 +34,7 @@ class NCN5120wrap : public TPUARTwrap
   void setstate(enum TSTATE state);
 
   void RecvLPDU (const uint8_t * data, int len);
-  virtual FDdriver * create_serial(LowLevelIface* parent, IniSectionPtr& s);
+  virtual LLserial * create_serial(LowLevelIface* parent, IniSectionPtr& s);
 };
 
 class NCN5120serial : public LLserial
@@ -54,7 +54,7 @@ class NCN5120serial : public LLserial
   void termios_settings(struct termios &t1)
   {
     t1.c_cflag = CS8 | CLOCAL | CREAD;
-    t1.c_iflag = IGNBRK | INPCK | ISIG;
+    t1.c_iflag = IGNBRK | ISIG;
     t1.c_oflag = 0;
     t1.c_lflag = 0;
     t1.c_cc[VTIME] = 1;
@@ -69,11 +69,10 @@ NCN5120::create_wrapper(LowLevelIface* parent, IniSectionPtr& s, LowLevelDriver*
 }
 
 
-FDdriver *
+LLserial *
 NCN5120wrap::create_serial(LowLevelIface* parent, IniSectionPtr& s)
 {
-  fd_driver = new NCN5120serial(parent,s);
-  return fd_driver;
+  return new NCN5120serial(parent, s);
 }
 
 void NCN5120wrap::RecvLPDU (const uint8_t * data, int len)
@@ -94,4 +93,3 @@ NCN5120wrap::setstate(enum TSTATE new_state)
     }
   TPUARTwrap::setstate(new_state);
 }
-

src/backend/tpuart.cpp

@@ -64,11 +64,10 @@ TPUART::create_wrapper(LowLevelIface* parent, IniSectionPtr& s, LowLevelDriver*
   return new TPUARTwrap(parent,s, i);
 }
 
-FDdriver *
+LLserial *
 TPUARTwrap::create_serial(LowLevelIface* parent, IniSectionPtr& s)
 {
-  fd_driver = new TPUARTserial(parent,s);
-  return fd_driver;
+  return new TPUARTserial(parent, s);
 }
 
 
@@ -136,7 +135,8 @@ TPUARTwrap::setup()
           ERRORPRINTF (t, E_ERROR | 25, "Don't specify both device and IP options!");
           return false;
         }
-      iface = create_serial(this, cfg);
+      ll_serial = create_serial(this, cfg);
+      iface = ll_serial;
     }
   else
     {
@@ -363,36 +363,17 @@ TPUARTwrap::timer_cb(ev::timer &, int)
 }
 
 int
-TPUARTwrap::enableInputParityCheck()
+TPUARTwrap::enable_input_parity_check()
 {
-  struct termios t1;
-
-  if (fd_driver == nullptr)
+  if (ll_serial == nullptr)
   {
     // Not possible and not necessary to enable on TCP connections, so just continue.
     return 0;
   }
 
-  TRACEPRINTF (t, 8, "Enabling input parity check on fd %d\n", fd_driver->get_fd());
-
-  if (tcgetattr (fd_driver->get_fd(), &t1))
-  {
-    ERRORPRINTF (t, E_ERROR | 70, "tcgetattr failed: %s", strerror(errno));
-    return -1;
-  }
-
-  t1.c_iflag = t1.c_iflag | INPCK;
-
-  if (tcsetattr (fd_driver->get_fd(), TCSANOW, &t1))
-  {
-    ERRORPRINTF (t, E_ERROR | 70, "tcsetattr failed: %s", strerror(errno));
-    return -2;
-  }
-
-  return 0;
+  return ll_serial->enable_input_parity_check();
 }
 
-
 void
 TPUARTwrap::in_check()
 {
@@ -479,7 +460,7 @@ TPUARTwrap::recv_Data(CArray &c)
           if (state == T_in_reset)
             {
               TRACEPRINTF (t, 8, "RESET_ACK");
-              if (enableInputParityCheck()>=0)
+              if (enable_input_parity_check() >= 0)
                 setstate(T_in_setaddr);
               // else time out
             }

src/backend/tpuart.h

@@ -24,6 +24,7 @@
 #include "link.h"
 #include "lpdu.h"
 #include "lowlevel.h"
+#include "llserial.h"
 
 // also update SN() in tpuart.cpp
 enum TSTATE
@@ -107,11 +108,11 @@ class TPUARTwrap : public LowLevelFilter
   void send_L_Data (LDataPtr l);
 
 protected:
-  virtual FDdriver * create_serial(LowLevelIface* parent, IniSectionPtr& s);
-  FDdriver *fd_driver = NULL;
+  virtual LLserial * create_serial(LowLevelIface* parent, IniSectionPtr& s);
 
 private:
-  int enableInputParityCheck();
+  LLserial *ll_serial = nullptr;
+  int enable_input_parity_check();
 };
 
 #endif

src/libserver/emi2.cpp

@@ -25,6 +25,7 @@ EMI2Driver::EMI2Driver (LowLevelIface* c, IniSectionPtr& s, LowLevelDriver *i) :
 {
   t->setAuxName("EMI2");
   sendLocal_done.set<EMI2Driver,&EMI2Driver::sendLocal_done_cb>(this);
+  reset_timer.set<EMI2Driver,&EMI2Driver::reset_timer_cb>(this);
 }
 
 void

src/libserver/llserial.cpp

@@ -149,3 +149,26 @@ LLserial::stop(bool err)
   FDdriver::stop(err);
 }
 
+int
+LLserial::enable_input_parity_check()
+{
+  struct termios t1;
+
+  TRACEPRINTF (t, 8, "Enabling input parity check on fd %d\n", fd);
+
+  if (tcgetattr (fd, &t1))
+  {
+    ERRORPRINTF (t, E_ERROR | 70, "tcgetattr failed: %s", strerror(errno));
+    return -1;
+  }
+
+  t1.c_iflag = t1.c_iflag | INPCK;
+
+  if (tcsetattr (fd, TCSANOW, &t1))
+  {
+    ERRORPRINTF (t, E_ERROR | 70, "tcsetattr failed: %s", strerror(errno));
+    return -2;
+  }
+
+  return 0;
+}

src/libserver/llserial.h

@@ -47,6 +47,7 @@ class LLserial:public FDdriver
   bool setup();
   void start();
   void stop(bool err);
+  int enable_input_parity_check();
 
 private:
   low_latency_save sold;

src/libserver/lowlevel.cpp

@@ -232,8 +232,3 @@ HWBusDriver::setup()
     return false;
   return true;
 }
-
-int FDdriver::get_fd()
-{
-  return fd;
-}

src/libserver/lowlevel.h

@@ -281,7 +281,6 @@ class FDdriver:public LowLevelDriver
   bool setup();
   void start();
   void stop(bool err);
-  int get_fd();
 
 protected:
   /** device connection */