Attachment #432 for bug #491

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

(-)a/examples/emu-ping.cc (-4 / +1 lines)

Lines 103-112 main (int argc, char *argv[])	Link Here

103

  // Since we are going to be talking to real-world machines, we need to enable

103

  // Since we are going to be talking to real-world machines, we need to enable

104

  // calculation of checksums in our protocols.

104

  // calculation of checksums in our protocols.

105

//

105

//

106

  Config::SetDefault ("ns3::Ipv4L3Protocol::CalcChecksum", BooleanValue (true));

106

  System ()->SetAttribute ("CalcChecksum", BooleanValue (true));

107

  Config::SetDefault ("ns3::Icmpv4L4Protocol::CalcChecksum", BooleanValue (true));

108

  Config::SetDefault ("ns3::TcpL4Protocol::CalcChecksum", BooleanValue (true));

109

  Config::SetDefault ("ns3::UdpL4Protocol::CalcChecksum", BooleanValue (true));

110

107

111

//

108

//

112

  // In such a simple topology, the use of the helper API can be a hindrance

109

  // In such a simple topology, the use of the helper API can be a hindrance

(-)a/src/applications/v4ping/v4ping.cc (+27 lines)

Lines 1-3	Link Here

/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */

/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation;

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

#include "v4ping.h"

#include "v4ping.h"

#include "ns3/icmpv4.h"

#include "ns3/icmpv4.h"

#include "ns3/assert.h"

#include "ns3/assert.h"

Lines 9-14	Link Here

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/trace-source-accessor.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/system-object.h"

#include "ns3/boolean.h"

namespace ns3 {

namespace ns3 {

Lines 165-170 V4Ping::StartApplication (void)	Link Here

165

  Icmpv4Header header;

183

  Icmpv4Header header;

166

  header.SetType (Icmpv4Header::ECHO);

184

  header.SetType (Icmpv4Header::ECHO);

167

  header.SetCode (0);

185

  header.SetCode (0);

186

187

  BooleanValue b;

188

  System ()->GetAttribute ("CalcChecksum", b);

189

190

  if (b.Get ())

191

192

	header.EnableChecksum ();

193

194

168

  p->AddHeader (header);

195

  p->AddHeader (header);

169

  m_socket->Send (p, 0);

196

  m_socket->Send (p, 0);

170

197

(-)74983e885cdd (+1 lines)

Added	Link Here

exec "`dirname "$0"`"/../../../waf "$@"




/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2009 University of Washington
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "log.h"
#include "assert.h"
#include "abort.h"
#include "singleton.h"
#include "object.h"
#include "system-object.h"
#include "boolean.h"

namespace ns3 {

NS_LOG_COMPONENT_DEFINE ("SystemObject");

Ptr<Object>
System (void)
{
  return Singleton<SystemObject>::Get ();
}

TypeId 
SystemObject::GetTypeId (void)
{
  static TypeId tid = TypeId ("ns3::SystemObject")
    .SetParent<Object> ()
    .AddAttribute ("CalcChecksum", 
                   "Enable (true) or disable (false) calculation of protocol checksums system-wide.",
                   BooleanValue (false),
                   MakeBooleanAccessor (&SystemObject::m_calcChecksum),
                   MakeBooleanChecker ())
    ;
  return tid;
}

SystemObject::SystemObject ()
{
}

SystemObject::~SystemObject ()
{
}

} //namespace ns3





/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2009 University of Washington
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#ifndef SYSTEM_OBJECT_H
#define SYSTEM_OBJECT_H

#include "object.h"

namespace ns3 {

Ptr<Object> System (void);

class SystemObject : public Object 
{
public:
  static TypeId GetTypeId (void);

  SystemObject ();
  virtual ~SystemObject ();

private:
  bool m_calcChecksum;
};

} // namespace ns3

#endif // SYSTEM_OBJECT_H

(-)a/src/core/wscript (+2 lines)

Lines 78-83 def build(bld):	Link Here

        'config.cc',

        'config.cc',

        'callback.cc',

        'callback.cc',

        'names.cc',

        'names.cc',

        'system-object.cc',

    headers = bld.new_task_gen('ns3header')

    headers = bld.new_task_gen('ns3header')

Lines 123-128 def build(bld):	Link Here

123

        'deprecated.h',

124

        'deprecated.h',

124

        'abort.h',

125

        'abort.h',

125

        'names.h',

126

        'names.h',

127

        'system-object.h',

126

128

127

129

128

    if sys.platform == 'win32':

130

    if sys.platform == 'win32':




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

#include "icmpv4-l4-protocol.h"
#include "ipv4-interface.h"
#include "ipv4-l3-protocol.h"

#include "ns3/node.h"
#include "ns3/packet.h"
#include "ns3/boolean.h"
#include "ns3/system-object.h"

namespace ns3 {


  Icmpv4Header icmp;
  icmp.SetType (type);
  icmp.SetCode (code);

  BooleanValue b;
  System ()->GetAttribute ("CalcChecksum", b);

  if (m_calcChecksum || b.Get ())
    {
      icmp.EnableChecksum ();
    }

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

Lines 1-5	Link Here

/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */

/*

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation;

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

*/

#include "icmpv4.h"

#include "icmpv4.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/system-object.h"

#include "ns3/boolean.h"

namespace ns3 {

namespace ns3 {

Lines 45-51 Icmpv4Header::Serialize (Buffer::Iterato	Link Here

  i.WriteU8 (m_type);

  i.WriteU8 (m_type);

  i.WriteU8 (m_code);

  i.WriteU8 (m_code);

  i.WriteHtonU16 (0);

  i.WriteHtonU16 (0);

  if (m_calcChecksum)

  BooleanValue b;

  System ()->GetAttribute ("CalcChecksum", b);

  if (m_calcChecksum || b.Get ())

      i = start;

      i = start;

      uint16_t checksum = i.CalculateIpChecksum (i.GetSize ());

      uint16_t checksum = i.CalculateIpChecksum (i.GetSize ());

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

Lines 31-36	Link Here

#include "ns3/object-vector.h"

#include "ns3/object-vector.h"

#include "ns3/ipv4-header.h"

#include "ns3/ipv4-header.h"

#include "ns3/boolean.h"

#include "ns3/boolean.h"

#include "ns3/system-object.h"

#include "arp-l3-protocol.h"

#include "arp-l3-protocol.h"

#include "ipv4-l3-protocol.h"

#include "ipv4-l3-protocol.h"

Lines 548-554 Ipv4L3Protocol::Receive( Ptr<NetDevice>	Link Here

548

      index++;

549

      index++;

549

550

  Ipv4Header ipHeader;

551

  Ipv4Header ipHeader;

551

  if (m_calcChecksum)

552

553

  BooleanValue b;

554

  System ()->GetAttribute ("CalcChecksum", b);

555

556

  if (m_calcChecksum || b.Get ())

552

557

553

      ipHeader.EnableChecksum ();

558

      ipHeader.EnableChecksum ();

554

559

Lines 604-610 Ipv4L3Protocol::Send (Ptr<Packet> packet	Link Here

604

609

605

  Ipv4Header ipHeader;

610

  Ipv4Header ipHeader;

606

611

607

  if (m_calcChecksum)

612

  BooleanValue b;

613

  System ()->GetAttribute ("CalcChecksum", b);

614

615

  if (m_calcChecksum || b.Get ())

608

616

609

      ipHeader.EnableChecksum ();

617

      ipHeader.EnableChecksum ();

610

618

(-)a/src/internet-stack/tcp-header.cc (-1 / +6 lines)

Lines 24-29	Link Here

#include "tcp-header.h"

#include "tcp-header.h"

#include "ns3/buffer.h"

#include "ns3/buffer.h"

#include "ns3/address-utils.h"

#include "ns3/address-utils.h"

#include "ns3/system-object.h"

#include "ns3/boolean.h"

namespace ns3 {

namespace ns3 {

Lines 216-222 void TcpHeader::Serialize (Buffer::Itera	Link Here

216

  i.WriteHtonU16 (0);

218

  i.WriteHtonU16 (0);

217

  i.WriteHtonU16 (m_urgentPointer);

219

  i.WriteHtonU16 (m_urgentPointer);

218

220

219

  if(m_calcChecksum)

221

  BooleanValue b;

222

  System ()->GetAttribute ("CalcChecksum", b);

223

224

  if(m_calcChecksum || b.Get ())

220

225

221

    uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

226

    uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

222

    i = start;

227

    i = start;

(-)a/src/internet-stack/tcp-l4-protocol.cc (-3 / +16 lines)

Lines 22-27	Link Here

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/boolean.h"

#include "ns3/boolean.h"

#include "ns3/system-object.h"

#include "ns3/object-vector.h"

#include "ns3/object-vector.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

Lines 452-458 TcpL4Protocol::Receive (Ptr<Packet> pack	Link Here

452

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

453

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

453

454

  TcpHeader tcpHeader;

455

  TcpHeader tcpHeader;

455

  if(m_calcChecksum)

456

457

  BooleanValue b;

458

  System ()->GetAttribute ("CalcChecksum", b);

459

460

  if(m_calcChecksum || b.Get ())

456

461

457

    tcpHeader.EnableChecksums();

462

    tcpHeader.EnableChecksums();

458

    tcpHeader.InitializeChecksum (source, destination, PROT_NUMBER);

463

    tcpHeader.InitializeChecksum (source, destination, PROT_NUMBER);

Lines 504-510 TcpL4Protocol::Send (Ptr<Packet> packet,	Link Here

504

  TcpHeader tcpHeader;

509

  TcpHeader tcpHeader;

505

  tcpHeader.SetDestinationPort (dport);

510

  tcpHeader.SetDestinationPort (dport);

506

  tcpHeader.SetSourcePort (sport);

511

  tcpHeader.SetSourcePort (sport);

507

  if(m_calcChecksum)

512

513

  BooleanValue b;

514

  System ()->GetAttribute ("CalcChecksum", b);

515

516

  if(m_calcChecksum || b.Get ())

508

517

509

    tcpHeader.EnableChecksums();

518

    tcpHeader.EnableChecksums();

510

519

Lines 538-544 TcpL4Protocol::SendPacket (Ptr<Packet> p	Link Here

538

547

539

  outgoingHeader.SetLength (5); //header length in units of 32bit words

548

  outgoingHeader.SetLength (5); //header length in units of 32bit words

540

  /* outgoingHeader.SetUrgentPointer (0); //XXX */

549

  /* outgoingHeader.SetUrgentPointer (0); //XXX */

541

  if(m_calcChecksum)

550

551

  BooleanValue b;

552

  System ()->GetAttribute ("CalcChecksum", b);

553

554

  if(m_calcChecksum || b.Get ())

542

555

543

    outgoingHeader.EnableChecksums();

556

    outgoingHeader.EnableChecksums();

544

557

(-)a/src/internet-stack/udp-header.cc (-2 / +10 lines)

Lines 20-25	Link Here

#include "udp-header.h"

#include "udp-header.h"

#include "ns3/address-utils.h"

#include "ns3/address-utils.h"

#include "ns3/system-object.h"

#include "ns3/boolean.h"

namespace ns3 {

namespace ns3 {

Lines 143-149 UdpHeader::Serialize (Buffer::Iterator s	Link Here

143

  i.WriteHtonU16 (start.GetSize ());

145

  i.WriteHtonU16 (start.GetSize ());

144

  i.WriteU16 (0);

146

  i.WriteU16 (0);

145

147

146

  if (m_calcChecksum)

148

  BooleanValue b;

149

  System ()->GetAttribute ("CalcChecksum", b);

150

151

  if (m_calcChecksum || b.Get ())

147

152

148

      uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

153

      uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

149

      i = start;

154

      i = start;

Lines 163-169 UdpHeader::Deserialize (Buffer::Iterator	Link Here

163

  m_payloadSize = i.ReadNtohU16 () - GetSerializedSize ();

168

  m_payloadSize = i.ReadNtohU16 () - GetSerializedSize ();

164

  i.Next (2);

169

  i.Next (2);

165

170

166

  if(m_calcChecksum)

171

  BooleanValue b;

172

  System ()->GetAttribute ("CalcChecksum", b);

173

174

  if(m_calcChecksum || b.Get ())

167

175

168

      uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

176

      uint16_t headerChecksum = CalculateHeaderChecksum (start.GetSize ());

169

      i = start;

177

      i = start;

(-)a/src/internet-stack/udp-l4-protocol.cc (-2 / +11 lines)

Lines 23-28	Link Here

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/node.h"

#include "ns3/node.h"

#include "ns3/boolean.h"

#include "ns3/boolean.h"

#include "ns3/system-object.h"

#include "udp-l4-protocol.h"

#include "udp-l4-protocol.h"

#include "udp-header.h"

#include "udp-header.h"

Lines 180-186 UdpL4Protocol::Receive(Ptr<Packet> packe	Link Here

180

181

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

182

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

182

  UdpHeader udpHeader;

183

  UdpHeader udpHeader;

183

  if(m_calcChecksum)

184

185

  BooleanValue b;

186

  System ()->GetAttribute ("CalcChecksum", b);

187

188

  if(m_calcChecksum || b.Get ())

184

189

185

    udpHeader.EnableChecksums();

190

    udpHeader.EnableChecksums();

186

191

Lines 218-224 UdpL4Protocol::Send (Ptr<Packet> packet,	Link Here

218

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

223

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

219

224

220

  UdpHeader udpHeader;

225

  UdpHeader udpHeader;

221

  if(m_calcChecksum)

226

227

  BooleanValue b;

228

  System ()->GetAttribute ("CalcChecksum", b);

229

230

  if(m_calcChecksum || b.Get ())

222

231

223

    udpHeader.EnableChecksums();

232

    udpHeader.EnableChecksums();

224

    udpHeader.InitializeChecksum (saddr,

233

    udpHeader.InitializeChecksum (saddr,

(-)a/src/node/ipv4-header.cc (-1 / +7 lines)

Lines 21-26	Link Here

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/header.h"

#include "ns3/header.h"

#include "ns3/system-object.h"

#include "ns3/boolean.h"

#include "ipv4-header.h"

#include "ipv4-header.h"

NS_LOG_COMPONENT_DEFINE ("Ipv4Header");

NS_LOG_COMPONENT_DEFINE ("Ipv4Header");

Lines 264-270 Ipv4Header::Serialize (Buffer::Iterator	Link Here

264

  i.WriteHtonU32 (m_source.Get ());

267

  i.WriteHtonU32 (m_source.Get ());

265

  i.WriteHtonU32 (m_destination.Get ());

268

  i.WriteHtonU32 (m_destination.Get ());

266

269

267

  if (m_calcChecksum)

270

  BooleanValue b;

271

  System ()->GetAttribute ("CalcChecksum", b);

272

273

  if (m_calcChecksum || b.Get ())

268

274

269

      i = start;

275

      i = start;

270

      uint16_t checksum = i.CalculateIpChecksum(20);

276

      uint16_t checksum = i.CalculateIpChecksum(20);

Return to bug 491