-/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/log.h"
#include "xbt/sysdep.h"
+#include <ns3/ipv4-address-helper.h>
+#include <ns3/point-to-point-helper.h>
+
#include <algorithm>
std::map<std::string, SgFlow*> flowFromSock; // ns3::sock -> SgFlow
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
-SgFlow::SgFlow(uint32_t totalBytes, simgrid::surf::NetworkNS3Action* action)
+SgFlow::SgFlow(uint32_t totalBytes, simgrid::kernel::resource::NetworkNS3Action* action)
{
totalBytes_ = totalBytes;
remaining_ = totalBytes;
/* While not all is buffered and there remain space in the buffers */
while (flow->bufferedBytes_ < flow->totalBytes_ && sock->GetTxAvailable() > 0) {
- uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable()});
+ // Send at most 1040 bytes (data size in a TCP packet), as NS3 seems to not split correctly by itself
+ uint32_t toWrite = std::min({flow->remaining_, sock->GetTxAvailable(), std::uint32_t(1040)});
if (toWrite == 0) { // buffer full
XBT_DEBUG("%f: buffer full on flow %p (still %u to go)", ns3::Simulator::Now().GetSeconds(), flow,
flow->remaining_);