Attachment #462 for bug #491

View | Details | Raw Unified | Return to bug 491
Collapse All | Expand All

(-)a/src/internet-stack/icmpv4-l4-protocol.cc (-1 / +1 lines)

Lines 111-117	Link Here

111

  Icmpv4Header icmp;

111

  Icmpv4Header icmp;

112

  icmp.SetType (type);

112

  icmp.SetType (type);

113

  icmp.SetCode (code);

113

  icmp.SetCode (code);

114

  if (m_calcChecksum)

114

  if (m_calcChecksum || Node::ChecksumEnabled ())

115

116

      icmp.EnableChecksum ();

116

      icmp.EnableChecksum ();

117

(-)a/src/internet-stack/ipv4-l3-protocol.cc (-2 / +2 lines)

Lines 401-407	Link Here

401

402

403

  Ipv4Header ipHeader;

403

  Ipv4Header ipHeader;

404

  if (m_calcChecksum)

404

  if (m_calcChecksum || Node::ChecksumEnabled ())

405

406

      ipHeader.EnableChecksum ();

406

      ipHeader.EnableChecksum ();

407

Lines 588-594	Link Here

588

      ipHeader.SetIdentification (m_identification);

588

      ipHeader.SetIdentification (m_identification);

589

      m_identification ++;

589

      m_identification ++;

590

591

  if (m_calcChecksum)

591

  if (m_calcChecksum || Node::ChecksumEnabled ())

592

593

      ipHeader.EnableChecksum ();

593

      ipHeader.EnableChecksum ();

594




  NS_LOG_FUNCTION (this << packet << source << destination << incomingInterface);

  TcpHeader tcpHeader;
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    tcpHeader.EnableChecksums();
    tcpHeader.InitializeChecksum (source, destination, PROT_NUMBER);

  TcpHeader tcpHeader;
  tcpHeader.SetDestinationPort (dport);
  tcpHeader.SetSourcePort (sport);
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    tcpHeader.EnableChecksums();
  }


  outgoingHeader.SetLength (5); //header length in units of 32bit words
  /* outgoingHeader.SetUrgentPointer (0); //XXX */
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    outgoingHeader.EnableChecksums();
  }




{
  NS_LOG_FUNCTION (this << packet << source << destination);
  UdpHeader udpHeader;
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    udpHeader.EnableChecksums();
  }

  NS_LOG_FUNCTION (this << packet << saddr << daddr << sport << dport);

  UdpHeader udpHeader;
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    udpHeader.EnableChecksums();
    udpHeader.InitializeChecksum (saddr,

  NS_LOG_FUNCTION (this << packet << saddr << daddr << sport << dport);

  UdpHeader udpHeader;
  if(m_calcChecksum || Node::ChecksumEnabled ())
  {
    udpHeader.EnableChecksums();
    udpHeader.InitializeChecksum (saddr,

(-)a/src/node/node.cc (+15 lines)

Lines 28-33	Link Here

#include "ns3/uinteger.h"

#include "ns3/uinteger.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "ns3/global-value.h"

#include "ns3/boolean.h"

NS_LOG_COMPONENT_DEFINE ("Node");

NS_LOG_COMPONENT_DEFINE ("Node");

Lines 35-40	Link Here

NS_OBJECT_ENSURE_REGISTERED (Node);

NS_OBJECT_ENSURE_REGISTERED (Node);

GlobalValue g_checksumEnabled  = GlobalValue ("ChecksumEnabled",

                                              "A global switch to enable all checksums for all protocols",

                                              BooleanValue (false),

                                              MakeBooleanChecker ());

TypeId

TypeId

Node::GetTypeId (void)

Node::GetTypeId (void)

Lines 223-228	Link Here

223

230

224

231

225

bool

232

bool

233

Node::ChecksumEnabled (void)

234

235

  BooleanValue val;

236

  g_checksumEnabled.GetValue (val);

237

  return val.Get ();

238

239

240

bool

226

Node::PromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,

241

Node::PromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet> packet, uint16_t protocol,

227

                                const Address &from, const Address &to, NetDevice::PacketType packetType)

242

                                const Address &from, const Address &to, NetDevice::PacketType packetType)

228

243

(-)a/src/node/node.h (+6 lines)

Lines 172-177	Link Here

172

*/

172

*/

173

  void UnregisterProtocolHandler (ProtocolHandler handler);

173

  void UnregisterProtocolHandler (ProtocolHandler handler);

174

175

176

/**

177

   * \returns true if checksums are enabled, false otherwise.

178

*/

179

  static bool ChecksumEnabled (void);

180

175

181

176

protected:

182

protected:

177

/**

183

/**

Return to bug 491