From befdbe010b20b062dd02d5b83a836daf7eaa9964 Mon Sep 17 00:00:00 2001
From: IMback <philipp@uvos.net>
Date: Wed, 31 Oct 2018 00:38:39 +0100
Subject: [PATCH] add support for unchanged serial port baud rate

---
 main.cpp      | 50 +++++++++++++++++++++++++++++++++----------------
 serial_io.cpp | 52 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/main.cpp b/main.cpp
index 96ffddf..ac0f5f1 100644
--- a/main.cpp
+++ b/main.cpp
@@ -39,6 +39,7 @@ struct Config
     unsigned short port = 6856;
     int baud = B9600;
     bool noSerial = false;
+	bool verbose = false;
 };
 
 static int parseCmdArgs(int argc, char** argv, Config *config)
@@ -75,6 +76,10 @@ static int parseCmdArgs(int argc, char** argv, Config *config)
             printRates();
             return -1;
         }
+        else if (std::string(argv[i]) == "-v" || std::string(argv[i]) == "--verbose")
+        {
+            config->verbose=true;
+        }
     }
     return 0;
 }
@@ -90,7 +95,7 @@ void acceptThreadFunction( TCPServerSocket* servSock,  std::vector<TCPSocket*>*
             clientSockets->back()->send("UVOS serial multiplexer " VERSION "\n", sizeof("UVOS serial multiplexer " VERSION "\n")-1);
             std::cout<<"got client\n";
         }
-        std::this_thread::sleep_for(std::chrono::milliseconds(20));
+        std::this_thread::sleep_for(std::chrono::milliseconds(200));
     }
 }
 
@@ -147,35 +152,48 @@ int main(int argc, char* argv[])
 
                 if(readlen > 0) 
                 {
-                    std::cout<<"bcst: ";
-                    for( int j = 0; j < readlen; j++  )std::cout<<buffer[j];
+					if(config.verbose) 
+					{
+						std::cout<<"bcst: ";
+						for( int j = 0; j < readlen; j++  )std::cout<<buffer[j];
+						std::cout<<std::endl;
+					}
                     clientSockets[i]->send(buffer, readlen);
-                    std::cout<<std::endl;
                 }
                 
-                char inBuffer[2048];
-                int reclen = clientSockets[i]->recv(inBuffer, 2048);
+                char inBuffer[4096];
+                int reclen = clientSockets[i]->recv(inBuffer, 4096);
                 if( reclen > 0 ) 
                 {
-                    std::cout<<"rec: ";
-                    for( int j = 0; j < reclen; j++  )std::cout<<inBuffer[j];
+                    if(config.verbose)
+					{
+						std::cout<<"rec: ";
+						for( int j = 0; j < reclen; j++  )std::cout<<inBuffer[j];
+					}
                     
                     if(strncmp( inBuffer, "bcst: ", 6 ) == 0)
                     {
-                        std::cout<<"bcst: ";
-                        for( int j = 6; j < reclen; j++  )std::cout<<inBuffer[j];
+                        if(config.verbose) 
+						{
+							std::cout<<"bcst: ";
+							for( int j = 6; j < reclen; j++  )std::cout<<inBuffer[j];
+							std::cout<<std::endl;
+						}
                         for(unsigned int j = 0; j < clientSockets.size(); j++) if(i != j) clientSockets[j]->send(inBuffer+6, reclen-6);
-                        std::cout<<std::endl;
+                        
                     }
                     else
                     {
-                        std::cout<<"wrote \"";
-                        for( int j = 0; j < reclen; j++  )std::cout<<inBuffer[j];
-                        std::cout<<"\" to serial \n";
+						if(config.verbose) 
+						{
+							std::cout<<"wrote \"";
+							for( int j = 0; j < reclen; j++  )std::cout<<inBuffer[j];
+							std::cout<<"\" to serial \n";
+						}
                         sWrite(serial, inBuffer, reclen);
                     }
                     
-                    std::cout<<std::endl;
+                    if(config.verbose) std::cout<<std::endl;
                 }
                 else if(reclen == 0)
                 {
@@ -195,7 +213,7 @@ int main(int argc, char* argv[])
                 if(i < 0) i=0;
             }
         }
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
     
     acceptThread->join();
diff --git a/serial_io.cpp b/serial_io.cpp
index d7f8107..a1e59af 100644
--- a/serial_io.cpp
+++ b/serial_io.cpp
@@ -20,24 +20,25 @@ ssize_t sRead(int port, void *buf, size_t count)
 void printRates()
 {
 std::cout<<"Rates:\n"\
-         <<"B50      "<<B50<<'\n'\
-         <<"B75      "<<B75<<'\n'\
-         <<"B110     "<<B110<<'\n'\
-         <<"B134     "<<B134<<'\n'\
-         <<"B150     "<<B150<<'\n'\
-         <<"B200     "<<B200<<'\n'\
-         <<"B300     "<<B300<<'\n'\
-         <<"B600     "<<B600<<'\n'\
-         <<"B1200    "<<B1200<<'\n'\
-         <<"B1800    "<<B1800<<'\n'\
-         <<"B2400    "<<B2400<<'\n'\
-         <<"B4800    "<<B4800<<'\n'\
-         <<"B9600    "<<B9600<<'\n'\
-         <<"B19200   "<<B19200<<'\n'\
-         <<"B38400   "<<B38400<<'\n'\
-         <<"B57600   "<<B57600<<'\n'\
-         <<"B115200  "<<B115200<<'\n'\
-         <<"B230400  "<<B230400<<'\n';
+		 <<"Unchanged 0\n"        \
+         <<"B50       "<<B50<<'\n'\
+         <<"B75       "<<B75<<'\n'\
+         <<"B110      "<<B110<<'\n'\
+         <<"B134      "<<B134<<'\n'\
+         <<"B150      "<<B150<<'\n'\
+         <<"B200      "<<B200<<'\n'\
+         <<"B300      "<<B300<<'\n'\
+         <<"B600      "<<B600<<'\n'\
+         <<"B1200     "<<B1200<<'\n'\
+         <<"B1800     "<<B1800<<'\n'\
+         <<"B2400     "<<B2400<<'\n'\
+         <<"B4800     "<<B4800<<'\n'\
+         <<"B9600     "<<B9600<<'\n'\
+         <<"B19200    "<<B19200<<'\n'\
+         <<"B38400    "<<B38400<<'\n'\
+         <<"B57600    "<<B57600<<'\n'\
+         <<"B115200   "<<B115200<<'\n'\
+         <<"B230400   "<<B230400<<'\n';
 }
 #endif
 
@@ -73,11 +74,16 @@ int serialport_init(const char* device, int baud)
     toptions.c_cflag &= ~(CSIZE | PARENB);
     toptions.c_cflag |= CS8;
     
-    if(cfsetispeed(&toptions, baud) < 0 || cfsetospeed(&toptions, baud) < 0)
-    {
-        perror("init_serialport: Couldn't set baud rate");
-        return -1;
-    }
+	if(baud != 0)
+	{
+		int error = cfsetispeed(&toptions, baud) | cfsetospeed(&toptions, baud);
+
+		if(error)
+		{
+			perror("init_serialport: Couldn't set baud rate");
+			return -1;
+		}
+	}
     // see: http://unixwiz.net/techtips/termios-vmin-vtime.html
     toptions.c_cc[VMIN]  = 0;
     toptions.c_cc[VTIME] = 40;