WebSVN – tpanel – Diff – /trunk/tamxnet.cpp

     if (mSocket)
         mSocket->close();
+}
+bool TAmxNet::reconnect()
+{
+    DECL_TRACER("TAmxNet::reconnect()");
+    if (!mSocket || !__CommValid)
+        return false;
+    mSocket->close();
+    initSend = false;
+    ready = false;
+    return true;
+}
 bool TAmxNet::isNetRun()
+{
     return _netRunning;
+}
     sendAllFuncNetwork(NSTATE_CONNECTING);
     while (__CommValid && mSocket && isRunning())
+    {
+        initSend = false;
+        ready = false;
         if (__CommValid && mSocket && !mSocket->connect(TConfig::getController(), TConfig::getPort()))
+        {
             MSG_DEBUG("Connection failed. Retrying ...");
             sendAllFuncNetwork(NSTATE_OFFLINE);
-            std::this_thread::sleep_for(std::chrono::seconds(3));
+            std::this_thread::sleep_for(std::chrono::seconds(mWaitTime));
+            setWaitTime(WAIT_RESET);
             continue;
+        }
         else if (!mSocket)
             break;
         sendAllFuncNetwork(NSTATE_ONLINE);
         handle_connect();
-        std::this_thread::sleep_for(std::chrono::seconds(3));
+        std::this_thread::sleep_for(std::chrono::seconds(mWaitTime));
+        setWaitTime(WAIT_RESET);
+        MSG_INFO("Network will be reestablished ...");
+    }
     _netRunning = false;
+}
         if (!stopped_ && (killed || prg_stopped))
             stop();
+    }
     catch (std::exception& e)
+    {
-        sendAllFuncNetwork(NSTATE_CONNECTING);
         MSG_ERROR("Error: " << e.what());
         if (mSocket)
             mSocket->close();
+    }
-    catch (TXceptNetwork& e)
+    catch (TXceptComm& e)
+    {
-        sendAllFuncNetwork(NSTATE_CONNECTING);
-//        MSG_ERROR("Error: " << e.getMessage());
         if (mSocket)
             mSocket->close();
+    }
+    sendAllFuncNetwork(NSTATE_CONNECTING);
+    setWaitTime(WAIT_RECONNECT);
+}
 void TAmxNet::start_read()
+{
     DECL_TRACER("TAmxNet::start_read()");
+        {
             _message.append(" [RT_ID]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_LEN);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_LEN]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 1) == 1)
             handle_read(1, RT_SEP1);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_SEP1]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 1) == 1)
             handle_read(1, RT_TYPE);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_TYPE]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_WORD1);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_WORD1]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(30);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_DEVICE);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_DEVIVE]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_WORD2);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_WORD2]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_WORD3);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_WORD3]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_WORD4);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_WORD4]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_WORD5);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_WORD5]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 1) == 1)
             handle_read(1, RT_SEP2);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_SEP2]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_COUNT);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_COUNT]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, 2) == 2)
             handle_read(2, RT_MC);
         else if (mSocket->isConnected())
+        {
             _message.append(" [RT_MC]");
             XCEPTCOMM(_message);
+        }
         else
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         // Calculate the length of the data block. This is the rest of the total length
         size_t len = (comm.hlen + 3) - 0x0015;
         if (mSocket->isConnected() && len > BUF_SIZE)
+        {
             _message = "Length to read is " + to_string(len) + " bytes, but the buffer is only " + to_string(BUF_SIZE) + " bytes!";
             XCEPTCOMM(_message);
+        }
         else if (!mSocket->isConnected())
+        {
+            setWaitTime(WAIT_RECONNECT);
             return;
+        }
         if (mSocket->readAbsolut(buff_, len) == len)
             handle_read(len, RT_DATA);
         else if (mSocket->isConnected())
+        {
             XCEPTCOMM(_message);
+        }
+    }
     catch (TXceptNetwork& e)
+    {
-//        MSG_ERROR(e.getMessage());
+        setWaitTime(WAIT_RECONNECT);
+    }
+}
 void TAmxNet::handle_read(size_t n, R_TOKEN tk)
+{
         case RT_DATA:
             if (protError || !isRunning())
                 break;
-            MSG_TRACE("Received message type: 0x" << std::setw(4) << std::setfill('0') << std::hex << comm.MC);
+            MSG_DEBUG("Received message type: 0x" << std::setw(4) << std::setfill('0') << std::hex << comm.MC);
             switch (comm.MC)
+            {
                 case 0x0001:    // ACK
                 case 0x0002:    // NAK
                     else
                         break;
                     sendCommand(s);
-                    MSG_TRACE("S/N: " << comm.data.srDeviceInfo.serial << " | " << comm.data.srDeviceInfo.info);
+                    MSG_DEBUG("S/N: " << comm.data.srDeviceInfo.serial << " | " << comm.data.srDeviceInfo.info);
                 break;
                 case 0x00a1:    // request status
                     reqDevStatus = makeWord(buff_[0], buff_[1]);
                     comm.checksum = buff_[2];
             com.data.channel.device = com.device2;
             com.data.channel.port = s.port;
             com.data.channel.system = com.system;
             com.data.channel.channel = s.channel;
             com.hlen = 0x0016 - 0x0003 + sizeof(ANET_CHANNEL);
+            MSG_DEBUG("SEND: BUTTON PUSH-" << s.channel << ":" << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x0085:        // release button
             com.data.channel.device = com.device2;
             com.data.channel.port = s.port;
             com.data.channel.system = com.system;
             com.data.channel.channel = s.channel;
             com.hlen = 0x0016 - 0x0003 + sizeof(ANET_CHANNEL);
+            MSG_DEBUG("SEND: BUTTON RELEASE-" << s.channel << ":" << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x0086:    // output channel on
             com.data.channel.device = com.device2;
             com.data.channel.port = s.port;
             com.data.channel.system = com.system;
             com.data.channel.channel = s.channel;
             com.hlen = 0x0016 - 0x0003 + sizeof(ANET_CHANNEL);
+            MSG_DEBUG("SEND: CHANNEL ON-" << s.channel << ":" << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x0087:    // output channel off
             com.data.channel.device = com.device2;
             com.data.channel.port = s.port;
             com.data.channel.system = com.system;
             com.data.channel.channel = s.channel;
             com.hlen = 0x0016 - 0x0003 + sizeof(ANET_CHANNEL);
+            MSG_DEBUG("SEND: CHANNEL OFF-" << s.channel << ":" << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x008a:        // level value changed
             com.data.message_value.system = com.system;
             com.data.message_value.value = s.level;
             com.data.message_value.type = 0x20;     // unsigned integer
             com.data.message_value.content.integer = s.value;
             com.hlen = 0x0016 - 0x0003 + 11;
+            MSG_DEBUG("SEND: LEVEL-" << s.value << "," << s.level << ":" << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x008b:        // string command
                 len = s.msg.length();
             com.data.message_string.length = len;
             strncpy((char *)&com.data.message_string.content[0], s.msg.c_str(), len);
             com.hlen = 0x0016 - 3 + 9 + len;
+            MSG_DEBUG("SEND: STRING-'" << s.msg << "'," << s.port << ":" << com.device2);
             comStack.push_back(com);
             mSendReady = true;
         break;
         case 0x008d:    // Custom event
         s.dtype = 0;                // ftype --> function type
         s.type = 0x0001;            // function
         s.value1 = 0;               // 1st data byte 0x00
         s.value2 = 0x10;            // 2nd data byte 0x10
         string f((char *)&ft.data);
-        MSG_TRACE("0x0000/0x0105: Directory " << f << " exist?");
+        MSG_DEBUG("0x0000/0x0105: Directory " << f << " exist?");
         string prjPath = TConfig::getProjectPath();
         string newPath;
         dir::TDirectory dir;
         if (f.compare(0, 8, "AMXPanel") == 0)
             if (dr.isFile(realPath))
                 len = dr.getFileSize(realPath);
+        }
-        MSG_TRACE("0x0000/0x0100: Request directory " << fname);
+        MSG_DEBUG("0x0000/0x0100: Request directory " << fname);
         snprintf((char *)&ftr.data.filetransfer.data[0], sizeof(ftr.data.filetransfer.data), "Syncing %d files ...", ftransfer.maxFiles);
         if (callback)
             callback(ftr);
         else
             sendCommand(s);
+        }
+    }
     else if (ft.ftype == 4 && ft.function == 0x0100)    // Have more files to send.
+    {
-        MSG_TRACE("0x0004/0x0100: Have more files to send.");
+        MSG_DEBUG("0x0004/0x0100: Have more files to send.");
         s.channel = 0;
         s.level = 0;
         s.port = 0;
         s.value = 0;
         s.MC = 0x0204;
+            {
                 MSG_INFO("Writing file: " << rcvFileName);
+            }
+        }
-        MSG_TRACE("0x0004/0x0102: Controller will send file " << rcvFileName);
+        MSG_DEBUG("0x0004/0x0102: Controller will send file " << rcvFileName);
         ftransfer.actFileNum++;
         ftransfer.lengthFile = ft.unk;
         if (ftransfer.actFileNum > ftransfer.maxFiles)
         size_t pos = 0;
         if ((pos = f.find("AMXPanel/")) == string::npos)
             pos = f.find("__system/");
-        MSG_TRACE("0x0000/0x0104: Delete file " << f);
+        MSG_DEBUG("0x0000/0x0104: Delete file " << f);
         if (pos != string::npos)
             f = TConfig::getProjectPath() + "/" + f.substr(pos + 9);
         else
             f = TConfig::getProjectPath() + "/" + f;
+    {
         string f((char*)&ft.data);
         size_t pos;
         len = 0;
         sndFileName.assign(TConfig::getProjectPath());
-        MSG_TRACE("0x0004/0x0104: Request file " << f);
+        MSG_DEBUG("0x0004/0x0104: Request file " << f);
         if (f.find("AMXPanel") != string::npos)
+        {
             pos = f.find_first_of("/");
             sndFileName.append(f.substr(pos));
         else if (sndFileName.find("/version.xma") > 0)
             len = 0x0015;
         else
             len = 0;
-        MSG_TRACE("0x0004/0x0104: (" << len << ") File: " << sndFileName);
+        MSG_DEBUG("0x0004/0x0104: (" << len << ") File: " << sndFileName);
         s.channel = 0;
         s.level = 0;
         s.port = 0;
         s.value = 0;
         s.value2 = 0x00001388;      // ID for device when sending a file.
         sendCommand(s);
+    }
     else if (ft.ftype == 4 && ft.function == 0x0106)    // Controller is ready for receiving file
+    {
-        MSG_TRACE("0x0004/0x0106: Controller is ready for receiving file.");
+        MSG_DEBUG("0x0004/0x0106: Controller is ready for receiving file.");
         if (!access(sndFileName.c_str(), R_OK))
+        {
             struct stat st;
             stat(sndFileName.c_str(), &st);
         s.value1 = len;             // length of content to send
         sendCommand(s);
+    }
     else if (ft.ftype == 4 && ft.function == 0x0002)    // request next part of file
+    {
-        MSG_TRACE("0x0004/0x0002: Request next part of file.");
+        MSG_DEBUG("0x0004/0x0002: Request next part of file.");
         s.channel = 0;
         s.level = 0;
         s.port = 0;
         s.value = 0;
         s.MC = 0x0204;
         sendCommand(s);
+    }
     else if (ft.ftype == 4 && ft.function == 0x0003)    // File content
+    {
-        MSG_TRACE("0x0004/0x0003: Received (part of) file.");
+        MSG_DEBUG("0x0004/0x0003: Received (part of) file.");
         len = ft.unk;
         if (isOpenRcv)
+        {
             fwrite(ft.data, 1, len, rcvFile);
                 MSG_WARNING("Missing callback function!");
+        }
+    }
     else if (ft.ftype == 4 && ft.function == 0x0004)    // End of file
+    {
-        MSG_TRACE("0x0004/0x0004: End of file.");
+        MSG_DEBUG("0x0004/0x0004: End of file.");
         if (isOpenRcv)
+        {
             unsigned char buf[8];
             fseek(rcvFile, 0, SEEK_SET);
         s.type = 0x0005;            // function: ACK, file received. No answer expected.
         sendCommand(s);
+    }
     else if (ft.ftype == 4 && ft.function == 0x0005)    // ACK, controller received file, no answer
+    {
-        MSG_TRACE("0x0004/0x0005: Controller received file.");
+        MSG_DEBUG("0x0004/0x0005: Controller received file.");
         posSnd = 0;
         lenSnd = 0;
         if (isOpenSnd && sndFile != nullptr)
             fclose(sndFile);
         ftransfer.lengthFile = 0;
         sndFile = nullptr;
+    }
     else if (ft.ftype == 4 && ft.function == 0x0006)    // End of directory transfer ACK
+    {
-        MSG_TRACE("0x0004/0x0006: End of directory transfer.");
+        MSG_DEBUG("0x0004/0x0006: End of directory transfer.");
+    }
     else if (ft.ftype == 4 && ft.function == 0x0007)    // End of file transfer
+    {
-        MSG_TRACE("0x0004/0x0007: End of file transfer.");
+        MSG_DEBUG("0x0004/0x0007: End of file transfer.");
         if (callback)
             callback(ftr);
         else
             MSG_WARNING("Missing callback function!");
     for (size_t i = 0; i < len; i++)
         sum += (unsigned long)(*(buffer + i)) & 0x000000ff;
     sum &= 0x000000ff;
-    MSG_TRACE("Checksum=" << std::setw(2) << std::setfill('0') << std::hex << sum << ", #bytes=" << len << " bytes.");
+    MSG_DEBUG("Checksum=" << std::setw(2) << std::setfill('0') << std::hex << sum << ", #bytes=" << len << " bytes.");
     return (unsigned char)sum;
+}
 uint16_t TAmxNet::makeWord(unsigned char b1, unsigned char b2)
+{
     map<ulong, FUNC_TIMER_t>::iterator iter;
     for (iter = mFuncsTimer.begin(); iter != mFuncsTimer.end(); iter++)
         iter->second.func(blink);
+}
+void TAmxNet::setWaitTime(int secs)
+{
+    DECL_TRACER("TAmxNet::setWaitTime(int secs)");
+    if (secs <= 0 || secs > 300)    // Maximal 5 minutes
+        return;
+    mOldWaitTime = mWaitTime;
+    mWaitTime = secs;
+}
+int TAmxNet::swapWaitTime()
+{
+    DECL_TRACER("TAmxNet::restoreWaitTime()");
+    int wt = mWaitTime;
+    mWaitTime = mOldWaitTime;
+    mOldWaitTime = wt;
+    return mWaitTime;
+}

Subversion Repositories tpanel

(root)/trunk/tamxnet.cpp @ 103 – Rev 92 → 93