author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Fri, 01 Jun 2007 11:12:55 +0200 | |
changeset 813 | 0001e4abcf7b |
parent 812 | add0226d313d |
child 814 | af117fb6eb5d |
permissions | -rw-r--r-- |
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" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
25 |
#include "packet-history.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
26 |
#include "chunk.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
27 |
#include "buffer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
28 |
|
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
29 |
namespace { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
30 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
31 |
class ItemList |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
32 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
33 |
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
|
34 |
void InitPayload (uint32_t packetUid, uint32_t size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
35 |
void AddHeader (uint32_t type, uint32_t size); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
36 |
void AddTrailer (uint32_t type, uint32_t size); |
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 |
void RemHeader (uint32_t type, uint32_t size); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
39 |
void RemTrailer (uint32_t type, uint32_t size); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
40 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
41 |
void RemAtStart (uint32_t toRemove); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
42 |
void RemAtEnd (uint32_t toRemove); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
43 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
44 |
void AddAtEnd (ItemList const *other); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
45 |
|
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
|
46 |
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
|
47 |
|
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
48 |
private: |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
49 |
enum Type { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
50 |
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
|
51 |
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
|
52 |
TRAILER, |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
53 |
}; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
54 |
struct Item |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
55 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
56 |
enum ItemList::Type m_type; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
57 |
uint32_t m_size; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
58 |
uint32_t m_chunkType; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
59 |
uint32_t m_fragmentStart; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
60 |
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
|
61 |
uint32_t m_packetUid; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
62 |
}; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
63 |
std::list<Item> m_itemList; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
64 |
}; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
65 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
66 |
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
|
67 |
ItemList::InitPayload (uint32_t packetUid, uint32_t size) |
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 |
NS_ASSERT (m_itemList.empty ()); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
70 |
struct Item item; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
71 |
item.m_type = ItemList::PAYLOAD; |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
72 |
item.m_chunkType = 0; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
73 |
item.m_size = size; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
74 |
item.m_fragmentStart = 0; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
75 |
item.m_fragmentEnd = 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
|
76 |
item.m_packetUid = packetUid; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
77 |
m_itemList.push_back (item); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
78 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
79 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
80 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
81 |
ItemList::AddHeader (uint32_t type, uint32_t size) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
82 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
83 |
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
|
84 |
item.m_type = ItemList::HEADER; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
85 |
item.m_chunkType = type; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
86 |
item.m_size = size; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
87 |
item.m_fragmentStart = 0; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
88 |
item.m_fragmentEnd = 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
|
89 |
item.m_packetUid = m_itemList.front ().m_packetUid; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
90 |
m_itemList.push_front (item); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
91 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
92 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
93 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
94 |
ItemList::AddTrailer (uint32_t type, uint32_t size) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
95 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
96 |
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
|
97 |
item.m_type = ItemList::TRAILER; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
98 |
item.m_chunkType = type; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
99 |
item.m_size = size; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
100 |
item.m_fragmentStart = 0; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
101 |
item.m_fragmentEnd = 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
|
102 |
item.m_packetUid = m_itemList.back ().m_packetUid; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
103 |
m_itemList.push_back (item); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
104 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
105 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
106 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
107 |
ItemList::RemHeader (uint32_t type, uint32_t size) |
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 |
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
|
110 |
if (item.m_type != ItemList::HEADER || |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
111 |
item.m_size != size || |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
112 |
item.m_chunkType != type) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
113 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
114 |
NS_FATAL_ERROR ("Removing Unexpected header"); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
115 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
116 |
else if (item.m_fragmentStart != 0 || |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
117 |
item.m_fragmentEnd != item.m_size) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
118 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
119 |
NS_FATAL_ERROR ("Removing non-complete header"); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
120 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
121 |
m_itemList.pop_front (); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
122 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
123 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
124 |
ItemList::RemTrailer (uint32_t type, uint32_t size) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
125 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
126 |
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
|
127 |
if (item.m_type != ItemList::TRAILER || |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
128 |
item.m_size != size || |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
129 |
item.m_chunkType != type) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
130 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
131 |
NS_FATAL_ERROR ("Removing Unexpected trailer"); |
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 |
else if (item.m_fragmentStart != 0 || |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
134 |
item.m_fragmentEnd != item.m_size) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
135 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
136 |
NS_FATAL_ERROR ("Removing non-complete trailer"); |
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 |
m_itemList.pop_back (); |
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 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
141 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
142 |
ItemList::RemAtStart (uint32_t toRemove) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
143 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
144 |
uint32_t leftToRemove = toRemove; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
145 |
while (!m_itemList.empty () && leftToRemove > 0) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
146 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
147 |
struct Item &item = m_itemList.front (); |
812
add0226d313d
make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
810
diff
changeset
|
148 |
if (item.m_fragmentEnd - item.m_fragmentStart <= leftToRemove) |
792
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 |
m_itemList.pop_front (); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
151 |
leftToRemove -= item.m_size; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
152 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
153 |
else |
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 |
item.m_fragmentStart += leftToRemove; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
156 |
leftToRemove = 0; |
812
add0226d313d
make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
810
diff
changeset
|
157 |
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
|
158 |
item.m_fragmentStart <= item.m_fragmentEnd); |
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 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
161 |
NS_ASSERT (leftToRemove == 0); |
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 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
164 |
ItemList::RemAtEnd (uint32_t toRemove) |
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 |
uint32_t leftToRemove = toRemove; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
167 |
while (!m_itemList.empty () && leftToRemove > 0) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
168 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
169 |
struct Item &item = m_itemList.back (); |
812
add0226d313d
make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
810
diff
changeset
|
170 |
if (item.m_fragmentEnd - item.m_fragmentStart <= leftToRemove) |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
171 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
172 |
m_itemList.pop_back (); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
173 |
leftToRemove -= item.m_size; |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
174 |
} |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
175 |
else |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
176 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
177 |
item.m_fragmentEnd -= leftToRemove; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
178 |
leftToRemove = 0; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
179 |
} |
812
add0226d313d
make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
810
diff
changeset
|
180 |
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
|
181 |
item.m_fragmentStart <= item.m_fragmentEnd && |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
182 |
item.m_fragmentEnd <= item.m_size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
183 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
184 |
NS_ASSERT (leftToRemove == 0); |
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 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
187 |
void |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
188 |
ItemList::AddAtEnd (ItemList const *other) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
189 |
{ |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
190 |
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
|
191 |
i != other->m_itemList.end (); i++) |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
192 |
{ |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
193 |
const ItemList::Item &item = *i; |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
194 |
ItemList::Item &last = 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
|
195 |
if (item.m_packetUid == last.m_packetUid && |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
196 |
item.m_type == last.m_type && |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
197 |
item.m_chunkType == last.m_chunkType && |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
198 |
item.m_size == last.m_size && |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
199 |
last.m_fragmentEnd != last.m_size && |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
200 |
item.m_fragmentStart == last.m_fragmentEnd) |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
201 |
{ |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
202 |
last.m_fragmentEnd = item.m_fragmentEnd; |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
203 |
} |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
204 |
else |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
205 |
{ |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
206 |
m_itemList.push_back (item); |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
207 |
} |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
208 |
} |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
209 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
210 |
|
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
211 |
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
|
212 |
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
|
213 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
214 |
NS_ASSERT (!m_itemList.empty ()); |
807
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
215 |
uint32_t totalSize = 0; |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
216 |
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
|
217 |
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
|
218 |
{ |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
219 |
ItemList::Item item = *i; |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
220 |
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
|
221 |
} |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
222 |
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
|
223 |
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
|
224 |
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
|
225 |
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
|
226 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
227 |
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
|
228 |
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
|
229 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
230 |
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
|
231 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
232 |
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
|
233 |
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
|
234 |
{ |
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 |
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
|
236 |
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
|
237 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
238 |
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
|
239 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
240 |
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
|
241 |
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
|
242 |
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
|
243 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
244 |
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
|
245 |
{ |
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 |
ns3::Buffer::Iterator j = buffer.End (); |
812
add0226d313d
make the tests pass again
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
810
diff
changeset
|
247 |
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
|
248 |
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
|
249 |
} |
807
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
250 |
else |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
251 |
{ |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
252 |
NS_ASSERT (false); |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
253 |
} |
1c3cc23a0cb8
force use of the ItemList to test it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
806
diff
changeset
|
254 |
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
|
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 |
} |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
257 |
|
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
258 |
} // anonymous namespace |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
259 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
260 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
261 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
262 |
bool PacketHistory::m_enable = false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
263 |
uint32_t PacketHistory::m_maxSize = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
264 |
PacketHistory::DataFreeList PacketHistory::m_freeList; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
265 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
266 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
267 |
PacketHistory::Enable (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
268 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
269 |
m_enable = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
270 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
271 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
272 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
273 |
PacketHistory::PacketHistory () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
274 |
: m_data (0), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
275 |
m_end (0), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
276 |
m_n (0), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
277 |
m_aggregated (false) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
278 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
279 |
Construct (0, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
280 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
281 |
PacketHistory::PacketHistory (uint32_t uid, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
282 |
: m_data (0), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
283 |
m_end (0), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
284 |
m_n (0), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
285 |
m_aggregated (false) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
286 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
287 |
Construct (uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
288 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
289 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
290 |
PacketHistory::Construct (uint32_t uid, uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
291 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
292 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
293 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
294 |
m_data = PacketHistory::Create (size); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
295 |
AppendOneCommand (PacketHistory::INIT, |
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
296 |
size, uid); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
297 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
298 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
299 |
PacketHistory::PacketHistory (PacketHistory const &o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
300 |
: m_data (o.m_data), |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
301 |
m_end (o.m_end), |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
302 |
m_n (o.m_n), |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
303 |
m_aggregated (o.m_aggregated) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
304 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
305 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
306 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
307 |
m_data->m_count++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
308 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
309 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
310 |
PacketHistory & |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
311 |
PacketHistory::operator = (PacketHistory const& o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
312 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
313 |
if (m_data == o.m_data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
314 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
315 |
// self assignment |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
316 |
return *this; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
317 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
318 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
319 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
320 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
321 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
322 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
323 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
324 |
} |
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 |
m_data = o.m_data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
327 |
m_end = o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
328 |
m_n = o.m_n; |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
329 |
m_aggregated = o.m_aggregated; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
330 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
331 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
332 |
m_data->m_count++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
333 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
334 |
return *this; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
335 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
336 |
PacketHistory::~PacketHistory () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
337 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
338 |
if (m_data != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
339 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
340 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
341 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
342 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
343 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
344 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
345 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
346 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
347 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
348 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
349 |
struct PacketHistory::CommandData * |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
350 |
PacketHistory::Create (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
351 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
352 |
if (size > m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
353 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
354 |
m_maxSize = size; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
355 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
356 |
while (!m_freeList.empty ()) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
357 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
358 |
struct PacketHistory::CommandData *data = m_freeList.back (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
359 |
m_freeList.pop_back (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
360 |
if (data->m_size >= size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
361 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
362 |
data->m_count = 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
363 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
364 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
365 |
PacketHistory::Deallocate (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
366 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
367 |
return PacketHistory::Allocate (size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
368 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
369 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
370 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
371 |
PacketHistory::Recycle (struct CommandData *data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
372 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
373 |
NS_ASSERT (data->m_count == 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
374 |
if (m_freeList.size () > 1000 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
375 |
data->m_size < m_maxSize) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
376 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
377 |
PacketHistory::Deallocate (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
378 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
379 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
380 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
381 |
m_freeList.push_back (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
382 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
383 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
384 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
385 |
struct PacketHistory::CommandData * |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
386 |
PacketHistory::Allocate (uint32_t n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
387 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
388 |
uint32_t size = sizeof (struct CommandData); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
389 |
if (n <= 4) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
390 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
391 |
n = 4; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
392 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
393 |
size += (n-4) * (4 + 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
394 |
uint8_t *buf = new uint8_t [size]; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
395 |
struct CommandData *data = (struct CommandData *)buf; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
396 |
data->m_size = n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
397 |
data->m_count = 1; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
398 |
return data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
399 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
400 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
401 |
PacketHistory::Deallocate (struct CommandData *data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
402 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
403 |
uint8_t *buf = (uint8_t *)data; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
404 |
delete [] buf; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
405 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
406 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
407 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
408 |
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data0, uint32_t data1) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
409 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
410 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
411 |
uint32_t n = GetUleb128Size (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
412 |
n += GetUleb128Size (data0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
413 |
n += GetUleb128Size (data1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
414 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
415 |
if (m_data->m_size > m_end + n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
416 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
417 |
if (m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
418 |
m_data->m_dirtyEnd == m_end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
419 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
420 |
AppendValue (type); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
421 |
AppendValue (data0); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
422 |
AppendValue (data1); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
423 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
424 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
425 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
426 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
427 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
428 |
uint8_t *buffer = &(m_data->m_data[m_end]); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
429 |
uint32_t lastType = ReadForwardValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
430 |
if (lastType == type) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
431 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
432 |
uint32_t lastData = ReadForwardValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
433 |
if (lastData == data0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
434 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
435 |
lastData = ReadForwardValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
436 |
if (lastData == data1) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
437 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
438 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
439 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
440 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
441 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
442 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
443 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
444 |
Reserve (n); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
445 |
AppendValue (type); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
446 |
AppendValue (data0); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
447 |
AppendValue (data1); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
448 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
449 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
450 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
451 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
452 |
PacketHistory::AppendOneCommand (uint32_t type, uint32_t data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
453 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
454 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
455 |
uint32_t n = GetUleb128Size (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
456 |
n += GetUleb128Size (type); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
457 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
458 |
if (m_data->m_size > m_end + n) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
459 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
460 |
if (m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
461 |
m_data->m_dirtyEnd == m_end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
462 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
463 |
AppendValue (type); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
464 |
AppendValue (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
465 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
466 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
467 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
468 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
469 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
470 |
uint8_t *buffer = &(m_data->m_data[m_end]); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
471 |
uint32_t lastType = ReadForwardValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
472 |
if (lastType == type) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
473 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
474 |
uint32_t lastData = ReadForwardValue (&buffer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
475 |
if (lastData == data) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
476 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
477 |
return; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
478 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
479 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
480 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
481 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
482 |
Reserve (n); |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
483 |
AppendValue (type); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
484 |
AppendValue (data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
485 |
m_n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
486 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
487 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
488 |
PacketHistory::ReserveCopy (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
489 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
490 |
struct CommandData *newData = PacketHistory::Create (m_end + size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
491 |
memcpy (newData->m_data, m_data->m_data, m_end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
492 |
newData->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
493 |
m_data->m_count--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
494 |
if (m_data->m_count == 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
495 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
496 |
PacketHistory::Recycle (m_data); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
497 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
498 |
m_data = newData; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
499 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
500 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
501 |
PacketHistory::Reserve (uint32_t size) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
502 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
503 |
NS_ASSERT (m_data != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
504 |
if (m_data->m_size > m_end + size && |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
505 |
(m_data->m_count == 1 || |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
506 |
m_data->m_dirtyEnd == m_end)) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
507 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
508 |
/* enough room, not dirty. */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
509 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
510 |
else |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
511 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
512 |
/* (enough room and dirty) or (not enough room) */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
513 |
ReserveCopy (size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
514 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
515 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
516 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
517 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
518 |
PacketHistory::GetUleb128Size (uint32_t value) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
519 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
520 |
uint32_t n = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
521 |
uint32_t tmp = value; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
522 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
523 |
tmp >>= 7; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
524 |
n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
525 |
} while (tmp != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
526 |
return n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
527 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
528 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
529 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
530 |
PacketHistory::GetReverseUleb128Size (uint8_t *buffer) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
531 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
532 |
uint8_t *cur = buffer; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
533 |
uint8_t byte = *cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
534 |
if (byte & 0x80) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
535 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
536 |
NS_FATAL_ERROR ("The last byte should have a zero high bit"); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
537 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
538 |
cur--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
539 |
while ((byte & 0x80) && (buffer - cur) < 5) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
540 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
541 |
cur--; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
542 |
byte = *cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
543 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
544 |
uint32_t n = buffer - cur; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
545 |
return n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
546 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
547 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
548 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
549 |
PacketHistory::AppendValue (uint32_t value) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
550 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
551 |
uint32_t n = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
552 |
uint8_t *buffer = &m_data->m_data[m_end]; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
553 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
554 |
uint8_t byte = value & (~0x80); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
555 |
value >>= 7; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
556 |
if (value != 0) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
557 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
558 |
/* more bytes to come */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
559 |
byte |= 0x80; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
560 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
561 |
n++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
562 |
*buffer = byte; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
563 |
buffer++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
564 |
} while (value != 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
565 |
m_end += n; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
566 |
if (m_end > m_data->m_dirtyEnd) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
567 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
568 |
m_data->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
569 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
570 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
571 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
572 |
uint32_t |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
573 |
PacketHistory::ReadValue (uint8_t *buffer, uint32_t *n) const |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
574 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
575 |
uint32_t result = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
576 |
uint8_t shift, byte; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
577 |
result = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
578 |
shift = 0; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
579 |
do { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
580 |
byte = *buffer; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
581 |
buffer++; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
582 |
result |= (byte & (~0x80))<<shift; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
583 |
shift += 7; |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
584 |
(*n)++; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
585 |
} while (byte & 0x80 && |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
586 |
/* a LEB128 unsigned number is at most 5 bytes long. */ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
587 |
shift < (7*5)); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
588 |
if (byte & 0x80) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
589 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
590 |
/* This means that the LEB128 number was not valid. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
591 |
* ie: the last (5th) byte did not have the high-order bit zeroed. |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
592 |
*/ |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
593 |
result = 0xffffffff; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
594 |
} |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
595 |
return result; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
596 |
} |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
597 |
|
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
598 |
uint32_t |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
599 |
PacketHistory::ReadForwardValue (uint8_t **pBuffer) const |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
600 |
{ |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
601 |
uint32_t read = 0; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
602 |
uint32_t result = ReadValue (*pBuffer, &read); |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
603 |
*pBuffer = *pBuffer + read; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
604 |
return result; |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
605 |
} |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
606 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
607 |
PacketHistory |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
608 |
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
|
609 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
610 |
PacketHistory fragment = *this; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
611 |
fragment.RemoveAtStart (start); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
612 |
fragment.RemoveAtEnd (end); |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
613 |
return fragment; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
614 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
615 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
616 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
617 |
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
|
618 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
619 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
620 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
621 |
AppendOneCommand (PacketHistory::ADD_HEADER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
622 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
623 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
624 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
625 |
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
|
626 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
627 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
628 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
629 |
AppendOneCommand (PacketHistory::REM_HEADER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
630 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
631 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
632 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
633 |
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
|
634 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
635 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
636 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
637 |
AppendOneCommand (PacketHistory::ADD_TRAILER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
638 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
639 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
640 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
641 |
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
|
642 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
643 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
644 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
645 |
AppendOneCommand (PacketHistory::REM_TRAILER, uid, size); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
646 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
647 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
648 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
649 |
PacketHistory::AddAtEnd (PacketHistory const&o) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
650 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
651 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
652 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
653 |
m_aggregated = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
654 |
uint32_t n = GetUleb128Size (PacketHistory::ADD_AT_END); |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
655 |
n += GetUleb128Size (o.m_end); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
656 |
n += o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
657 |
Reserve (n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
658 |
memcpy (&m_data->m_data[m_end], o.m_data->m_data, o.m_end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
659 |
m_end += o.m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
660 |
if (m_end > m_data->m_dirtyEnd) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
661 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
662 |
m_data->m_dirtyEnd = m_end; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
663 |
} |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
664 |
AppendOneCommand (PacketHistory::ADD_AT_END, o.m_end); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
665 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
666 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
667 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
668 |
PacketHistory::AddPaddingAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
669 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
670 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
671 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
672 |
AppendOneCommand (PacketHistory::PADDING_AT_END, end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
673 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
674 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
675 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
676 |
PacketHistory::RemoveAtStart (uint32_t start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
677 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
678 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
679 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
680 |
AppendOneCommand (PacketHistory::REM_AT_START, start); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
681 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
682 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
683 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
684 |
PacketHistory::RemoveAtEnd (uint32_t end) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
685 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
686 |
if (m_enable) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
687 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
688 |
AppendOneCommand (PacketHistory::REM_AT_END, end); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
689 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
690 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
691 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
692 |
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
|
693 |
PacketHistory::PrintComplex (std::ostream &os, Buffer buffer, const PacketPrinter &printer) const |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
694 |
{ |
791
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
695 |
// we need to build a linked list of the different fragments |
ff528910ba40
prepare for forward iteration of history.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
790
diff
changeset
|
696 |
// which are stored in this packet. |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
697 |
uint8_t *dataBuffer = &m_data->m_data[0]; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
698 |
ItemList itemList; |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
699 |
BuildItemList (&itemList, dataBuffer, m_end); |
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
|
700 |
itemList.Print (os, buffer, printer); |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
701 |
} |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
702 |
|
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
703 |
void |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
704 |
PacketHistory::BuildItemList (ItemList *list, uint8_t *buffer, uint32_t size) const |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
705 |
{ |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
706 |
// we need to build a linked list of the different fragments |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
707 |
// which are stored in this packet. |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
708 |
uint8_t *dataBuffer = buffer; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
709 |
for (uint32_t i = 0; i < m_n; i++) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
710 |
{ |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
711 |
uint32_t type = ReadForwardValue (&dataBuffer); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
712 |
uint32_t data = ReadForwardValue (&dataBuffer); |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
713 |
switch (type) |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
714 |
{ |
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
715 |
case INIT: { |
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
716 |
uint32_t uid = ReadForwardValue (&dataBuffer); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
717 |
list->InitPayload (uid, data); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
718 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
719 |
case ADD_HEADER: { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
720 |
uint32_t size = ReadForwardValue (&dataBuffer); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
721 |
list->AddHeader (data, size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
722 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
723 |
case REM_HEADER: { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
724 |
uint32_t size = ReadForwardValue (&dataBuffer); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
725 |
list->RemHeader (data, size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
726 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
727 |
case ADD_TRAILER: { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
728 |
uint32_t size = ReadForwardValue (&dataBuffer); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
729 |
list->AddTrailer (data, size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
730 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
731 |
case REM_TRAILER: { |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
732 |
uint32_t size = ReadForwardValue (&dataBuffer); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
733 |
list->RemTrailer (data, size); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
734 |
} break; |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
735 |
case ADD_AT_END: { |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
736 |
ItemList other; |
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
737 |
BuildItemList (&other, dataBuffer, data); |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
738 |
list->AddAtEnd (&other); |
794
f30d69393a24
implement ItemList::AddAtEnd
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
792
diff
changeset
|
739 |
} break; |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
740 |
case REM_AT_START: { |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
741 |
list->RemAtStart (data); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
742 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
743 |
case REM_AT_END: { |
810
d170149bcc7b
build the ItemList into the input list, not a temporary stack variable.
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
809
diff
changeset
|
744 |
list->RemAtEnd (data); |
792
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
745 |
} break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
746 |
case PADDING_AT_END: |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
747 |
break; |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
748 |
} |
99423210502e
implement ItemList construction
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
791
diff
changeset
|
749 |
} |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
750 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
751 |
|
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
752 |
void |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
753 |
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
|
754 |
{ |
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
|
755 |
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
|
756 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
757 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
758 |
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
|
759 |
PacketHistory::Print (std::ostream &os, Buffer buffer, const 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
|
760 |
{ |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
761 |
if (!m_enable) |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
762 |
{ |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
763 |
return; |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
764 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
765 |
|
809
1bfeec93c1e1
remove PrintSimple and revert order of history data written in data buffer
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
807
diff
changeset
|
766 |
PrintComplex (os, buffer, printer); |
790
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
767 |
} |
de06cb662828
keep track of the aggregation state
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
789
diff
changeset
|
768 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
769 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
770 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
771 |
}; // namespace ns3 |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
772 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
773 |
#include <stdarg.h> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
774 |
#include <iostream> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
775 |
#include <sstream> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
776 |
#include "ns3/test.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
777 |
#include "header.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
778 |
#include "trailer.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
779 |
#include "packet.h" |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
780 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
781 |
namespace ns3 { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
782 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
783 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
784 |
class HistoryHeader : public Header |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
785 |
{ |
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
|
786 |
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
|
787 |
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
|
788 |
bool IsOk (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
789 |
private: |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
790 |
virtual std::string DoGetName (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
791 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
792 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
793 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
794 |
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
|
795 |
bool m_ok; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
796 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
797 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
798 |
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
|
799 |
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
|
800 |
: 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
|
801 |
{} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
802 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
803 |
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
|
804 |
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
|
805 |
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
|
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
|
807 |
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
|
808 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
809 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
810 |
template <int N> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
811 |
std::string |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
812 |
HistoryHeader<N>::DoGetName (void) const |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
813 |
{ |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
814 |
std::ostringstream oss; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
815 |
oss << N; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
816 |
return oss.str (); |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
817 |
} |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
818 |
|
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
819 |
template <int N> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
820 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
821 |
HistoryHeader<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
822 |
{ |
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
|
823 |
NS_ASSERT (false); |
789
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 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
826 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
827 |
HistoryHeader<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
828 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
829 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
830 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
831 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
832 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
833 |
HistoryHeader<N>::SerializeTo (Buffer::Iterator start) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
834 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
835 |
start.WriteU8 (N, N); |
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 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
838 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
839 |
HistoryHeader<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
840 |
{ |
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
|
841 |
m_ok = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
842 |
for (int i = 0; i < N; i++) |
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 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
845 |
{ |
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
|
846 |
m_ok = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
847 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
848 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
849 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
850 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
851 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
852 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
853 |
class HistoryTrailer : public Trailer |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
854 |
{ |
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
|
855 |
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
|
856 |
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
|
857 |
bool IsOk (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
858 |
private: |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
859 |
virtual std::string DoGetName (void) const; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
860 |
virtual void PrintTo (std::ostream &os) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
861 |
virtual uint32_t GetSerializedSize (void) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
862 |
virtual void SerializeTo (Buffer::Iterator start) const; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
863 |
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
|
864 |
bool m_ok; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
865 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
866 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
867 |
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
|
868 |
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
|
869 |
: 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
|
870 |
{} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
871 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
872 |
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
|
873 |
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
|
874 |
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
|
875 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
876 |
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
|
877 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
878 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
879 |
template <int N> |
795
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
880 |
std::string |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
881 |
HistoryTrailer<N>::DoGetName (void) const |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
882 |
{ |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
883 |
std::ostringstream oss; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
884 |
oss << N; |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
885 |
return oss.str (); |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
886 |
} |
cd108c9817d0
add Chunk::GetName and implement it
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
794
diff
changeset
|
887 |
template <int N> |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
888 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
889 |
HistoryTrailer<N>::PrintTo (std::ostream &os) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
890 |
{ |
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
|
891 |
NS_ASSERT (false); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
892 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
893 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
894 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
895 |
HistoryTrailer<N>::GetSerializedSize (void) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
896 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
897 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
898 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
899 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
900 |
void |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
901 |
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
902 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
903 |
start.WriteU8 (N, N); |
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 |
template <int N> |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
906 |
uint32_t |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
907 |
HistoryTrailer<N>::DeserializeFrom (Buffer::Iterator start) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
908 |
{ |
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
|
909 |
m_ok = true; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
910 |
start.Prev (N); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
911 |
for (int i = 0; i < N; i++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
912 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
913 |
if (start.ReadU8 () != N) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
914 |
{ |
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
|
915 |
m_ok = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
916 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
917 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
918 |
return N; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
919 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
920 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
921 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
922 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
923 |
class PacketHistoryTest : public Test { |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
924 |
public: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
925 |
PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
926 |
virtual ~PacketHistoryTest (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
927 |
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
|
928 |
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
|
929 |
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
|
930 |
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
|
931 |
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
|
932 |
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
|
933 |
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
|
934 |
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
|
935 |
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
|
936 |
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
|
937 |
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
|
938 |
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
|
939 |
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
|
940 |
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
|
941 |
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
|
942 |
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
|
943 |
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
|
944 |
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
|
945 |
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
|
946 |
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
|
947 |
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
|
948 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
949 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
950 |
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
|
951 |
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
|
952 |
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
|
953 |
PacketPrinter m_printer; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
954 |
}; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
955 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
956 |
PacketHistoryTest::PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
957 |
: 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
|
958 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
959 |
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
|
960 |
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
|
961 |
} |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
962 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
963 |
PacketHistoryTest::~PacketHistoryTest () |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
964 |
{} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
965 |
|
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
|
966 |
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
|
967 |
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
|
968 |
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
|
969 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
970 |
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
|
971 |
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
|
972 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
973 |
m_printer.AddPrinter (MakeCallback (&PacketHistoryTest::PrintHeader<N>, 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
|
974 |
MakeCallback (&PacketHistoryTest::PrintFragment, 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
|
975 |
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
|
976 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
977 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
978 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
979 |
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
|
980 |
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
|
981 |
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
|
982 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
983 |
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
|
984 |
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
|
985 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
986 |
m_printer.AddPrinter (MakeCallback (&PacketHistoryTest::PrintTrailer<N>, 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
|
987 |
MakeCallback (&PacketHistoryTest::PrintFragment, 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
|
988 |
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
|
989 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
990 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
991 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
992 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
993 |
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
|
994 |
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
|
995 |
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
|
996 |
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
|
997 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
998 |
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
|
999 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1000 |
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
|
1001 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1002 |
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
|
1003 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1004 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1005 |
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
|
1006 |
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
|
1007 |
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
|
1008 |
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
|
1009 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1010 |
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
|
1011 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1012 |
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
|
1013 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1014 |
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
|
1015 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1016 |
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
|
1017 |
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
|
1018 |
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
|
1019 |
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
|
1020 |
{ |
813
0001e4abcf7b
test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
812
diff
changeset
|
1021 |
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
|
1022 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1023 |
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
|
1024 |
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
|
1025 |
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
|
1026 |
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
|
1027 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1028 |
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
|
1029 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1030 |
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
|
1031 |
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
|
1032 |
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
|
1033 |
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
|
1034 |
{ |
813
0001e4abcf7b
test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
812
diff
changeset
|
1035 |
//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
|
1036 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1037 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1038 |
|
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1039 |
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
|
1040 |
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
|
1041 |
{ |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1042 |
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
|
1043 |
} |
0190f1b49dc8
re-implement PacketHistory to use the PacketPrinter and work on ItemList::Print
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
795
diff
changeset
|
1044 |
|
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1045 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1046 |
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
|
1047 |
{ |
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
|
1048 |
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
|
1049 |
m_trailerError = false; |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1050 |
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
|
1051 |
p.Print (std::cerr, m_printer); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1052 |
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
|
1053 |
if (m_headerError) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1054 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1055 |
std::cout << "PacketHistory header error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1056 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1057 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1058 |
} |
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
|
1059 |
if (m_trailerError) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1060 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1061 |
std::cout << "PacketHistory trailer error. file=" << file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1062 |
<< ", line=" << line << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1063 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1064 |
} |
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
|
1065 |
if (n != m_prints.size ()) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1066 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1067 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1068 |
} |
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
|
1069 |
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
|
1070 |
i != m_prints.end (); i++) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1071 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1072 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1073 |
if (v != *i) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1074 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1075 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1076 |
goto error; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1077 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1078 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1079 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1080 |
return true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1081 |
error: |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1082 |
std::cout << "PacketHistory error. file="<< file |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1083 |
<< ", 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
|
1084 |
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
|
1085 |
i != m_prints.end (); i++) |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1086 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1087 |
std::cout << *i << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1088 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1089 |
std::cout << "\", expected: \""; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1090 |
va_start (ap, n); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1091 |
for (uint32_t j = 0; j < n; j++) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1092 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1093 |
int v = va_arg (ap, int); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1094 |
std::cout << v << ", "; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1095 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1096 |
va_end (ap); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1097 |
std::cout << "\"" << std::endl; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1098 |
return false; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1099 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1100 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1101 |
#define ADD_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1102 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1103 |
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
|
1104 |
RegisterHeader<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1105 |
p.AddHeader (header); \ |
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 |
#define ADD_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1108 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1109 |
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
|
1110 |
RegisterTrailer<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1111 |
p.AddTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1112 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1113 |
#define REM_HEADER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1114 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1115 |
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
|
1116 |
RegisterHeader<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1117 |
p.RemoveHeader (header); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1118 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1119 |
#define REM_TRAILER(p, n) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1120 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1121 |
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
|
1122 |
RegisterTrailer<n> (); \ |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1123 |
p.RemoveTrailer (trailer); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1124 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1125 |
#define CHECK_HISTORY(p, ...) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1126 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1127 |
if (!CheckHistory (p, __FILE__, \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1128 |
__LINE__, __VA_ARGS__)) \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1129 |
{ \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1130 |
ok = false; \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1131 |
} \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1132 |
CleanupPrints (); \ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1133 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1134 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1135 |
bool |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1136 |
PacketHistoryTest::RunTests (void) |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1137 |
{ |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1138 |
bool ok = true; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1139 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1140 |
PacketHistory::Enable (); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1141 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1142 |
Packet p = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1143 |
Packet p1 = Packet (0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1144 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1145 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1146 |
ADD_TRAILER (p, 100); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1147 |
CHECK_HISTORY (p, 1, 100); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1148 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1149 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1150 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1151 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1152 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1153 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1154 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1155 |
ADD_HEADER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1156 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1157 |
5, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1158 |
ADD_HEADER (p, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1159 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1160 |
6, 5, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1161 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1162 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1163 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1164 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1165 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1166 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1167 |
CHECK_HISTORY (p, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1168 |
2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1169 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1170 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1171 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1172 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1173 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1174 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1175 |
REM_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1176 |
CHECK_HISTORY (p, 1, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1177 |
1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1178 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1179 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1180 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1181 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1182 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1183 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1184 |
REM_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1185 |
REM_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1186 |
CHECK_HISTORY (p, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1187 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1188 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1189 |
ADD_HEADER (p, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1190 |
ADD_HEADER (p, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1191 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1192 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1193 |
REM_HEADER (p1, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1194 |
REM_HEADER (p1, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1195 |
REM_HEADER (p1, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1196 |
CHECK_HISTORY (p1, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1197 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1198 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1199 |
ADD_HEADER (p1, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1200 |
ADD_HEADER (p1, 2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1201 |
CHECK_HISTORY (p1, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1202 |
2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1203 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1204 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1205 |
ADD_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1206 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1207 |
3, 3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1208 |
ADD_TRAILER (p, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1209 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1210 |
3, 3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1211 |
ADD_TRAILER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1212 |
CHECK_HISTORY (p, 6, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1213 |
3, 3, 2, 1, 4, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1214 |
REM_HEADER (p, 3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1215 |
CHECK_HISTORY (p, 5, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1216 |
3, 2, 1, 4, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1217 |
REM_TRAILER (p, 5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1218 |
CHECK_HISTORY (p, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1219 |
3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1220 |
p1 = p; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1221 |
REM_TRAILER (p, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1222 |
CHECK_HISTORY (p, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1223 |
3, 2, 1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1224 |
CHECK_HISTORY (p1, 4, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1225 |
3, 2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1226 |
p1.RemoveAtStart (3); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1227 |
CHECK_HISTORY (p1, 3, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1228 |
2, 1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1229 |
p1.RemoveAtStart (2); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1230 |
CHECK_HISTORY (p1, 2, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1231 |
1, 4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1232 |
p1.RemoveAtEnd (4); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1233 |
CHECK_HISTORY (p1, 1, |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1234 |
1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1235 |
p1.RemoveAtStart (1); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1236 |
CHECK_HISTORY (p1, 0); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1237 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1238 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1239 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1240 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1241 |
ADD_TRAILER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1242 |
p.RemoveAtStart (8+10+8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1243 |
CHECK_HISTORY (p, 1, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1244 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1245 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1246 |
p = Packet (10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1247 |
ADD_HEADER (p, 10); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1248 |
ADD_HEADER (p, 8); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1249 |
ADD_TRAILER (p, 6); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1250 |
ADD_TRAILER (p, 7); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1251 |
ADD_TRAILER (p, 9); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1252 |
p.RemoveAtStart (5); |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1253 |
p.RemoveAtEnd (12); |
813
0001e4abcf7b
test fragments
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
812
diff
changeset
|
1254 |
CHECK_HISTORY (p, 4, 3, 10, 6, 4); |
789
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1255 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1256 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1257 |
return ok; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1258 |
} |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1259 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1260 |
static PacketHistoryTest g_packetHistoryTest; |
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1261 |
|
1e19322e9012
merge unfinished packet history code
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
diff
changeset
|
1262 |
}//namespace ns3 |