Updated ChangeLog.txt

ChangeLog.txt

@@ -1,6 +1,17 @@
-v0.01.04 (WIP)
+v0.03.00 (WIP)
 --------------
 
+v0.02.00
+--------
+* Removed unneeded files causing linker warnings on OSX.  Updated gitignore.
+* Fixes RUDP BEH_Socket test failure.
+* Fixes RudpSocket::SentLength(): Assertion  and added error handling in Rudptransport.
+* Warning free transport on linux.
+* Enabled effc++ for all files.
+* Merge branch 'nat_detection' into next.
+* Fixed bug in TcpConnection::CheckTimeout.
+*
+
 v0.01.03
 --------------
 * Updated ctest config file in sync with project name change.

src/maidsafe/transport/contact.h

@@ -38,7 +38,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/transport.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/log.h

@@ -17,7 +17,7 @@
 #include "maidsafe/common/log.h"
 
 #undef LOG
-#define LOG(severity) COMPACT_GOOGLE_LOG_ ## severity(transport, :).stream()
+#define LOG(severity) MAIDSAFE_LOG(transport, severity)
 
 #endif  // MAIDSAFE_TRANSPORT_LOG_H_
 

src/maidsafe/transport/message_handler.h

@@ -38,7 +38,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/transport.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/nat_detection.h

@@ -35,7 +35,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "maidsafe/transport/contact.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/nat_detection_service.h

@@ -112,13 +112,14 @@ class NatDetectionService : public std::enable_shared_from_this<NatDetectionServ
 
   void SetNatDetectionResponse(
       protobuf::NatDetectionResponse *nat_detection_response,
-     const Endpoint &endpoint, const NatType &nat_type);
+     const Endpoint &endpoint,
+     const NatType &nat_type);
 
   void SetRendezvousRequest(protobuf::RendezvousRequest *rendezvous_request,
                             const Endpoint &proxy);
 
   virtual bool DirectlyConnected(const protobuf::NatDetectionRequest &request,
-                         const Endpoint &endpoint);
+                                 const Endpoint &endpoint);
   // Proxy to Rendezvous
   void SendForwardRendezvousRequest(const Endpoint &rendezvous,
                                     const Endpoint &originator,

src/maidsafe/transport/nat_traversal.h

@@ -35,7 +35,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/version.h"
 #include "maidsafe/transport/transport.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/rudp_acceptor.h

@@ -97,7 +97,9 @@ class RudpAcceptor {
 
   // A connection request that is yet to be processed by the acceptor.
   struct PendingRequest {
-    PendingRequest() : remote_id(0), remote_endpoint() {}
+    PendingRequest()
+        : remote_id(0),
+          remote_endpoint() {}
     boost::uint32_t remote_id;
     boost::asio::ip::udp::endpoint remote_endpoint;
   };

src/maidsafe/transport/rudp_data_packet.cc

@@ -46,8 +46,7 @@ RudpDataPacket::RudpDataPacket()
     message_number_(0),
     time_stamp_(0),
     destination_socket_id_(0),
-    data_() {
-}
+    data_() {}
 
 boost::uint32_t RudpDataPacket::PacketSequenceNumber() const {
   return packet_sequence_number_;

src/maidsafe/transport/rudp_dispatch_op.h

@@ -113,6 +113,10 @@ class RudpDispatchOp {
   }
 
  private:
+  // Disallow copying and assignment.
+//  RudpDispatchOp(const RudpDispatchOp&);
+//  RudpDispatchOp &operator=(const RudpDispatchOp&);
+
   DispatchHandler handler_;
   boost::asio::ip::udp::socket *socket_;
   boost::asio::mutable_buffer buffer_;

src/maidsafe/transport/rudp_dispatcher.cc

@@ -46,8 +46,8 @@ namespace maidsafe {
 namespace transport {
 
 RudpDispatcher::RudpDispatcher()
-  : acceptor_(0),
-    sockets_() {
+    : acceptor_(0),
+      sockets_() {
 }
 
 RudpAcceptor *RudpDispatcher::GetAcceptor() const {

src/maidsafe/transport/rudp_flush_op.h

@@ -85,6 +85,10 @@ class RudpFlushOp {
   }
 
  private:
+  // Disallow copying and assignment.
+//  RudpFlushOp(const RudpFlushOp&);
+//  RudpFlushOp &operator=(const RudpFlushOp&);
+
   FlushHandler handler_;
   const boost::system::error_code *ec_;
 };

src/maidsafe/transport/rudp_message_handler.h

@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/message_handler.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/rudp_parameters.h

@@ -35,7 +35,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/common/utils.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/rudp_sender.cc

@@ -53,8 +53,7 @@ RudpSender::RudpSender(RudpPeer &peer,  // NOLINT (Fraser)
     tick_timer_(tick_timer),
     congestion_control_(congestion_control),
     unacked_packets_(),
-    send_timeout_() {
-}
+    send_timeout_() {}
 
 boost::uint32_t RudpSender::GetNextPacketSequenceNumber() const {
   return unacked_packets_.End();

src/maidsafe/transport/rudp_sliding_window.h

@@ -57,9 +57,10 @@ class RudpSlidingWindow {
 
   // Construct to start with a specified sequence number.
   explicit RudpSlidingWindow(boost::uint32_t initial_sequence_number)
-      : items_(), maximum_size_(0), begin_(0), end_(0) {
-    Reset(initial_sequence_number);
-  }
+      : items_(),
+        maximum_size_(RudpParameters::default_window_size),
+        begin_(initial_sequence_number),
+        end_(initial_sequence_number) {}
 
   // Reset to empty starting with the specified sequence number.
   void Reset(boost::uint32_t initial_sequence_number) {

src/maidsafe/transport/rudp_socket.h

@@ -45,6 +45,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "boost/asio/io_service.hpp"
 #include "boost/asio/ip/udp.hpp"
 #include "boost/cstdint.hpp"
+
 #include "maidsafe/transport/transport.h"
 #include "maidsafe/transport/rudp_ack_packet.h"
 #include "maidsafe/transport/rudp_ack_of_ack_packet.h"

src/maidsafe/transport/rudp_transport.h

@@ -41,7 +41,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/rudp_parameters.h"
 #include "maidsafe/transport/message_handler.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/tcp_transport.h

@@ -38,7 +38,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/transport.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/tests/transport_api_test.h

@@ -140,6 +140,7 @@ class RUDPSingleTransportAPITest : public TransportAPITest<RudpTransport> {
  public:
   RUDPSingleTransportAPITest() {}
   void RestoreRUDPGlobalSettings();
+  virtual ~RUDPSingleTransportAPITest() {}
 };
 
 class RUDPConfigurableTransportAPITest

src/maidsafe/transport/transport.h

@@ -47,7 +47,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/version.h"
 
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/udp_transport.cc

@@ -56,7 +56,6 @@ UdpTransport::UdpTransport(asio::io_service &asio_service)  // NOLINT
   // If a UdpTransport is restarted and listens on the same port number as
   // before, it may receive late replies intended for the previous incarnation.
   // To avoid this, we use a random number as the first request id.
-  next_request_id_ = maidsafe::RandomUint32();
   next_request_id_ <<= 32;
   bptime::time_duration time = maidsafe::GetDurationSinceEpoch();
   next_request_id_ |= time.total_microseconds() & 0xffffffff;

src/maidsafe/transport/udp_transport.h

@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "maidsafe/transport/transport.h"
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/utils.h

@@ -44,7 +44,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "maidsafe/transport/version.h"
 
-#if MAIDSAFE_TRANSPORT_VERSION != 104
+#if MAIDSAFE_TRANSPORT_VERSION != 200
 #  error This API is not compatible with the installed library.\
     Please update the maidsafe-transport library.
 #endif

src/maidsafe/transport/version.h

@@ -28,7 +28,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef MAIDSAFE_TRANSPORT_VERSION_H_
 #define MAIDSAFE_TRANSPORT_VERSION_H_
 
-#define MAIDSAFE_TRANSPORT_VERSION 104
+#define MAIDSAFE_TRANSPORT_VERSION 200
 
 #if defined CMAKE_MAIDSAFE_TRANSPORT_VERSION &&\
             MAIDSAFE_TRANSPORT_VERSION != CMAKE_MAIDSAFE_TRANSPORT_VERSION