src/common/packet-history.cc
author Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Wed, 06 Jun 2007 12:39:33 +0200
changeset 855 6b27e6180fcb
parent 854 cbe6790bf9fa
child 856 007981962639
permissions -rw-r--r--
implement ReplaceTail
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     1
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     2
/*
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     3
 * Copyright (c) 2006,2007 INRIA
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     4
 * All rights reserved.
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     5
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     6
 * This program is free software; you can redistribute it and/or modify
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     7
 * it under the terms of the GNU General Public License version 2 as
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     8
 * published by the Free Software Foundation;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
     9
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    10
 * This program is distributed in the hope that it will be useful,
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    13
 * GNU General Public License for more details.
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    14
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    16
 * along with this program; if not, write to the Free Software
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    17
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    18
 *
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    19
 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    20
 */
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    21
#include <utility>
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    22
#include <list>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    23
#include "ns3/assert.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    24
#include "ns3/fatal-error.h"
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
    25
#include "ns3/debug.h"
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    26
#include "packet-history.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    27
#include "chunk.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    28
#include "buffer.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
    29
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
    30
NS_DEBUG_COMPONENT_DEFINE ("PacketHistory");
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
    31
834
f8f1606047e0 remove dead typedef
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 833
diff changeset
    32
#define USE_ULEB 1
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
    33
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    34
namespace {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    35
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    36
class ItemList
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    37
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    38
public:
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    39
  void InitPayload (uint32_t packetUid, uint32_t size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    40
  void AddHeader (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    41
  void AddTrailer (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    42
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    43
  void RemHeader (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    44
  void RemTrailer (uint32_t type, uint32_t size);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    45
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    46
  void RemAtStart (uint32_t toRemove);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    47
  void RemAtEnd (uint32_t toRemove);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    48
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    49
  void AddAtEnd (ItemList const *other);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    50
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    51
  void Print (std::ostream &os, ns3::Buffer buffer, const ns3::PacketPrinter &printer) const;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
    52
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    53
private:
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    54
  enum Type {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    55
    PAYLOAD,
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    56
    HEADER,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    57
    TRAILER,
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    58
  };
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    59
  struct Item
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    60
  {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    61
    enum ItemList::Type m_type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    62
    uint32_t m_size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    63
    uint32_t m_chunkType;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    64
    uint32_t m_fragmentStart;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    65
    uint32_t m_fragmentEnd;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    66
    uint32_t m_packetUid;
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    67
    uint32_t m_chunkUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    68
  };
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    69
  std::list<Item> m_itemList;
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    70
  uint32_t m_packetUid;
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    71
  uint32_t m_chunkUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    72
};
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    73
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    74
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    75
void 
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    76
ItemList::InitPayload (uint32_t packetUid, uint32_t size)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    77
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    78
  NS_ASSERT (m_itemList.empty ());
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    79
  m_packetUid = packetUid;
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    80
  m_chunkUid = 1;
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    81
  if (size > 0)
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    82
    {
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    83
      struct Item item;
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    84
      item.m_type = ItemList::PAYLOAD;
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    85
      item.m_chunkType = 0;
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    86
      item.m_size = size;
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    87
      item.m_fragmentStart = 0;
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    88
      item.m_fragmentEnd = item.m_size;
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    89
      item.m_packetUid = m_packetUid;
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
    90
      item.m_chunkUid = m_chunkUid;
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    91
      m_itemList.push_back (item);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
    92
    }
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    93
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    94
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    95
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    96
ItemList::AddHeader (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    97
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
    98
  struct Item item;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
    99
  item.m_type = ItemList::HEADER;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   100
  item.m_chunkType = type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   101
  item.m_size = size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   102
  item.m_fragmentStart = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   103
  item.m_fragmentEnd = size;
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
   104
  item.m_packetUid = m_packetUid;
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   105
  item.m_chunkUid = m_chunkUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   106
  m_itemList.push_front (item);
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   107
  m_chunkUid++;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   108
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   109
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   110
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   111
ItemList::AddTrailer (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   112
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   113
  struct Item item;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   114
  item.m_type = ItemList::TRAILER;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   115
  item.m_chunkType = type;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   116
  item.m_size = size;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   117
  item.m_fragmentStart = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   118
  item.m_fragmentEnd = size;
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
   119
  item.m_packetUid = m_packetUid;
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   120
  item.m_chunkUid = m_chunkUid;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   121
  m_itemList.push_back (item);
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   122
  m_chunkUid++;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   123
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   124
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   125
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   126
ItemList::RemHeader (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   127
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   128
  struct Item item = m_itemList.front ();
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   129
  if (item.m_type != ItemList::HEADER ||
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   130
      item.m_size != size ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   131
      item.m_chunkType != type)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   132
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   133
      NS_FATAL_ERROR ("Removing Unexpected header");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   134
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   135
  else if (item.m_fragmentStart != 0 ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   136
           item.m_fragmentEnd != item.m_size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   137
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   138
      NS_FATAL_ERROR ("Removing non-complete header");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   139
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   140
  m_itemList.pop_front ();
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   141
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   142
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   143
ItemList::RemTrailer (uint32_t type, uint32_t size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   144
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   145
  struct Item item = m_itemList.back ();
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   146
  if (item.m_type != ItemList::TRAILER ||
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   147
      item.m_size != size ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   148
      item.m_chunkType != type)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   149
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   150
      NS_FATAL_ERROR ("Removing Unexpected trailer");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   151
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   152
  else if (item.m_fragmentStart != 0 ||
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   153
           item.m_fragmentEnd != item.m_size)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   154
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   155
      NS_FATAL_ERROR ("Removing non-complete trailer");
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   156
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   157
  m_itemList.pop_back ();
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   158
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   159
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   160
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   161
ItemList::RemAtStart (uint32_t toRemove)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   162
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   163
  uint32_t leftToRemove = toRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   164
  while (!m_itemList.empty () && leftToRemove > 0)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   165
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   166
      struct Item &item = m_itemList.front ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   167
      uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   168
      if (itemRealSize <= leftToRemove)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   169
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   170
          m_itemList.pop_front ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   171
          leftToRemove -= itemRealSize;
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   172
        }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   173
      else
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   174
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   175
          item.m_fragmentStart += leftToRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   176
          leftToRemove = 0;
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   177
          NS_ASSERT (item.m_size >= item.m_fragmentEnd - item.m_fragmentStart &&
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   178
                     item.m_fragmentStart <= item.m_fragmentEnd);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   179
        }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   180
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   181
  NS_ASSERT (leftToRemove == 0);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   182
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   183
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   184
ItemList::RemAtEnd (uint32_t toRemove)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   185
{
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   186
  uint32_t leftToRemove = toRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   187
  while (!m_itemList.empty () && leftToRemove > 0)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   188
    {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   189
      struct Item &item = m_itemList.back ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   190
      uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   191
      if (itemRealSize <= leftToRemove)
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   192
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   193
          m_itemList.pop_back ();
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
   194
          leftToRemove -= itemRealSize;
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   195
        }
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   196
      else
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   197
        {
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   198
          item.m_fragmentEnd -= leftToRemove;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   199
          leftToRemove = 0;
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   200
        }
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   201
      NS_ASSERT (item.m_size >= item.m_fragmentEnd - item.m_fragmentStart &&
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   202
                 item.m_fragmentStart <= item.m_fragmentEnd &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   203
                 item.m_fragmentEnd <= item.m_size);
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   204
    }
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   205
  NS_ASSERT (leftToRemove == 0);
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   206
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   207
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   208
void 
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   209
ItemList::AddAtEnd (ItemList const *other)
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   210
{
822
bb14a34b3cf8 enable more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 821
diff changeset
   211
  ItemList::Item &last = m_itemList.back ();
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   212
  for (std::list<ItemList::Item>::const_iterator i = other->m_itemList.begin (); 
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   213
       i != other->m_itemList.end (); i++)
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   214
    {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   215
      const ItemList::Item &item = *i;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   216
      if (item.m_packetUid == last.m_packetUid &&
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   217
          item.m_type == last.m_type &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   218
          item.m_chunkType == last.m_chunkType &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   219
          item.m_size == last.m_size &&
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   220
          last.m_fragmentEnd != last.m_size && 
830
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   221
          item.m_fragmentStart == last.m_fragmentEnd &&
0dc81e76166c more tests, fix
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 829
diff changeset
   222
          item.m_chunkUid == last.m_chunkUid)
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   223
        {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   224
          last.m_fragmentEnd = item.m_fragmentEnd;
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   225
        }
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   226
      else
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   227
        {
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   228
          m_itemList.push_back (item);
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   229
        }
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   230
    }
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   231
}
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   232
794
f30d69393a24 implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 792
diff changeset
   233
void 
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   234
ItemList::Print (std::ostream &os, ns3::Buffer buffer, const ns3::PacketPrinter &printer) const
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   235
{
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   236
  uint32_t totalSize = 0;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   237
  for (std::list<ItemList::Item>::const_iterator i = m_itemList.begin (); 
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   238
       i != m_itemList.end (); i++)
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   239
    {
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   240
      ItemList::Item item = *i;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   241
      totalSize += item.m_fragmentEnd - item.m_fragmentStart;
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   242
    }
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   243
  NS_ASSERT (totalSize == buffer.GetSize ());
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   244
  uint32_t offset = 0;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   245
  for (std::list<ItemList::Item>::const_iterator i = m_itemList.begin (); 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   246
       i != m_itemList.end (); i++)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   247
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   248
      ItemList::Item item = *i;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   249
      if (item.m_type == ItemList::PAYLOAD)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   250
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   251
          printer.PrintPayload (os, item.m_packetUid, item.m_size, item.m_fragmentStart, item.m_fragmentEnd);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   252
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   253
      else if (item.m_fragmentStart != 0 || 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   254
               item.m_fragmentEnd != item.m_size)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   255
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   256
          printer.PrintChunkFragment (item.m_chunkType, os, item.m_packetUid, item.m_size, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   257
                                      item.m_fragmentStart, item.m_fragmentEnd);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   258
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   259
      else if (item.m_type == ItemList::HEADER)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   260
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   261
          ns3::Buffer::Iterator j = buffer.Begin ();
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   262
          j.Next (offset);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   263
          printer.PrintChunk (item.m_chunkType, j, os, item.m_packetUid, item.m_size);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   264
        }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   265
      else if (item.m_type == ItemList::TRAILER)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   266
        {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   267
          ns3::Buffer::Iterator j = buffer.End ();
812
add0226d313d make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 810
diff changeset
   268
          j.Prev (totalSize - (offset + item.m_size));
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   269
          printer.PrintChunk (item.m_chunkType, j, os, item.m_packetUid, item.m_size);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   270
        }
807
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   271
      else 
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   272
        {
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   273
          NS_ASSERT (false);
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   274
        }
1c3cc23a0cb8 force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 806
diff changeset
   275
      offset += item.m_fragmentEnd - item.m_fragmentStart;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   276
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
   277
}
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   278
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   279
} // anonymous namespace
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
   280
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   281
namespace ns3 {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   282
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   283
bool PacketHistory::m_enable = false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   284
uint32_t PacketHistory::m_maxSize = 0;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   285
uint16_t PacketHistory::m_chunkUid = 0;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   286
PacketHistory::DataFreeList PacketHistory::m_freeList;
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   287
uint32_t g_nAllocs = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   288
uint32_t g_nDeAllocs = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   289
uint32_t g_nRecycle = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   290
uint32_t g_nCreate = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   291
  uint32_t g_one = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   292
  uint32_t g_two = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   293
  uint32_t g_three = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   294
  uint32_t g_four = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   295
  uint32_t g_five = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   296
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   297
void 
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   298
PacketHistory::PrintStats (void)
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   299
{
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   300
  std::cout << "allocs="<<g_nAllocs<<", deallocs="<<g_nDeAllocs
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   301
            <<", recycle="<<g_nRecycle<<", create="<<g_nCreate<<std::endl;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   302
  std::cout << "one="<<g_one<<", two="<<g_two<<", three="<<g_three<<std::endl;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   303
  //std::cout << "four="<<g_four<<", five="<<g_five<<std::endl;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   304
  g_nAllocs = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   305
  g_nDeAllocs = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   306
  g_nRecycle = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   307
  g_nCreate = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   308
  g_one = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   309
  g_two = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   310
  g_three = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   311
  g_four = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   312
  g_five = 0;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   313
#if 0
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   314
  PacketHistory h (0, 0);
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   315
  for (uint32_t i = 0; i < 0xffffff; i++)
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   316
    {
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   317
      if (h.GetUleb128Size (i) == 4)
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   318
        {
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   319
          std::cout << i << std::endl;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   320
          break;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   321
        }
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   322
    }
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   323
#endif
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   324
}
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   325
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   326
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   327
PacketHistory::Enable (void)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   328
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   329
  m_enable = true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   330
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   331
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   332
PacketHistory::PacketHistory (uint32_t uid, uint32_t size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   333
  : m_data (0),
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   334
    m_head (0xffff),
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   335
    m_tail (0xffff),
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   336
    m_used (0),
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   337
    m_packetUid (uid)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   338
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   339
  if (size > 0)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   340
    {
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   341
      AddSmall (true, 0, size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   342
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   343
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   344
PacketHistory::PacketHistory (PacketHistory const &o)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   345
  : m_data (o.m_data),
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   346
    m_head (o.m_head),
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   347
    m_tail (o.m_tail),
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   348
    m_used (o.m_used),
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   349
    m_packetUid (o.m_packetUid)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   350
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   351
  if (m_data != 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   352
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   353
      m_data->m_count++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   354
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   355
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   356
PacketHistory &
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   357
PacketHistory::operator = (PacketHistory const& o)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   358
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   359
  if (m_data == o.m_data) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   360
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   361
      // self assignment
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   362
      return *this;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   363
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   364
  if (m_data != 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   365
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   366
      m_data->m_count--;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   367
      if (m_data->m_count == 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   368
        {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   369
          PacketHistory::Recycle (m_data);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   370
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   371
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   372
  m_data = o.m_data;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   373
  m_head = o.m_head;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   374
  m_tail = o.m_tail;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   375
  m_used = o.m_used;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   376
  m_packetUid = o.m_packetUid;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   377
  if (m_data != 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   378
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   379
      m_data->m_count++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   380
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   381
  return *this;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   382
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   383
PacketHistory::~PacketHistory ()
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   384
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   385
  if (m_data != 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   386
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   387
      m_data->m_count--;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   388
      if (m_data->m_count == 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   389
        {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   390
          PacketHistory::Recycle (m_data);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   391
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   392
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   393
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   394
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   395
void
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   396
PacketHistory::ReserveCopy (uint32_t size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   397
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   398
  struct PacketHistory::Data *newData = PacketHistory::Create (m_used + size);
836
f9f5f66013cc fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 835
diff changeset
   399
  memcpy (newData->m_data, m_data->m_data, m_used);
f9f5f66013cc fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 835
diff changeset
   400
  newData->m_dirtyEnd = m_used;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   401
  m_data->m_count--;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   402
  if (m_data->m_count == 0) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   403
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   404
      PacketHistory::Recycle (m_data);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   405
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   406
  m_data = newData;
844
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   407
  if (m_head != 0xffff)
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   408
    {
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   409
      uint8_t *start;
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   410
      NS_ASSERT (m_tail != 0xffff);
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   411
      // clear the next field of the tail
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   412
      start = &m_data->m_data[m_tail];
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   413
      Append16 (0xffff, &start);
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   414
      // clear the prev field of the head
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   415
      start = &m_data->m_data[m_head] + 2;
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   416
      Append16 (0xffff, &start);
d17e2aca5a17 when doing a copy of a buffer, make sure to clear the prev and next fields
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 843
diff changeset
   417
    }
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   418
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   419
void
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   420
PacketHistory::Reserve (uint32_t size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   421
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   422
  NS_ASSERT (m_data != 0);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   423
  if (m_data->m_size >= m_used + size &&
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   424
      (m_data->m_count == 1 ||
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   425
       m_data->m_dirtyEnd == m_used))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   426
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   427
      /* enough room, not dirty. */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   428
      g_four++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   429
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   430
  else 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   431
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   432
      /* (enough room and dirty) or (not enough room) */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   433
      ReserveCopy (size);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   434
      g_five++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   435
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   436
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   437
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   438
uint32_t 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   439
PacketHistory::GetUleb128Size (uint32_t value) const
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   440
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   441
  uint32_t n = 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   442
  uint32_t tmp = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   443
  do {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   444
    tmp >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   445
    n++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   446
  } while (tmp != 0);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   447
  return n;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   448
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   449
uint32_t
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   450
PacketHistory::ReadUleb128 (const uint8_t **pBuffer) const
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   451
{
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   452
  const uint8_t *buffer = *pBuffer;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   453
  uint32_t result = 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   454
  uint8_t byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   455
  result = 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   456
  byte = buffer[0];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   457
  result = (byte & (~0x80));
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   458
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   459
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   460
      *pBuffer = buffer + 1;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   461
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   462
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   463
  byte = buffer[1];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   464
  result = (byte & (~0x80)) << 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   465
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   466
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   467
      *pBuffer = buffer + 2;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   468
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   469
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   470
  byte = buffer[2];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   471
  result = (byte & (~0x80)) << 14;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   472
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   473
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   474
      *pBuffer = buffer + 3;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   475
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   476
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   477
  byte = buffer[3];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   478
  result = (byte & (~0x80)) << 21;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   479
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   480
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   481
      *pBuffer = buffer + 4;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   482
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   483
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   484
  byte = buffer[4];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   485
  result = (byte & (~0x80)) << 28;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   486
  if (!(byte & 0x80))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   487
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   488
      *pBuffer = buffer + 5;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   489
      return result;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   490
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   491
  /* This means that the LEB128 number was not valid.
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   492
   * ie: the last (5th) byte did not have the high-order bit zeroed.
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   493
   */
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   494
  NS_ASSERT (false);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   495
  return 0;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   496
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   497
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   498
void
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   499
PacketHistory::Append16 (uint16_t value, uint8_t **pBuffer)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   500
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   501
  uint8_t *buffer = *pBuffer;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   502
  buffer[0] = value & 0xff;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   503
  value >>= 8;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   504
  buffer[1] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   505
  *pBuffer = buffer + 2;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   506
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   507
bool
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   508
PacketHistory::TryToAppend (uint32_t value, uint8_t **pBuffer, uint8_t *end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   509
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   510
  uint8_t *start = *pBuffer;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   511
  if (value < 0x80 && start < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   512
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   513
      start[0] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   514
      *pBuffer = start + 1;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   515
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   516
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   517
  if (value < 0x4000 && start + 1 < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   518
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   519
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   520
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   521
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   522
      start[1] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   523
      *pBuffer = start + 2;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   524
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   525
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   526
  if (value < 0x200000 && start + 2 < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   527
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   528
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   529
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   530
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   531
      start[1] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   532
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   533
      start[2] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   534
      *pBuffer = start + 3;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   535
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   536
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   537
  if (start + 3 < end)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   538
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   539
      uint8_t byte = value & (~0x80);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   540
      start[0] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   541
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   542
      start[1] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   543
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   544
      start[2] = 0x80 | byte;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   545
      value >>= 7;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   546
      start[3] = value;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   547
      *pBuffer = start + 4;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   548
      return true;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   549
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   550
  return false;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   551
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   552
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   553
bool
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   554
PacketHistory::IsFF16 (uint16_t index)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   555
{
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   556
  return m_data->m_data[index] == 0xff && m_data->m_data[index+1] == 0xff;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   557
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   558
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   559
bool
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   560
PacketHistory::CanAdd (bool atStart)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   561
{
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   562
  if (m_head == 0xffff)
838
186decaef5c2 deal with packet with zero headers correctly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 837
diff changeset
   563
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   564
      NS_ASSERT (m_tail == 0xffff);
838
186decaef5c2 deal with packet with zero headers correctly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 837
diff changeset
   565
      return true;
186decaef5c2 deal with packet with zero headers correctly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 837
diff changeset
   566
    }
186decaef5c2 deal with packet with zero headers correctly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 837
diff changeset
   567
  if (atStart)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   568
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   569
      return IsFF16 (m_head+2);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   570
    }
838
186decaef5c2 deal with packet with zero headers correctly
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 837
diff changeset
   571
  else if (!atStart)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   572
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   573
      return IsFF16 (m_tail);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   574
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   575
  else
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   576
    {
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   577
      return false;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   578
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   579
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   580
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   581
void
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   582
PacketHistory::Update (bool atStart, uint16_t written)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   583
{
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   584
  if (m_head == 0xffff)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   585
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   586
      NS_ASSERT (m_tail == 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   587
      m_head = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   588
      m_tail = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   589
    } 
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   590
  else if (atStart)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   591
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   592
      NS_ASSERT (m_head != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   593
      // overwrite the prev field of the previous head of the list.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   594
      uint8_t *previousHead = &m_data->m_data[m_head] + 2;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   595
      Append16 (m_used, &previousHead);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   596
      // update the head of list to the new node.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   597
      m_head = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   598
    }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   599
  else
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   600
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   601
      NS_ASSERT (m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   602
      // overwrite the next field of the previous tail of the list.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   603
      uint8_t *previousTail = &m_data->m_data[m_tail];
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   604
      Append16 (m_used, &previousTail);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   605
      // update the tail of the list to the new node.
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   606
      m_tail = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   607
    }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   608
  NS_ASSERT (m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   609
  NS_ASSERT (m_head != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   610
  m_used += written;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   611
  m_data->m_dirtyEnd = m_used;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   612
}
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   613
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   614
void
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   615
PacketHistory::AddSmall (bool atStart,
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   616
                         uint32_t typeUid, uint32_t size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   617
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   618
  if (m_data == 0)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   619
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   620
      m_data = PacketHistory::Create (10);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   621
      memset (m_data->m_data, 0xff, 4);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   622
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   623
  NS_ASSERT (m_data != 0);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   624
  uint16_t chunkUid = m_chunkUid;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   625
  m_chunkUid++;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   626
 append:
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   627
  uint8_t *start = &m_data->m_data[m_used];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   628
  uint8_t *end = &m_data->m_data[m_data->m_size];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   629
  if (end - start >= 7 &&
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   630
      CanAdd (atStart) &&
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   631
      (m_data->m_count == 1 ||
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   632
       m_used == m_data->m_dirtyEnd))
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   633
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   634
      uint8_t *buffer = start;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   635
      uint16_t next, prev;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   636
      if (atStart)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   637
        {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   638
          next = m_head;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   639
          prev = 0xffff;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   640
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   641
      else
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   642
        {
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   643
          next = 0xffff;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   644
          prev = m_tail;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   645
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   646
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   647
      Append16 (next, &buffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   648
      Append16 (prev, &buffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   649
      if (TryToAppend (typeUid, &buffer, end) &&
839
baa491a253d7 fix field ordering.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 838
diff changeset
   650
          TryToAppend (size, &buffer, end) &&
baa491a253d7 fix field ordering.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 838
diff changeset
   651
          TryToAppend (chunkUid, &buffer, end))
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   652
        {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   653
          uintptr_t written = buffer - start;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   654
          NS_ASSERT (written <= 0xffff);
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   655
          Update (atStart, written);
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   656
          return;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   657
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   658
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   659
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   660
  uint32_t n = GetUleb128Size (typeUid);
839
baa491a253d7 fix field ordering.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 838
diff changeset
   661
  n += GetUleb128Size (size);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   662
  n += GetUleb128Size (chunkUid);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   663
  n += 2 + 2;
836
f9f5f66013cc fix addition of a trailer or a header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 835
diff changeset
   664
  ReserveCopy (n);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   665
  goto append;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   666
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   667
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   668
void
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   669
PacketHistory::AddBig (bool atStart,
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   670
                       const PacketHistory::SmallItem *item, 
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   671
                       const PacketHistory::ExtraItem *extraItem)
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   672
{
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   673
  if (m_data == 0)
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   674
    {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   675
      m_data = PacketHistory::Create (10);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   676
      memset (m_data->m_data, 0xff, 4);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   677
    }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   678
  NS_ASSERT (m_data != 0);
852
a1a3c9bdb7f4 fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 851
diff changeset
   679
  uint32_t typeUid = ((item->typeUid & 0x1) == 0x1)?item->typeUid:item->typeUid+1;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   680
 append:
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   681
  uint8_t *start = &m_data->m_data[m_used];
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   682
  uint8_t *end = &m_data->m_data[m_data->m_size];
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   683
  if (end - start >= 10 &&
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   684
      CanAdd (atStart) &&
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   685
      (m_data->m_count == 1 ||
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   686
       m_used == m_data->m_dirtyEnd))
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   687
    {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   688
      uint8_t *buffer = start;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   689
      uint16_t next, prev;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   690
      if (atStart)
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   691
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   692
          next = m_head;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   693
          prev = 0xffff;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   694
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   695
      else
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   696
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   697
          next = 0xffff;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   698
          prev = m_tail;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   699
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   700
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   701
      Append16 (next, &buffer);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   702
      Append16 (prev, &buffer);
852
a1a3c9bdb7f4 fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 851
diff changeset
   703
      if (TryToAppend (typeUid, &buffer, end) &&
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   704
          TryToAppend (item->size, &buffer, end) &&
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   705
          TryToAppend (item->chunkUid, &buffer, end) &&
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   706
          TryToAppend (extraItem->fragmentStart, &buffer, end) &&
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   707
          TryToAppend (extraItem->fragmentEnd, &buffer, end) &&
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   708
          TryToAppend (extraItem->packetUid, &buffer, end))
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   709
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   710
          uintptr_t written = buffer - start;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   711
          NS_ASSERT (written <= 0xffff);
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   712
          Update (atStart, written);
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   713
          return;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   714
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   715
    }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   716
  
852
a1a3c9bdb7f4 fix a few bugs in ::RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 851
diff changeset
   717
  uint32_t n = GetUleb128Size (typeUid);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   718
  n += GetUleb128Size (item->size);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   719
  n += GetUleb128Size (item->chunkUid);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   720
  n += GetUleb128Size (extraItem->fragmentStart);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   721
  n += GetUleb128Size (extraItem->fragmentEnd);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
   722
  n += GetUleb128Size (extraItem->packetUid);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   723
  n += 2 + 2;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   724
  ReserveCopy (n);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   725
  goto append;
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   726
}
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   727
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   728
void
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   729
PacketHistory::ReplaceTail (const PacketHistory::SmallItem *item, 
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   730
                            const PacketHistory::ExtraItem *extraItem,
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   731
                            uint32_t available)
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   732
{
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   733
  NS_ASSERT (m_data != 0);  
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   734
  if (available >= 10 &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   735
      (m_data->m_count == 1 ||
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   736
       m_used == m_data->m_dirtyEnd))
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   737
    {
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   738
      uint8_t *buffer = &m_data->m_data[m_tail];
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   739
      uint8_t *end = buffer + available;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   740
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   741
      Append16 (item->next, &buffer);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   742
      Append16 (item->prev, &buffer);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   743
      if (TryToAppend (item->typeUid, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   744
          TryToAppend (item->size, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   745
          TryToAppend (item->chunkUid, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   746
          TryToAppend (extraItem->fragmentStart, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   747
          TryToAppend (extraItem->fragmentEnd, &buffer, end) &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   748
          TryToAppend (extraItem->packetUid, &buffer, end))
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   749
        {
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   750
          return;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   751
        }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   752
    }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   753
  
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   754
  // create a copy of the packet.
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   755
  PacketHistory h (m_packetUid, 0);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   756
  uint16_t current = m_head;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   757
  while (current != 0xffff && current != m_tail)
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   758
    {
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   759
      struct PacketHistory::SmallItem tmpItem;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   760
      PacketHistory::ExtraItem tmpExtraItem;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   761
      ReadItems (current, &tmpItem, &tmpExtraItem);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   762
      h.AddBig (false, &tmpItem, &tmpExtraItem);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   763
    }
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   764
  // append new tail.
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   765
  h.AddBig (false, item, extraItem);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   766
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   767
  *this = h;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   768
}
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   769
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   770
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   771
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
   772
void
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   773
PacketHistory::ReadSmall (struct PacketHistory::SmallItem *item, const uint8_t **pBuffer) const
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   774
{
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   775
  const uint8_t *buffer = *pBuffer;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   776
  item->next = buffer[0];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   777
  item->next |= (buffer[1]) << 8;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   778
  item->prev = buffer[2];
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   779
  item->prev |= (buffer[3]) << 8;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   780
  *pBuffer = *pBuffer + 4;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   781
  item->typeUid = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   782
  item->size = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   783
  item->chunkUid = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   784
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   785
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   786
uint32_t
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   787
PacketHistory::ReadItems (uint16_t current, 
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   788
                          struct PacketHistory::SmallItem *item,
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   789
                          struct PacketHistory::ExtraItem *extraItem) const
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   790
{
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   791
  const uint8_t *buffer = &m_data->m_data[current];
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   792
  ReadSmall (item, &buffer);
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   793
  bool isExtra = (item->typeUid & 0x1) == 0x1;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   794
  if (isExtra)
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   795
    {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   796
      ReadExtra (extraItem, &buffer);
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   797
    }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   798
  else
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   799
    {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   800
      extraItem->fragmentStart = 0;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   801
      extraItem->fragmentEnd = item->size;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   802
      extraItem->packetUid = m_packetUid;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   803
    }
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
   804
  NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
   805
  return buffer - &m_data->m_data[current];
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   806
}
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   807
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   808
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
   809
void
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
   810
PacketHistory::ReadExtra (struct PacketHistory::ExtraItem *item, const uint8_t **pBuffer) const
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   811
{
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   812
  item->fragmentStart = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   813
  item->fragmentEnd = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   814
  item->packetUid = ReadUleb128 (pBuffer);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   815
}
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   816
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   817
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   818
struct PacketHistory::Data *
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   819
PacketHistory::Create (uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   820
{
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   821
  g_nCreate++;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   822
  NS_DEBUG ("create size="<<size<<", max="<<m_maxSize);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   823
  if (size > m_maxSize)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   824
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   825
      m_maxSize = size;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   826
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   827
  while (!m_freeList.empty ()) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   828
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   829
      struct PacketHistory::Data *data = m_freeList.back ();
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   830
      m_freeList.pop_back ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   831
      if (data->m_size >= size) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   832
        {
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   833
          NS_DEBUG ("create found size="<<data->m_size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   834
          data->m_count = 1;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   835
          return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   836
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   837
      PacketHistory::Deallocate (data);
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   838
      NS_DEBUG ("create dealloc size="<<data->m_size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   839
    }
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   840
  NS_DEBUG ("create alloc size="<<m_maxSize);
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   841
  return PacketHistory::Allocate (m_maxSize);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   842
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   843
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   844
void
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   845
PacketHistory::Recycle (struct PacketHistory::Data *data)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   846
{
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   847
  g_nRecycle++;
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   848
  NS_DEBUG ("recycle size="<<data->m_size<<", list="<<m_freeList.size ());
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   849
  NS_ASSERT (data->m_count == 0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   850
  if (m_freeList.size () > 1000 ||
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   851
      data->m_size < m_maxSize) 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   852
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   853
      PacketHistory::Deallocate (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   854
    } 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   855
  else 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   856
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   857
      m_freeList.push_back (data);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   858
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   859
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   860
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   861
struct PacketHistory::Data *
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   862
PacketHistory::Allocate (uint32_t n)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   863
{
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   864
  g_nAllocs++;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   865
  uint32_t size = sizeof (struct Data);
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   866
  if (n <= 10)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   867
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   868
      n = 10;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   869
    }
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   870
  size += n - 10;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   871
  uint8_t *buf = new uint8_t [size];
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   872
  struct PacketHistory::Data *data = (struct PacketHistory::Data *)buf;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   873
  data->m_size = n;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   874
  data->m_count = 1;
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   875
  data->m_dirtyEnd = 0;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   876
  return data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   877
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   878
void 
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   879
PacketHistory::Deallocate (struct PacketHistory::Data *data)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   880
{
833
224bfad58818 a bunch of optimizations
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 830
diff changeset
   881
  g_nDeAllocs++;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   882
  uint8_t *buf = (uint8_t *)data;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   883
  delete [] buf;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   884
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   885
791
ff528910ba40 prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 790
diff changeset
   886
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   887
PacketHistory 
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   888
PacketHistory::CreateFragment (uint32_t start, uint32_t end) const
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   889
{
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   890
  PacketHistory fragment = *this;
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   891
  fragment.RemoveAtStart (start);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   892
  fragment.RemoveAtEnd (end);
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
   893
  return fragment;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   894
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   895
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   896
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   897
PacketHistory::AddHeader (uint32_t uid, Chunk const & header, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   898
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   899
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   900
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   901
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   902
    }
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   903
  AddSmall (true, uid, size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   904
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   905
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   906
PacketHistory::RemoveHeader (uint32_t uid, Chunk const & header, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   907
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   908
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   909
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   910
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   911
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   912
  if (m_data == 0)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   913
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   914
      NS_FATAL_ERROR ("Removing header from empty packet.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   915
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   916
  struct PacketHistory::SmallItem item;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   917
  const uint8_t *buffer = &m_data->m_data[m_head];
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   918
  ReadSmall (&item, &buffer);
842
ab2dd4d7951d fix a bunch of buggy asserts
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 841
diff changeset
   919
  NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
843
b6670a38f2e8 the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 842
diff changeset
   920
  if ((item.typeUid & 0xfffffffe) != uid ||
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   921
      item.size != size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   922
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   923
      NS_FATAL_ERROR ("Removing unexpected header.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   924
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   925
  else if (item.typeUid != uid)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   926
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   927
      // this is a "big" item
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   928
      struct PacketHistory::ExtraItem extraItem;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   929
      ReadExtra (&extraItem, &buffer);
842
ab2dd4d7951d fix a bunch of buggy asserts
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 841
diff changeset
   930
      NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   931
      if (extraItem.fragmentStart != 0 ||
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   932
          extraItem.fragmentEnd != size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   933
        {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   934
          NS_FATAL_ERROR ("Removing incomplete header.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   935
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   936
    }
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   937
  m_head = item.next;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   938
  if (m_head > m_tail)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   939
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   940
      m_used = m_head;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   941
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   942
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   943
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   944
PacketHistory::AddTrailer (uint32_t uid, Chunk const & trailer, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   945
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   946
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   947
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   948
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   949
    }
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
   950
  AddSmall (false, uid, size);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   951
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   952
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   953
PacketHistory::RemoveTrailer (uint32_t uid, Chunk const & trailer, uint32_t size)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   954
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   955
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   956
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   957
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   958
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   959
  if (m_data == 0)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   960
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   961
      NS_FATAL_ERROR ("Removing trailer from empty packet.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   962
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   963
  struct PacketHistory::SmallItem item;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   964
  const uint8_t *buffer = &m_data->m_data[m_tail];
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   965
  ReadSmall (&item, &buffer);
842
ab2dd4d7951d fix a bunch of buggy asserts
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 841
diff changeset
   966
  NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
843
b6670a38f2e8 the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 842
diff changeset
   967
  if ((item.typeUid & 0xfffffffe) != uid ||
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   968
      item.size != size)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   969
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   970
      NS_FATAL_ERROR ("Removing unexpected trailer.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   971
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   972
  else if (item.typeUid != uid)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   973
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   974
      // this is a "big" item
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   975
      struct PacketHistory::ExtraItem extraItem;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   976
      ReadExtra (&extraItem, &buffer);
842
ab2dd4d7951d fix a bunch of buggy asserts
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 841
diff changeset
   977
      NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   978
      if (extraItem.fragmentStart != 0 ||
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   979
          extraItem.fragmentEnd != size)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   980
        {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   981
          NS_FATAL_ERROR ("Removing incomplete trailer.");
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   982
        }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   983
    }
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   984
  m_tail = item.prev;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   985
  if (m_tail > m_head)
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   986
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
   987
      m_used = m_tail;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   988
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   989
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   990
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   991
PacketHistory::AddAtEnd (PacketHistory const&o)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   992
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   993
  if (!m_enable) 
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   994
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
   995
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
   996
    }
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   997
  if (m_data == 0 || m_tail == 0xffff)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   998
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
   999
      *this = o;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1000
      return;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1001
    }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1002
  NS_ASSERT (m_head != 0xffff && m_tail != 0xffff);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1003
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1004
  uint16_t lastTail = m_tail;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1005
  struct PacketHistory::SmallItem lastItem;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1006
  PacketHistory::ExtraItem lastExtraItem;
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1007
  uint32_t lastTailSize = ReadItems (m_tail, &lastItem, &lastExtraItem);
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1008
  if (m_tail + lastTailSize == m_used &&
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1009
      m_used == m_data->m_dirtyEnd)
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1010
    {
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1011
      lastTailSize = m_data->m_size;
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1012
    }
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1013
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1014
  uint16_t current = o.m_head;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1015
  while (current != 0xffff)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1016
    {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1017
      struct PacketHistory::SmallItem item;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1018
      PacketHistory::ExtraItem extraItem;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1019
      o.ReadItems (current, &item, &extraItem);
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1020
      if (extraItem.packetUid == lastExtraItem.packetUid &&
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1021
          item.typeUid == lastItem.typeUid &&
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1022
          item.chunkUid == lastItem.chunkUid &&
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1023
          item.size == lastItem.size &&
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1024
          extraItem.fragmentStart == lastExtraItem.fragmentEnd)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1025
        {
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1026
          // replace previous tail.
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1027
          lastExtraItem.fragmentEnd = extraItem.fragmentEnd;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1028
          NS_ASSERT (m_tail == lastTail);
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1029
          ReplaceTail (&lastItem, &lastExtraItem, lastTailSize);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1030
        }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1031
      else
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1032
        {
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1033
          // append the extra items.
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
  1034
          AddBig (false, &item, &extraItem);
853
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1035
        }
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1036
      current = item.next;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1037
      if (current == o.m_tail)
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1038
        {
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1039
          break;
2477fe325610 share some code, implement AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 852
diff changeset
  1040
        }
855
6b27e6180fcb implement ReplaceTail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 854
diff changeset
  1041
    }
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1042
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1043
void
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1044
PacketHistory::AddPaddingAtEnd (uint32_t end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1045
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1046
  if (!m_enable)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1047
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1048
      return;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1049
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1050
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1051
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1052
PacketHistory::RemoveAtStart (uint32_t start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1053
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1054
  if (!m_enable) 
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1055
    {
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1056
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1057
    }
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1058
  if (m_data == 0)
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1059
    {
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1060
      NS_FATAL_ERROR ("Removing data from start of empty packet.");
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1061
    }
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1062
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1063
  uint32_t leftToRemove = start;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1064
  uint16_t current = m_head;
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1065
  while (current != 0xffff && leftToRemove > 0)
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1066
    {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1067
      struct PacketHistory::SmallItem item;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1068
      PacketHistory::ExtraItem extraItem;
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1069
      ReadItems (current, &item, &extraItem);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1070
      uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1071
      if (itemRealSize <= leftToRemove)
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1072
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1073
          // remove from list.
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1074
          m_head = item.next;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1075
          leftToRemove -= itemRealSize;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1076
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1077
      else
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1078
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1079
          // fragment the list item.
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1080
          PacketHistory fragment (m_packetUid, 0);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1081
          extraItem.fragmentStart += leftToRemove;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1082
          leftToRemove = 0;
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
  1083
          fragment.AddBig (false, &item, &extraItem);
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1084
          current = item.next;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1085
          while (current != 0xffff)
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1086
            {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1087
              ReadItems (current, &item, &extraItem);
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
  1088
              fragment.AddBig (false, &item, &extraItem);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1089
              if (current == m_tail)
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1090
                {
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1091
                  break;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1092
                }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1093
              current = item.next;
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1094
            }
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1095
          *this = fragment;
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1096
        }
847
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1097
      NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart &&
319d107f2435 rewrite PacketHistory::RemoveAtstart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 846
diff changeset
  1098
                 extraItem.fragmentStart <= extraItem.fragmentEnd);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1099
      if (current == m_tail)
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1100
        {
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1101
          break;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1102
        }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1103
      current = item.next;
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1104
    }
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1105
  NS_ASSERT (leftToRemove == 0);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1106
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1107
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1108
PacketHistory::RemoveAtEnd (uint32_t end)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1109
{
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1110
  if (!m_enable) 
792
99423210502e implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 791
diff changeset
  1111
    {
835
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1112
      return;
ea5ca71d6c0c a new implementation of the PacketHistory API
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 834
diff changeset
  1113
    }
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1114
  if (m_data == 0)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1115
    {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1116
      NS_FATAL_ERROR ("Removing data from start of empty packet.");
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1117
    }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1118
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1119
  uint32_t leftToRemove = end;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1120
  uint16_t current = m_tail;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1121
  while (current != 0xffff && leftToRemove > 0)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1122
    {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1123
      struct PacketHistory::SmallItem item;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1124
      PacketHistory::ExtraItem extraItem;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1125
      ReadItems (current, &item, &extraItem);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1126
      uint32_t itemRealSize = extraItem.fragmentEnd - extraItem.fragmentStart;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1127
      if (itemRealSize <= leftToRemove)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1128
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1129
          // remove from list.
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1130
          m_tail = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1131
          leftToRemove -= itemRealSize;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1132
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1133
      else
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1134
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1135
          // fragment the list item.
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1136
          PacketHistory fragment (m_packetUid, 0);
851
ce4de5a9dcd0 remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 850
diff changeset
  1137
          NS_ASSERT (extraItem.fragmentEnd > leftToRemove);
ce4de5a9dcd0 remove data from end of trailer, not start of header
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 850
diff changeset
  1138
          extraItem.fragmentEnd -= leftToRemove;
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1139
          leftToRemove = 0;
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
  1140
          fragment.AddBig (true, &item, &extraItem);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1141
          current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1142
          while (current != 0xffff)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1143
            {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1144
              ReadItems (current, &item, &extraItem);
854
cbe6790bf9fa simplify calls to AddBig and AddSmall
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 853
diff changeset
  1145
              fragment.AddBig (true, &item, &extraItem);
849
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1146
              if (current == m_head)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1147
                {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1148
                  break;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1149
                }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1150
              current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1151
            }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1152
          *this = fragment;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1153
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1154
      NS_ASSERT (item.size >= extraItem.fragmentEnd - extraItem.fragmentStart &&
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1155
                 extraItem.fragmentStart <= extraItem.fragmentEnd);
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1156
      if (current == m_head)
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1157
        {
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1158
          break;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1159
        }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1160
      current = item.prev;
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1161
    }
5bc5818b09f0 fix simple bugs in RemoveAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 848
diff changeset
  1162
  NS_ASSERT (leftToRemove == 0);
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1163
}
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1164
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1165
void 
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1166
PacketHistory::PrintDefault (std::ostream &os, Buffer buffer) const
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1167
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1168
  Print (os, buffer, PacketPrinter::GetDefault ());
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1169
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1170
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1171
uint32_t
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1172
PacketHistory::DoPrint (struct PacketHistory::SmallItem *item, uint32_t current,
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1173
                        Buffer data, uint32_t offset, const PacketPrinter &printer,
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1174
                        std::ostream &os) const
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1175
{
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1176
  PacketHistory::ExtraItem extraItem;
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1177
  ReadItems (current, item, &extraItem);
843
b6670a38f2e8 the mask to filter out the low bit is 0xfe, not 0xfd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 842
diff changeset
  1178
  uint32_t uid = item->typeUid & 0xfffffffe;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1179
  if (uid == 0)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1180
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1181
      // payload.
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1182
      printer.PrintPayload (os, extraItem.packetUid, item->size, 
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1183
                            extraItem.fragmentStart, 
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1184
                            extraItem.fragmentEnd);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1185
    }
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1186
  else if (extraItem.fragmentStart != 0 ||
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1187
           extraItem.fragmentEnd != item->size)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1188
    {
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1189
      printer.PrintChunkFragment (uid, os, extraItem.packetUid, item->size, 
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1190
                                  extraItem.fragmentStart, extraItem.fragmentEnd);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1191
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1192
  else if (PacketPrinter::IsHeader (uid))
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1193
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1194
      ns3::Buffer::Iterator j = data.Begin ();
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1195
      j.Next (offset);
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1196
      printer.PrintChunk (uid, j, os, extraItem.packetUid, item->size);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1197
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1198
  else if (PacketPrinter::IsTrailer (uid))
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1199
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1200
      ns3::Buffer::Iterator j = data.End ();
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1201
      j.Prev (data.GetSize () - (offset + item->size));
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1202
      printer.PrintChunk (uid, j, os, extraItem.packetUid, item->size);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1203
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1204
  else 
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1205
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1206
      NS_ASSERT (false);
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1207
    }
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1208
  return extraItem.fragmentEnd - extraItem.fragmentStart;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1209
}
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1210
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1211
uint32_t
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1212
PacketHistory::GetTotalSize (void) const
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1213
{
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1214
  uint32_t totalSize = 0;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1215
  uint16_t current = m_head;
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1216
  uint16_t tail = m_tail;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1217
  while (current != 0xffff)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1218
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1219
      struct PacketHistory::SmallItem item;
850
470258d962cc simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 849
diff changeset
  1220
      PacketHistory::ExtraItem extraItem;
470258d962cc simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 849
diff changeset
  1221
      ReadItems (current, &item, &extraItem);
470258d962cc simplify GetTotalSize
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 849
diff changeset
  1222
      totalSize += extraItem.fragmentEnd - extraItem.fragmentStart;
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1223
      if (current == tail)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1224
        {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1225
          break;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1226
        }
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1227
      current = item.next;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1228
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1229
  return totalSize;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1230
}
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1231
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1232
void
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1233
PacketHistory::Print (std::ostream &os, Buffer data, const PacketPrinter &printer) const
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1234
{
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1235
  if (!m_enable) 
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1236
    {
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1237
      return;
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1238
    }
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1239
  if (m_data == 0)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1240
    {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1241
      return;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1242
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1243
  NS_ASSERT (GetTotalSize () == data.GetSize ());
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1244
  if (printer.m_forward)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1245
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1246
      uint32_t tail = m_tail;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1247
      uint32_t head = m_head;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1248
      uint32_t current = head;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1249
      uint32_t offset = 0;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1250
      while (current != 0xffff)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1251
        {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1252
          struct PacketHistory::SmallItem item;
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1253
          uint32_t realSize = DoPrint (&item, current, data, offset, printer, os);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1254
          offset += realSize;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1255
          if (current == tail)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1256
            {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1257
              break;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1258
            }
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1259
          current = item.next;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1260
        }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1261
    }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1262
  else
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1263
    {
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1264
      uint32_t head = m_head;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1265
      uint32_t tail = m_tail;
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1266
      uint32_t current = head;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1267
      uint32_t offset = 0;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1268
      while (current != 0xffff)
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1269
        {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1270
          struct PacketHistory::SmallItem item;
848
10e989a2ed6e fix fragment printing
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 847
diff changeset
  1271
          uint32_t realSize = DoPrint (&item, current, data, offset, printer, os);
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1272
          offset -= realSize;
840
e473844a60c2 rename begin to head and end to tail
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 839
diff changeset
  1273
          if (current == tail)
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1274
            {
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1275
              break;
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1276
            }
841
83a5df185d90 fix the list iteration logic
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 840
diff changeset
  1277
          current = item.prev;
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1278
        }
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1279
    }
790
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1280
}
de06cb662828 keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 789
diff changeset
  1281
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1282
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1283
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1284
}; // namespace ns3
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1285
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1286
#include <stdarg.h>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1287
#include <iostream>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1288
#include <sstream>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1289
#include "ns3/test.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1290
#include "header.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1291
#include "trailer.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1292
#include "packet.h"
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1293
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1294
namespace ns3 {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1295
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1296
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1297
class HistoryHeader : public Header
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1298
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1299
public:
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1300
  HistoryHeader ();
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1301
  bool IsOk (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1302
private:
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1303
  virtual std::string DoGetName (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1304
  virtual void PrintTo (std::ostream &os) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1305
  virtual uint32_t GetSerializedSize (void) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1306
  virtual void SerializeTo (Buffer::Iterator start) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1307
  virtual uint32_t DeserializeFrom (Buffer::Iterator start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1308
  bool m_ok;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1309
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1310
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1311
template <int N>
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1312
HistoryHeader<N>::HistoryHeader ()
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1313
  : m_ok (false)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1314
{}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1315
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1316
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1317
bool 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1318
HistoryHeader<N>::IsOk (void) const
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1319
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1320
  return m_ok;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1321
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1322
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1323
template <int N>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1324
std::string 
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1325
HistoryHeader<N>::DoGetName (void) const
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1326
{
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1327
  std::ostringstream oss;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1328
  oss << N;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1329
  return oss.str ();
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1330
}
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1331
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1332
template <int N>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1333
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1334
HistoryHeader<N>::PrintTo (std::ostream &os) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1335
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1336
  NS_ASSERT (false);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1337
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1338
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1339
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1340
HistoryHeader<N>::GetSerializedSize (void) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1341
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1342
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1343
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1344
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1345
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1346
HistoryHeader<N>::SerializeTo (Buffer::Iterator start) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1347
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1348
  start.WriteU8 (N, N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1349
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1350
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1351
uint32_t
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1352
HistoryHeader<N>::DeserializeFrom (Buffer::Iterator start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1353
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1354
  m_ok = true;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1355
  for (int i = 0; i < N; i++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1356
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1357
      if (start.ReadU8 () != N)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1358
        {
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1359
          m_ok = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1360
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1361
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1362
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1363
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1364
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1365
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1366
class HistoryTrailer : public Trailer
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1367
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1368
public:
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1369
  HistoryTrailer ();
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1370
  bool IsOk (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1371
private:
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1372
  virtual std::string DoGetName (void) const;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1373
  virtual void PrintTo (std::ostream &os) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1374
  virtual uint32_t GetSerializedSize (void) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1375
  virtual void SerializeTo (Buffer::Iterator start) const;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1376
  virtual uint32_t DeserializeFrom (Buffer::Iterator start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1377
  bool m_ok;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1378
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1379
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1380
template <int N>
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1381
HistoryTrailer<N>::HistoryTrailer ()
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1382
  : m_ok (false)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1383
{}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1384
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1385
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1386
bool
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1387
HistoryTrailer<N>::IsOk (void) const
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1388
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1389
  return m_ok;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1390
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1391
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1392
template <int N>
795
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1393
std::string 
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1394
HistoryTrailer<N>::DoGetName (void) const
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1395
{
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1396
  std::ostringstream oss;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1397
  oss << N;
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1398
  return oss.str ();
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1399
}
cd108c9817d0 add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 794
diff changeset
  1400
template <int N>
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1401
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1402
HistoryTrailer<N>::PrintTo (std::ostream &os) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1403
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1404
  NS_ASSERT (false);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1405
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1406
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1407
uint32_t 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1408
HistoryTrailer<N>::GetSerializedSize (void) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1409
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1410
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1411
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1412
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1413
void 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1414
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1415
{
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1416
  start.Prev (N);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1417
  start.WriteU8 (N, N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1418
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1419
template <int N>
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1420
uint32_t
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1421
HistoryTrailer<N>::DeserializeFrom (Buffer::Iterator start)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1422
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1423
  m_ok = true;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1424
  start.Prev (N);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1425
  for (int i = 0; i < N; i++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1426
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1427
      if (start.ReadU8 () != N)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1428
        {
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1429
          m_ok = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1430
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1431
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1432
  return N;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1433
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1434
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1435
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1436
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1437
class PacketHistoryTest : public Test {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1438
public:
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1439
  PacketHistoryTest ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1440
  virtual ~PacketHistoryTest ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1441
  bool CheckHistory (Packet p, char *file, int line, uint32_t n, ...);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1442
  virtual bool RunTests (void);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1443
private:
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1444
  template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1445
  void PrintHeader (std::ostream &os, uint32_t packetUid, uint32_t size, const HistoryHeader<N> *header);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1446
  template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1447
  void PrintTrailer (std::ostream &os, uint32_t packetUid, uint32_t size, const HistoryTrailer<N> *trailer);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1448
  void PrintFragment (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1449
                      uint32_t size,std::string & name, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1450
                      struct PacketPrinter::FragmentInformation info);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1451
  void PrintDefault (std::ostream& os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1452
                     uint32_t size,std::string& name,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1453
                     struct PacketPrinter::FragmentInformation info);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1454
  void PrintPayload (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1455
                     uint32_t size,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1456
                     struct PacketPrinter::FragmentInformation info);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1457
  template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1458
  void RegisterHeader (void);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1459
  template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1460
  void RegisterTrailer (void);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1461
  void CleanupPrints (void);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1462
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1463
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1464
  bool m_headerError;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1465
  bool m_trailerError;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1466
  std::list<int> m_prints;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1467
  PacketPrinter m_printer;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1468
};
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1469
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1470
PacketHistoryTest::PacketHistoryTest ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1471
  : Test ("PacketHistory")
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1472
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1473
  m_printer.AddPayloadPrinter (MakeCallback (&PacketHistoryTest::PrintPayload, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1474
  m_printer.AddDefaultPrinter (MakeCallback (&PacketHistoryTest::PrintDefault, this));
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1475
}
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1476
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1477
PacketHistoryTest::~PacketHistoryTest ()
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1478
{}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1479
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1480
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1481
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1482
PacketHistoryTest::RegisterHeader (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1483
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1484
  static bool registered = false;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1485
  if (!registered)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1486
    {
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1487
      m_printer.AddHeaderPrinter (MakeCallback (&PacketHistoryTest::PrintHeader<N>, this),
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1488
                                  MakeCallback (&PacketHistoryTest::PrintFragment, this));
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1489
      registered = true;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1490
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1491
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1492
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1493
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1494
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1495
PacketHistoryTest::RegisterTrailer (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1496
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1497
  static bool registered = false;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1498
  if (!registered)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1499
    {
837
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1500
      m_printer.AddTrailerPrinter (MakeCallback (&PacketHistoryTest::PrintTrailer<N>, this),
b73b63e84130 implement PacketHistory::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 836
diff changeset
  1501
                                   MakeCallback (&PacketHistoryTest::PrintFragment, this));
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1502
      registered = true;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1503
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1504
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1505
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1506
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1507
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1508
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1509
PacketHistoryTest::PrintHeader (std::ostream &os, uint32_t packetUid, uint32_t size, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1510
                                const HistoryHeader<N> *header)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1511
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1512
  if (!header->IsOk ())
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1513
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1514
      m_headerError = true;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1515
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1516
  m_prints.push_back (N);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1517
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1518
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1519
template <int N>
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1520
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1521
PacketHistoryTest::PrintTrailer (std::ostream &os, uint32_t packetUid, uint32_t size, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1522
                                 const HistoryTrailer<N> *trailer)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1523
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1524
  if (!trailer->IsOk ())
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1525
    {
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1526
      m_trailerError = true;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1527
    }
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1528
  m_prints.push_back (N);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1529
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1530
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1531
PacketHistoryTest::PrintFragment (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1532
                                  uint32_t size,std::string & name, 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1533
                                  struct PacketPrinter::FragmentInformation info)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1534
{
813
0001e4abcf7b test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 812
diff changeset
  1535
  m_prints.push_back (info.end - info.start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1536
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1537
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1538
PacketHistoryTest::PrintDefault (std::ostream& os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1539
                     uint32_t size,std::string& name,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1540
                     struct PacketPrinter::FragmentInformation info)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1541
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1542
  NS_ASSERT (false);
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1543
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1544
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1545
PacketHistoryTest::PrintPayload (std::ostream &os,uint32_t packetUid,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1546
                                 uint32_t size,
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1547
                                 struct PacketPrinter::FragmentInformation info)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1548
{
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1549
  m_prints.push_back (info.end - info.start);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1550
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1551
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1552
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1553
void 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1554
PacketHistoryTest::CleanupPrints (void)
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1555
{
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1556
  m_prints.clear ();
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1557
}
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1558
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1559
bool 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1560
PacketHistoryTest::CheckHistory (Packet p, char *file, int line, uint32_t n, ...)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1561
{
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1562
  m_headerError = false;
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1563
  m_trailerError = false;
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1564
  va_list ap;
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1565
  p.Print (std::cerr, m_printer);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1566
  va_start (ap, n);
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1567
  if (m_headerError)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1568
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1569
      std::cout << "PacketHistory header error. file=" << file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1570
                << ", line=" << line << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1571
      return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1572
    }
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1573
  if (m_trailerError)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1574
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1575
      std::cout << "PacketHistory trailer error. file=" << file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1576
                << ", line=" << line << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1577
      return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1578
    }
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1579
  if (n != m_prints.size ())
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1580
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1581
      goto error;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1582
    }
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1583
  for (std::list<int>::iterator i = m_prints.begin (); 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1584
       i != m_prints.end (); i++)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1585
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1586
      int v = va_arg (ap, int);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1587
      if (v != *i)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1588
        {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1589
          va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1590
          goto error;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1591
        }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1592
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1593
  va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1594
  return true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1595
 error:
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1596
  std::cout << "PacketHistory error. file="<< file 
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1597
            << ", line=" << line << ", got:\"";
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1598
  for (std::list<int>::iterator i = m_prints.begin (); 
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1599
       i != m_prints.end (); i++)
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1600
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1601
      std::cout << *i << ", ";
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1602
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1603
  std::cout << "\", expected: \"";
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1604
  va_start (ap, n);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1605
  for (uint32_t j = 0; j < n; j++)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1606
    {
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1607
      int v = va_arg (ap, int);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1608
      std::cout << v << ", ";
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1609
    }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1610
  va_end (ap);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1611
  std::cout << "\"" << std::endl;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1612
  return false;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1613
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1614
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1615
#define ADD_HEADER(p, n)                        \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1616
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1617
    HistoryHeader<n> header;                    \
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1618
    RegisterHeader<n> ();                       \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1619
    p.AddHeader (header);                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1620
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1621
#define ADD_TRAILER(p, n)                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1622
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1623
    HistoryTrailer<n> trailer;                  \
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1624
    RegisterTrailer<n> ();                      \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1625
    p.AddTrailer (trailer);                     \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1626
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1627
#define REM_HEADER(p, n)                        \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1628
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1629
    HistoryHeader<n> header;                    \
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1630
    RegisterHeader<n> ();                       \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1631
    p.RemoveHeader (header);                    \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1632
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1633
#define REM_TRAILER(p, n)                       \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1634
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1635
    HistoryTrailer<n> trailer;                  \
806
0190f1b49dc8 re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 795
diff changeset
  1636
    RegisterTrailer<n> ();                      \
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1637
    p.RemoveTrailer (trailer);                  \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1638
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1639
#define CHECK_HISTORY(p, ...)                   \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1640
  {                                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1641
    if (!CheckHistory (p, __FILE__,             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1642
                      __LINE__, __VA_ARGS__))   \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1643
      {                                         \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1644
        ok = false;                             \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1645
      }                                         \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1646
    CleanupPrints ();                           \
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1647
  }
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1648
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1649
bool
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1650
PacketHistoryTest::RunTests (void)
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1651
{
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1652
  bool ok = true;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1653
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1654
  PacketHistory::Enable ();
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1655
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1656
  Packet p = Packet (0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1657
  Packet p1 = Packet (0);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1658
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1659
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1660
  ADD_TRAILER (p, 100);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1661
  CHECK_HISTORY (p, 2, 10, 100);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1662
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1663
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1664
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1665
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1666
  ADD_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1667
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1668
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1669
  ADD_HEADER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1670
  CHECK_HISTORY (p, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1671
                 5, 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1672
  ADD_HEADER (p, 6);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1673
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1674
                 6, 5, 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1675
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1676
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1677
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1678
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1679
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1680
  REM_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1681
  CHECK_HISTORY (p, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1682
                 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1683
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1684
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1685
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1686
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1687
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1688
  REM_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1689
  REM_HEADER (p, 2);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1690
  CHECK_HISTORY (p, 2, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1691
                 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1692
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1693
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1694
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1695
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1696
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1697
  REM_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1698
  REM_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1699
  REM_HEADER (p, 1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1700
  CHECK_HISTORY (p, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1701
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1702
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1703
  ADD_HEADER (p, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1704
  ADD_HEADER (p, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1705
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1706
  p1 = p;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1707
  REM_HEADER (p1, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1708
  REM_HEADER (p1, 2);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1709
  REM_HEADER (p1, 1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1710
  CHECK_HISTORY (p1, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1711
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1712
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1713
  ADD_HEADER (p1, 1);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1714
  ADD_HEADER (p1, 2);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1715
  CHECK_HISTORY (p1, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1716
                 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1717
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1718
                 3, 2, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1719
  ADD_HEADER (p, 3);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1720
  CHECK_HISTORY (p, 5, 
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1721
                 3, 3, 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1722
  ADD_TRAILER (p, 4);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1723
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1724
                 3, 3, 2, 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1725
  ADD_TRAILER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1726
  CHECK_HISTORY (p, 7, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1727
                 3, 3, 2, 1, 10, 4, 5);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1728
  REM_HEADER (p, 3);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1729
  CHECK_HISTORY (p, 6, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1730
                 3, 2, 1, 10, 4, 5);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1731
  REM_TRAILER (p, 5);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1732
  CHECK_HISTORY (p, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1733
                 3, 2, 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1734
  p1 = p;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1735
  REM_TRAILER (p, 4);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1736
  CHECK_HISTORY (p, 4, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1737
                 3, 2, 1, 10);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1738
  CHECK_HISTORY (p1, 5, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1739
                 3, 2, 1, 10, 4);
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1740
  p1.RemoveAtStart (3);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1741
  CHECK_HISTORY (p1, 4, 
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1742
                 2, 1, 10, 4);
845
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1743
  p1.RemoveAtStart (1);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1744
  CHECK_HISTORY (p1, 4, 
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1745
                 1, 1, 10, 4);
7abb0f867d8f implement PacketHistory::RemoveAtStart
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 844
diff changeset
  1746
  p1.RemoveAtStart (1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1747
  CHECK_HISTORY (p1, 3, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1748
                 1, 10, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1749
  p1.RemoveAtEnd (4);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1750
  CHECK_HISTORY (p1, 2, 
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1751
                 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1752
  p1.RemoveAtStart (1);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1753
  CHECK_HISTORY (p1, 1, 10);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1754
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1755
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1756
  ADD_HEADER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1757
  ADD_TRAILER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1758
  ADD_TRAILER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1759
  p.RemoveAtStart (8+10+8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1760
  CHECK_HISTORY (p, 1, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1761
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1762
  p = Packet (10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1763
  ADD_HEADER (p, 10);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1764
  ADD_HEADER (p, 8);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1765
  ADD_TRAILER (p, 6);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1766
  ADD_TRAILER (p, 7);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1767
  ADD_TRAILER (p, 9);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1768
  p.RemoveAtStart (5);
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1769
  p.RemoveAtEnd (12);
814
af117fb6eb5d test payload
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 813
diff changeset
  1770
  CHECK_HISTORY (p, 5, 3, 10, 10, 6, 4);
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1771
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1772
  p = Packet (10);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1773
  ADD_HEADER (p, 10);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1774
  ADD_TRAILER (p, 6);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1775
  p.RemoveAtEnd (18);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1776
  ADD_TRAILER (p, 5);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1777
  ADD_HEADER (p, 3);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1778
  CHECK_HISTORY (p, 3, 3, 8, 5);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1779
  p.RemoveAtStart (12);
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1780
  CHECK_HISTORY (p, 1, 4);
818
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1781
  p.RemoveAtEnd (2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1782
  CHECK_HISTORY (p, 1, 2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1783
  ADD_HEADER (p, 10);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1784
  CHECK_HISTORY (p, 2, 10, 2);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1785
  p.RemoveAtEnd (5);
1c6df07b7644 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 817
diff changeset
  1786
  CHECK_HISTORY (p, 1, 7);
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1787
820
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1788
  Packet p2 = Packet (0);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1789
  Packet p3 = Packet (0);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1790
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1791
  p = Packet (40);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1792
  ADD_HEADER (p, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1793
  ADD_HEADER (p, 8);
821
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1794
  CHECK_HISTORY (p, 3, 8, 5, 40);
820
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1795
  p1 = p.CreateFragment (0, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1796
  p2 = p.CreateFragment (5, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1797
  p3 = p.CreateFragment (10, 43);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1798
  CHECK_HISTORY (p1, 1, 5);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1799
  CHECK_HISTORY (p2, 2, 3, 2);
5f5eed583a17 add more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 818
diff changeset
  1800
  CHECK_HISTORY (p3, 2, 3, 40);
821
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1801
  p1.AddAtEnd (p2);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1802
  CHECK_HISTORY (p1, 2, 8, 2);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1803
  CHECK_HISTORY (p2, 2, 3, 2);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1804
  p1.AddAtEnd (p3);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1805
  CHECK_HISTORY (p1, 3, 8, 5, 40);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1806
  CHECK_HISTORY (p2, 2, 3, 2);
c5ebe0778031 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 820
diff changeset
  1807
  CHECK_HISTORY (p3, 2, 3, 40);
825
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1808
  p1 = p.CreateFragment (0, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1809
  CHECK_HISTORY (p1, 1, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1810
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1811
  p3 = Packet (50);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1812
  ADD_HEADER (p3, 8);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1813
  CHECK_HISTORY (p3, 2, 8, 50);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1814
  CHECK_HISTORY (p1, 1, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1815
  p1.AddAtEnd (p3);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1816
  CHECK_HISTORY (p1, 3, 5, 8, 50);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1817
  ADD_HEADER (p1, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1818
  CHECK_HISTORY (p1, 4, 5, 5, 8, 50);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1819
  ADD_TRAILER (p1, 2);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1820
  CHECK_HISTORY (p1, 5, 5, 5, 8, 50, 2);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1821
  REM_HEADER (p1, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1822
  CHECK_HISTORY (p1, 4, 5, 8, 50, 2);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1823
  p1.RemoveAtEnd (60);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1824
  CHECK_HISTORY (p1, 1, 5);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1825
  p1.AddAtEnd (p2);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1826
  CHECK_HISTORY (p1, 2, 8, 2);
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1827
  CHECK_HISTORY (p2, 2, 3, 2);
828
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1828
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1829
  p3 = Packet (40);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1830
  ADD_HEADER (p3, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1831
  ADD_HEADER (p3, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1832
  CHECK_HISTORY (p3, 3, 5, 5, 40);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1833
  p1 = p3.CreateFragment (0, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1834
  p2 = p3.CreateFragment (5, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1835
  CHECK_HISTORY (p1, 1, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1836
  CHECK_HISTORY (p2, 1, 5);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1837
  p1.AddAtEnd (p2);
5439722f60ec more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 825
diff changeset
  1838
  CHECK_HISTORY (p1, 2, 5, 5);
829
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1839
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1840
  p = Packet (0);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1841
  CHECK_HISTORY (p, 0);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1842
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1843
  p3 = Packet (0);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1844
  ADD_HEADER (p3, 5);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1845
  ADD_HEADER (p3, 5);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1846
  CHECK_HISTORY (p3, 2, 5, 5);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1847
  p1 = p3.CreateFragment (0, 4);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1848
  p2 = p3.CreateFragment (9, 1);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1849
  CHECK_HISTORY (p1, 1, 4);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1850
  CHECK_HISTORY (p2, 1, 1);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1851
  p1.AddAtEnd (p2);
6f869667686f more tests, initial fix.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 828
diff changeset
  1852
  CHECK_HISTORY (p1, 2, 4, 1);
825
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1853
  
48b651e0c3c7 more tests
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 822
diff changeset
  1854
  
817
cb803cd166a3 new test and fix to make it pass
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents: 814
diff changeset
  1855
789
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1856
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1857
  return ok;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1858
}
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1859
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1860
static PacketHistoryTest g_packetHistoryTest;
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1861
1e19322e9012 merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff changeset
  1862
}//namespace ns3