Changeset 86 in flair-src for branches/mavlink/tools/Controller/Mavlink/src/Forwarder.cpp

Timestamp:

09/28/16 08:36:04 (7 years ago)

Author:

Thomas Fuhrmann

Message:

FlairSockets are working and used

File:

• branches/mavlink/tools/Controller/Mavlink/src/Forwarder.cpp (modified) (2 diffs)

branches/mavlink/tools/Controller/Mavlink/src/Forwarder.cpp

@@ -38 +38 @@
   // cout << "MavPlanner Forwarder output address : " << tmpOutput << endl;
 
-  cout << "input socket : " << inputAddress + ":" + to_string(inputPort) << endl;
-  cout << "output socket : " << outputAddress + ":" + to_string(outputPort) << endl;
+  // cout << "input socket : " << inputAddress + ":" + to_string(inputPort) << endl;
+  // cout << "output socket : " << outputAddress + ":" + to_string(outputPort) << endl;
 
-  inputSocket = new Socket((Thread *)this, "input socket", inputAddress + ":" + to_string(inputPort));
+  inputSocket = new Socket((Thread *)this, "input socket", inputPort);
   outputSocket = new Socket((Thread *)this, "output socket", outputAddress + ":" + to_string(outputPort));
 }
@@ -55 +55 @@
   }
   int recvDataSize = 0;
-  char* srcBuffer;
-  size_t srcSize;
+  char inputBuffer[200];
   while (!ToBeStopped()) {
-    // Thread::SleepMS(2000);
-    // TIME_NONBLOCK
-    recvDataSize = inputSocket->RecvMessage(inputBuffer, 200, 5000000000, srcBuffer, &srcSize);
-    cout << "Forwarder message received, size="<< recvDataSize << endl;
-        outputSocket->SendMessage(inputBuffer, recvDataSize);
+    recvDataSize = inputSocket->RecvMessage(inputBuffer, 200, 1000000000);
+          outputSocket->SendMessage(inputBuffer, recvDataSize);
   }
 }