Changeset 387 in flair-src for trunk

Timestamp:

Dec 21, 2020, 2:49:53 PM (4 years ago)

Author:

Sanahuja Guillaume

Message:

resolve bug with udp broadcast

Location:

trunk

Files:

• ReleaseNotes (modified) (1 diff)
• lib/FlairCore/src/UdpSocket.cpp (modified) (1 diff)
• lib/FlairCore/src/UdpSocket.h (modified) (1 diff)
• lib/FlairCore/src/UdpSocket_impl.cpp (modified) (2 diffs)
• lib/FlairCore/src/unexported/UdpSocket_impl.h (modified) (1 diff)

trunk/ReleaseNotes

@@ -1 +1 @@
 * Actual Version:
+
+- resolved bug with UdpSocket broadcast
+
+-----------------------------------------------------------
+* Tag 0.3.1:
 
 - added preliminary support for ugv and parrot sumo

trunk/lib/FlairCore/src/UdpSocket.cpp

@@ -43 +43 @@
 }
 
-void UdpSocket::SendMessage(string message) { pimpl_->SendMessage(message); }
+void UdpSocket::SendMessage(string message,int dst_id) { pimpl_->SendMessage(message,dst_id); }
 
 ssize_t UdpSocket::RecvMessage(char *buf, size_t buf_len, Time timeout, char *src,

trunk/lib/FlairCore/src/UdpSocket.h

@@ -66 +66 @@
   *
   * \param message message
+  * \param dst_id id of the dst if multiple connection (quick and dirty hack for sido, only works on NRT)
   */
-  void SendMessage(std::string message);
+  void SendMessage(std::string message,int dst_id=0);
 
   /*!

trunk/lib/FlairCore/src/UdpSocket_impl.cpp

@@ -192 +192 @@
 }
 
-void UdpSocket_impl::SendMessage(string message) {
+void UdpSocket_impl::SendMessage(string message,int dst_id) {
   ssize_t written;
 
@@ -208 +208 @@
   }
 #else
-  written = sendto(fd, message.c_str(), message.size(), 0, (struct sockaddr *)&sock_in, sizeof(struct sockaddr_in));
+  written = sendto(fd, message.c_str(), message.size(), 0,(struct sockaddr *)&(sock_in[dst_id]), sizeof(struct sockaddr_in));
   if (written != (ssize_t)message.size()) {
-    self->Err("sendto error\n");
+    self->Err("sendto error %i/%i\n",written,(ssize_t)message.size());
   }
 

trunk/lib/FlairCore/src/unexported/UdpSocket_impl.h

@@ -32 +32 @@
   ~UdpSocket_impl();
 
-  void SendMessage(std::string message);
+  void SendMessage(std::string message,int dst_id);
   void SendMessage(const char *msg, size_t msg_len,int dst_id);
   ssize_t RecvMessage(char *msg, size_t msg_len, flair::core::Time timeout,