author | Mathieu Lacage <mathieu.lacage@sophia.inria.fr> |
Wed, 30 Sep 2009 14:54:53 +0200 | |
changeset 5312 | c0ea2fce5bcc |
parent 4184 | e7a525be7dc2 |
child 5919 | b89ce2e9eed5 |
permissions | -rw-r--r-- |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
1 |
/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
2 |
/* |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
3 |
* Copyright (c) 2008 University of Washington |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
4 |
* |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
5 |
* This program is free software; you can redistribute it and/or modify |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
6 |
* it under the terms of the GNU General Public License version 2 as |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
8 |
* |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
9 |
* This program is distributed in the hope that it will be useful, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
10 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
11 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
12 |
* GNU General Public License for more details. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
13 |
* |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
14 |
* You should have received a copy of the GNU General Public License |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
15 |
* along with this program; if not, write to the Free Software |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
16 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
17 |
*/ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
18 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
19 |
#include <list> |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
20 |
#include "ns3/abort.h" |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
21 |
#include "ns3/assert.h" |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
22 |
#include "ns3/log.h" |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
23 |
#include "ns3/simulation-singleton.h" |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
24 |
#include "ipv4-address-generator.h" |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
25 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
26 |
NS_LOG_COMPONENT_DEFINE("Ipv4AddressGenerator"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
27 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
28 |
namespace ns3 { |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
29 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
30 |
class Ipv4AddressGeneratorImpl |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
31 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
32 |
public: |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
33 |
Ipv4AddressGeneratorImpl (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
34 |
virtual ~Ipv4AddressGeneratorImpl (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
35 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
36 |
void Init (const Ipv4Address net, const Ipv4Mask mask, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
37 |
const Ipv4Address addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
38 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
39 |
Ipv4Address GetNetwork (const Ipv4Mask mask) const; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
40 |
Ipv4Address NextNetwork (const Ipv4Mask mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
41 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
42 |
void InitAddress (const Ipv4Address addr, const Ipv4Mask mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
43 |
Ipv4Address GetAddress (const Ipv4Mask mask) const; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
44 |
Ipv4Address NextAddress (const Ipv4Mask mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
45 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
46 |
void Reset (void); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
47 |
bool AddAllocated (const Ipv4Address addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
48 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
49 |
void TestMode (void); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
50 |
private: |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
51 |
static const uint32_t N_BITS = 32; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
52 |
static const uint32_t MOST_SIGNIFICANT_BIT = 0x80000000; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
53 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
54 |
uint32_t MaskToIndex (Ipv4Mask mask) const; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
55 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
56 |
class NetworkState |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
57 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
58 |
public: |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
59 |
uint32_t mask; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
60 |
uint32_t shift; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
61 |
uint32_t network; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
62 |
uint32_t addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
63 |
uint32_t addrMax; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
64 |
}; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
65 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
66 |
NetworkState m_netTable[N_BITS]; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
67 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
68 |
class Entry |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
69 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
70 |
public: |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
71 |
uint32_t addrLow; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
72 |
uint32_t addrHigh; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
73 |
}; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
74 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
75 |
std::list<Entry> m_entries; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
76 |
bool m_test; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
77 |
}; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
78 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
79 |
Ipv4AddressGeneratorImpl::Ipv4AddressGeneratorImpl () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
80 |
: m_entries (), m_test (false) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
81 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
82 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
83 |
Reset (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
84 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
85 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
86 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
87 |
Ipv4AddressGeneratorImpl::Reset (void) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
88 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
89 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
90 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
91 |
uint32_t mask = 0; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
92 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
93 |
// There are 32 possible masks in a 32-bit integer. Two of these are illegal |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
94 |
// for a network mask (0x00000000 and 0xffffffff). Valid network masks |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
95 |
// correspond to some nonzero number of high order bits set to one followed by |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
96 |
// some nonzero number of lower order bits set to zero. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
97 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
98 |
// We look at a network number as an n-bit number where n is defined as the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
99 |
// number of bits in each mask. Allocating a new network number is simply |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
100 |
// incrementing this number. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
101 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
102 |
// In order to combine an allocated network number with an IP address, we have |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
103 |
// to shift the network into the correct alignment with respect to its mask. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
104 |
// For example, a network mask of 0xff000000 admits the possibility of 256 |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
105 |
// different network numbers since there are eight bits available. To create |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
106 |
// IP addresses, we need to shift the network number counter left by 24 bits |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
107 |
// to put it in correct alignment. This leaves 24 bits left for addresses. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
108 |
// We make sure we don't overflow by saving a maximum address number which is |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
109 |
// just the inverse of the mask (~mask). |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
110 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
111 |
for (uint32_t i = 0; i < N_BITS; ++i) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
112 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
113 |
m_netTable[i].mask = mask; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
114 |
mask >>= 1; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
115 |
mask |= MOST_SIGNIFICANT_BIT; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
116 |
m_netTable[i].network = 1; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
117 |
m_netTable[i].addr = 1; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
118 |
m_netTable[i].addrMax = ~mask; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
119 |
m_netTable[i].shift = N_BITS - i; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
120 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
121 |
m_entries.clear (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
122 |
m_test = false; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
123 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
124 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
125 |
Ipv4AddressGeneratorImpl::~Ipv4AddressGeneratorImpl () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
126 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
127 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
128 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
129 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
130 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
131 |
Ipv4AddressGeneratorImpl::Init ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
132 |
const Ipv4Address net, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
133 |
const Ipv4Mask mask, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
134 |
const Ipv4Address addr) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
135 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
136 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
137 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
138 |
// We're going to be playing with the actual bits in the network and mask so |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
139 |
// pull them out into ints. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
140 |
// |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
141 |
uint32_t maskBits = mask.Get (); |
3179
1763f7ac8e80
bug 146: s/HostOrder//
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3007
diff
changeset
|
142 |
uint32_t netBits = net.Get (); |
1763f7ac8e80
bug 146: s/HostOrder//
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3007
diff
changeset
|
143 |
uint32_t addrBits = addr.Get (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
144 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
145 |
// Some quick reasonableness testing. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
146 |
// |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
147 |
NS_ABORT_MSG_UNLESS ((netBits & ~maskBits) == 0, "Ipv4AddressGeneratorImpl::Init (): Inconsistent network and mask"); |
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
148 |
NS_ABORT_MSG_UNLESS ((addrBits & maskBits) == 0, "Ipv4AddressGeneratorImpl::Init (): Inconsistent address and mask"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
149 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
150 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
151 |
// Convert the network mask into an index into the network number table. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
152 |
// The network number comes in to us properly aligned for the mask and so |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
153 |
// needs to be shifted right into the normalized position (lowest bit of the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
154 |
// network number at bit zero of the int that holds it). |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
155 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
156 |
uint32_t index = MaskToIndex (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
157 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
158 |
m_netTable[index].network = netBits >> m_netTable[index].shift; |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
159 |
NS_ABORT_MSG_UNLESS (addrBits <= m_netTable[index].addrMax, "Ipv4AddressGeneratorImpl::Init(): Address overflow"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
160 |
m_netTable[index].addr = addrBits; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
161 |
return; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
162 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
163 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
164 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
165 |
Ipv4AddressGeneratorImpl::GetNetwork ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
166 |
const Ipv4Mask mask) const |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
167 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
168 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
169 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
170 |
uint32_t index = MaskToIndex (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
171 |
return Ipv4Address (m_netTable[index].network << m_netTable[index].shift); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
172 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
173 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
174 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
175 |
Ipv4AddressGeneratorImpl::NextNetwork ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
176 |
const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
177 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
178 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
179 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
180 |
// The way this is expected to be used is that an address and network prefix |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
181 |
// are initialized, and then NextAddress() is called repeatedly to set the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
182 |
// addresses on a given subnet. The client will expect that the first |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
183 |
// addresses will use the network prefix she used to initialize the generator |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
184 |
// with. After a subnet is assigned, the client will call NextNetwork to |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
185 |
// get the network number of the next subnet. This implies that that this |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
186 |
// operation is a pre-increment. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
187 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
188 |
uint32_t index = MaskToIndex (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
189 |
++m_netTable[index].network; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
190 |
return Ipv4Address (m_netTable[index].network << m_netTable[index].shift); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
191 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
192 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
193 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
194 |
Ipv4AddressGeneratorImpl::InitAddress ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
195 |
const Ipv4Address addr, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
196 |
const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
197 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
198 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
199 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
200 |
uint32_t index = MaskToIndex (mask); |
3179
1763f7ac8e80
bug 146: s/HostOrder//
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3007
diff
changeset
|
201 |
uint32_t addrBits = addr.Get (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
202 |
|
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
203 |
NS_ABORT_MSG_UNLESS (addrBits <= m_netTable[index].addrMax, "Ipv4AddressGeneratorImpl::InitAddress(): Address overflow"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
204 |
m_netTable[index].addr = addrBits; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
205 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
206 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
207 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
208 |
Ipv4AddressGeneratorImpl::GetAddress ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
209 |
const Ipv4Mask mask) const |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
210 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
211 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
212 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
213 |
uint32_t index = MaskToIndex (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
214 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
215 |
return Ipv4Address ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
216 |
(m_netTable[index].network << m_netTable[index].shift) | |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
217 |
m_netTable[index].addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
218 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
219 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
220 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
221 |
Ipv4AddressGeneratorImpl::NextAddress (const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
222 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
223 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
224 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
225 |
// The way this is expected to be used is that an address and network prefix |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
226 |
// are initialized, and then NextAddress() is called repeatedly to set the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
227 |
// addresses on a given subnet. The client will expect that the first address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
228 |
// she gets back is the one she used to initialize the generator with. This |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
229 |
// implies that this operation is a post-increment. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
230 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
231 |
uint32_t index = MaskToIndex (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
232 |
|
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
233 |
NS_ABORT_MSG_UNLESS (m_netTable[index].addr <= m_netTable[index].addrMax, |
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
234 |
"Ipv4AddressGeneratorImpl::NextAddress(): Address overflow"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
235 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
236 |
Ipv4Address addr = Ipv4Address ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
237 |
(m_netTable[index].network << m_netTable[index].shift) | |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
238 |
m_netTable[index].addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
239 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
240 |
++m_netTable[index].addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
241 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
242 |
// Make a note that we've allocated this address -- used for address collision |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
243 |
// detection. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
244 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
245 |
AddAllocated (addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
246 |
return addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
247 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
248 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
249 |
bool |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
250 |
Ipv4AddressGeneratorImpl::AddAllocated (const Ipv4Address address) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
251 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
252 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
253 |
|
3179
1763f7ac8e80
bug 146: s/HostOrder//
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3007
diff
changeset
|
254 |
uint32_t addr = address.Get (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
255 |
|
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
256 |
NS_ABORT_MSG_UNLESS (addr, "Ipv4AddressGeneratorImpl::Add(): Allocating the broadcast address is not a good idea"); |
3007
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
257 |
|
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
258 |
std::list<Entry>::iterator i; |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
259 |
|
3007
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
260 |
for (i = m_entries.begin (); i != m_entries.end (); ++i) |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
261 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
262 |
NS_LOG_LOGIC ("examine entry: " << Ipv4Address ((*i).addrLow) << |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
263 |
" to " << Ipv4Address ((*i).addrHigh)); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
264 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
265 |
// First things first. Is there an address collision -- that is, does the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
266 |
// new address fall in a previously allocated block of addresses. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
267 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
268 |
if (addr >= (*i).addrLow && addr <= (*i).addrHigh) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
269 |
{ |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
270 |
NS_LOG_LOGIC ("Ipv4AddressGeneratorImpl::Add(): Address Collision: " << Ipv4Address (addr)); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
271 |
if (!m_test) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
272 |
{ |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
273 |
NS_FATAL_ERROR ("Ipv4AddressGeneratorImpl::Add(): Address Collision: " << Ipv4Address (addr)); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
274 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
275 |
return false; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
276 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
277 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
278 |
// If the new address is less than the lowest address in the current block, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
279 |
// and can't be merged into to the current block, then insert it as a new |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
280 |
// block before the current block. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
281 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
282 |
if (addr < (*i).addrLow - 1) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
283 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
284 |
break; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
285 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
286 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
287 |
// If the new address fits at the end of the block, look ahead to the next |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
288 |
// block and make sure it's not a collision there. If we won't overlap, then |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
289 |
// just extend the current block by one address. We expect that completely |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
290 |
// filled network ranges will be a fairly rare occurrence, so we don't worry |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
291 |
// about collapsing address range blocks. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
292 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
293 |
if (addr == (*i).addrHigh + 1) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
294 |
{ |
3007
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
295 |
std::list<Entry>::iterator j = i; |
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
296 |
++j; |
364e3943c8f0
fix optimized build, bug 169
Craig Dowell <craigdo@ee.washington.edu>
parents:
2983
diff
changeset
|
297 |
|
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
298 |
if (j != m_entries.end ()) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
299 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
300 |
if (addr == (*j).addrLow) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
301 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
302 |
NS_LOG_LOGIC ("Ipv4AddressGeneratorImpl::Add(): " |
2894
a65404754cb7
some additional debugging for addressing conflicts
Tom Henderson <tomh@tomh.org>
parents:
2723
diff
changeset
|
303 |
"Address Collision: " << Ipv4Address (addr)); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
304 |
if (!m_test) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
305 |
{ |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
306 |
NS_FATAL_ERROR ("Ipv4AddressGeneratorImpl::Add(): Address Collision: " << Ipv4Address (addr)); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
307 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
308 |
return false; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
309 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
310 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
311 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
312 |
NS_LOG_LOGIC ("New addrHigh = " << Ipv4Address (addr)); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
313 |
(*i).addrHigh = addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
314 |
return true; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
315 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
316 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
317 |
// If we get here, we know that the next lower block of addresses couldn't |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
318 |
// have been extended to include this new address since the code immediately |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
319 |
// above would have been executed and that next lower block extended upward. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
320 |
// So we know it's safe to extend the current block down to includ the new |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
321 |
// address. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
322 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
323 |
if (addr == (*i).addrLow - 1) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
324 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
325 |
NS_LOG_LOGIC ("New addrLow = " << Ipv4Address (addr)); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
326 |
(*i).addrLow = addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
327 |
return true; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
328 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
329 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
330 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
331 |
Entry entry; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
332 |
entry.addrLow = entry.addrHigh = addr; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
333 |
m_entries.insert(i, entry); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
334 |
return true; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
335 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
336 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
337 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
338 |
Ipv4AddressGeneratorImpl::TestMode (void) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
339 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
340 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
341 |
m_test = true; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
342 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
343 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
344 |
uint32_t |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
345 |
Ipv4AddressGeneratorImpl::MaskToIndex (Ipv4Mask mask) const |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
346 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
347 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
348 |
// We've been given a mask that has a higher order bit set for each bit of the |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
349 |
// network number. In order to translate this mask into an index, we just need |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
350 |
// to count the number of zero bits in the mask. We do this in a loop in which |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
351 |
// we shift the mask right until we find the first nonzero bit. This tells us |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
352 |
// the number of zero bits, and from this we infer the number of nonzero bits |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
353 |
// which is the number of bits in the mask. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
354 |
// |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
355 |
// We use the number of bits in the mask as the number of bits in the network |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
356 |
// number and as the index into the network number state table. |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
357 |
// |
3179
1763f7ac8e80
bug 146: s/HostOrder//
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
3007
diff
changeset
|
358 |
uint32_t maskBits = mask.Get (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
359 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
360 |
for (uint32_t i = 0; i < N_BITS; ++i) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
361 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
362 |
if (maskBits & 1) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
363 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
364 |
uint32_t index = N_BITS - i; |
4184
e7a525be7dc2
remove misguided __attribute__ ((unused))s
Craig Dowell <craigdo@ee.washington.edu>
parents:
3179
diff
changeset
|
365 |
NS_ABORT_MSG_UNLESS (index > 0 && index < N_BITS, "Ipv4AddressGenerator::MaskToIndex(): Illegal Mask"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
366 |
return index; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
367 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
368 |
maskBits >>= 1; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
369 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
370 |
NS_ASSERT_MSG(false, "Ipv4AddressGenerator::MaskToIndex(): Impossible"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
371 |
return 0; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
372 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
373 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
374 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
375 |
Ipv4AddressGenerator::Init ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
376 |
const Ipv4Address net, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
377 |
const Ipv4Mask mask, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
378 |
const Ipv4Address addr) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
379 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
380 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
381 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
382 |
SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
383 |
->Init (net, mask, addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
384 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
385 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
386 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
387 |
Ipv4AddressGenerator::NextNetwork (const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
388 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
389 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
390 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
391 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
392 |
->NextNetwork (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
393 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
394 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
395 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
396 |
Ipv4AddressGenerator::GetNetwork (const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
397 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
398 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
399 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
400 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
401 |
->GetNetwork (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
402 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
403 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
404 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
405 |
Ipv4AddressGenerator::InitAddress ( |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
406 |
const Ipv4Address addr, |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
407 |
const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
408 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
409 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
410 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
411 |
SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
412 |
->InitAddress (addr, mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
413 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
414 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
415 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
416 |
Ipv4AddressGenerator::GetAddress (const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
417 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
418 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
419 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
420 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
421 |
->GetAddress (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
422 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
423 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
424 |
Ipv4Address |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
425 |
Ipv4AddressGenerator::NextAddress (const Ipv4Mask mask) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
426 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
427 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
428 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
429 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
430 |
->NextAddress (mask); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
431 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
432 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
433 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
434 |
Ipv4AddressGenerator::Reset (void) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
435 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
436 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
437 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
438 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
439 |
->Reset (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
440 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
441 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
442 |
bool |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
443 |
Ipv4AddressGenerator::AddAllocated (const Ipv4Address addr) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
444 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
445 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
446 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
447 |
return SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
448 |
->AddAllocated (addr); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
449 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
450 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
451 |
void |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
452 |
Ipv4AddressGenerator::TestMode (void) |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
453 |
{ |
2983
e3a416fe9dd5
NS_LOG_FUNCTION -> NS_LOG_FUNCTION_NOARGS and NS_LOG_PARAMS -> NS_LOG_FUNCTION
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
2894
diff
changeset
|
454 |
NS_LOG_FUNCTION_NOARGS (); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
455 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
456 |
SimulationSingleton<Ipv4AddressGeneratorImpl>::Get () |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
457 |
->TestMode (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
458 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
459 |
|
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
460 |
} // namespace ns3 |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
461 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
462 |
#include "ns3/test.h" |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
463 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
464 |
namespace ns3 { |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
465 |
|
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
466 |
class NetworkNumberAllocatorTestCase : public TestCase |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
467 |
{ |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
468 |
public: |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
469 |
NetworkNumberAllocatorTestCase (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
470 |
virtual bool DoRun (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
471 |
virtual void DoTeardown (void); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
472 |
}; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
473 |
|
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
474 |
NetworkNumberAllocatorTestCase::NetworkNumberAllocatorTestCase () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
475 |
: TestCase ("Make sure the network number allocator is working on some of network prefixes.") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
476 |
{} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
477 |
void |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
478 |
NetworkNumberAllocatorTestCase::DoTeardown (void) |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
479 |
{ |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
480 |
Ipv4AddressGenerator::Reset (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
481 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
482 |
bool |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
483 |
NetworkNumberAllocatorTestCase::DoRun (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
484 |
{ |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
485 |
Ipv4Address network; |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
486 |
Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
487 |
Ipv4Address ("0.0.0.0")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
488 |
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
489 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("1.0.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
490 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
491 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("2.0.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
492 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
493 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
494 |
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.0")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
495 |
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
496 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.1.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
497 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
498 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.2.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
499 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
500 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
501 |
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.0")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
502 |
network = Ipv4AddressGenerator::GetNetwork (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
503 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.1.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
504 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
505 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.2.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
506 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
507 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
508 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("3.0.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
509 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
510 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.3.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
511 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
512 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.3.0"), "XXX"); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
513 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
514 |
return false; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
515 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
516 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
517 |
class AddressAllocatorTestCase : public TestCase |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
518 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
519 |
public: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
520 |
AddressAllocatorTestCase (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
521 |
private: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
522 |
virtual bool DoRun (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
523 |
virtual void DoTeardown (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
524 |
}; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
525 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
526 |
AddressAllocatorTestCase::AddressAllocatorTestCase () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
527 |
: TestCase ("Sanity check on allocation of addresses") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
528 |
{} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
529 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
530 |
bool |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
531 |
AddressAllocatorTestCase::DoRun (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
532 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
533 |
Ipv4Address address; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
534 |
|
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
535 |
Ipv4AddressGenerator::Init (Ipv4Address ("1.0.0.0"), Ipv4Mask ("255.0.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
536 |
Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
537 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
538 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
539 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
540 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("1.0.0.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
541 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
542 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.1.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
543 |
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
544 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
545 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
546 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
547 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.1.0.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
548 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
549 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.1.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
550 |
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
551 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
552 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
553 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
554 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.1.4"), "XXX"); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
555 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
556 |
return false; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
557 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
558 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
559 |
void |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
560 |
AddressAllocatorTestCase::DoTeardown (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
561 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
562 |
Ipv4AddressGenerator::Reset (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
563 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
564 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
565 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
566 |
class NetworkAndAddressTestCase : public TestCase |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
567 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
568 |
public: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
569 |
NetworkAndAddressTestCase (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
570 |
virtual bool DoRun (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
571 |
virtual void DoTeardown (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
572 |
}; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
573 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
574 |
NetworkAndAddressTestCase::NetworkAndAddressTestCase () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
575 |
: TestCase ("Make sure Network and address allocation play together.") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
576 |
{} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
577 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
578 |
void |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
579 |
NetworkAndAddressTestCase::DoTeardown (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
580 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
581 |
Ipv4AddressGenerator::Reset (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
582 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
583 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
584 |
bool |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
585 |
NetworkAndAddressTestCase::DoRun (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
586 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
587 |
Ipv4Address address; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
588 |
Ipv4Address network; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
589 |
|
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
590 |
Ipv4AddressGenerator::Init (Ipv4Address ("3.0.0.0"), Ipv4Mask ("255.0.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
591 |
Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
592 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
593 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
594 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
595 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("3.0.0.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
596 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
597 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
598 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("4.0.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
599 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.0.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
600 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("4.0.0.5"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
601 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
602 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.3.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
603 |
Ipv4Mask ("255.255.0.0"), Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
604 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
605 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
606 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
607 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.3.0.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
608 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
609 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
610 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.4.0.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
611 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.0.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
612 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.4.0.5"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
613 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
614 |
Ipv4AddressGenerator::Init (Ipv4Address ("0.0.3.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
615 |
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
616 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
617 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
618 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
619 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.3.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
620 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
621 |
network = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
622 |
NS_TEST_EXPECT_MSG_EQ (network, Ipv4Address ("0.0.4.0"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
623 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
624 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("0.0.4.5"), "XXX"); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
625 |
return false; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
626 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
627 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
628 |
class ExampleAddressGeneratorTestCase : public TestCase |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
629 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
630 |
public: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
631 |
ExampleAddressGeneratorTestCase (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
632 |
private: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
633 |
virtual bool DoRun (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
634 |
virtual void DoTeardown (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
635 |
}; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
636 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
637 |
ExampleAddressGeneratorTestCase::ExampleAddressGeneratorTestCase () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
638 |
: TestCase ("A quick kindof-semi-almost-real example") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
639 |
{} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
640 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
641 |
void |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
642 |
ExampleAddressGeneratorTestCase::DoTeardown (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
643 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
644 |
Ipv4AddressGenerator::Reset (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
645 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
646 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
647 |
bool |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
648 |
ExampleAddressGeneratorTestCase::DoRun (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
649 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
650 |
Ipv4Address address; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
651 |
// |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
652 |
// First, initialize our /24 network to 192.168.0.0 and begin |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
653 |
// allocating with ip address 0.0.0.3 out of that prefix. |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
654 |
// |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
655 |
Ipv4AddressGenerator::Init (Ipv4Address ("192.168.0.0"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
656 |
Ipv4Mask ("255.255.255.0"), Ipv4Address ("0.0.0.3")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
657 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
658 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.3"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
659 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
660 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.4"), "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
661 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
662 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.0.5"), "XXX"); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
663 |
// |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
664 |
// Allocate the next network out of our /24 network (this should be |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
665 |
// 192.168.1.0) and begin allocating with IP address 0.0.0.3 out of that |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
666 |
// prefix. |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
667 |
// |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
668 |
Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.255.0")); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
669 |
Ipv4AddressGenerator::InitAddress (Ipv4Address ("0.0.0.3"), |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
670 |
Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
671 |
// |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
672 |
// The first address we should get is the previous numbers ORed together, which |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
673 |
// is 192.168.1.3, of course. |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
674 |
// |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
675 |
address = Ipv4AddressGenerator::NextAddress (Ipv4Mask ("255.255.255.0")); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
676 |
NS_TEST_EXPECT_MSG_EQ (address, Ipv4Address ("192.168.1.3"), "XXX"); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
677 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
678 |
return false; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
679 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
680 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
681 |
class AddressCollisionTestCase : public TestCase |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
682 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
683 |
public: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
684 |
AddressCollisionTestCase (); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
685 |
private: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
686 |
bool DoRun (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
687 |
void DoTeardown (void); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
688 |
}; |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
689 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
690 |
AddressCollisionTestCase::AddressCollisionTestCase () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
691 |
: TestCase ("Make sure that the address collision logic works.") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
692 |
{} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
693 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
694 |
void |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
695 |
AddressCollisionTestCase::DoTeardown (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
696 |
{ |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
697 |
Ipv4AddressGenerator::Reset (); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
698 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
699 |
bool |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
700 |
AddressCollisionTestCase::DoRun (void) |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
701 |
{ |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
702 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.5"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
703 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.10"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
704 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.15"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
705 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.20"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
706 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
707 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.4"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
708 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.3"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
709 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.2"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
710 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.1"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
711 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
712 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.6"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
713 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.7"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
714 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.8"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
715 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.9"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
716 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
717 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.11"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
718 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.12"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
719 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.13"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
720 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.14"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
721 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
722 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.19"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
723 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.18"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
724 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.17"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
725 |
Ipv4AddressGenerator::AddAllocated ("0.0.0.16"); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
726 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
727 |
Ipv4AddressGenerator::TestMode (); |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
728 |
bool added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21"); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
729 |
NS_TEST_EXPECT_MSG_EQ (added, true, "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
730 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
731 |
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.4"); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
732 |
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
733 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
734 |
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.9"); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
735 |
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
736 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
737 |
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.16"); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
738 |
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
739 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
740 |
added = Ipv4AddressGenerator::AddAllocated ("0.0.0.21"); |
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
741 |
NS_TEST_EXPECT_MSG_EQ (added, false, "XXX"); |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
742 |
|
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
743 |
return false; |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
744 |
} |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
745 |
|
5312
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
746 |
|
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
747 |
static class Ipv4AddressGeneratorTestSuite : public TestSuite |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
748 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
749 |
public: |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
750 |
Ipv4AddressGeneratorTestSuite () |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
751 |
: TestSuite ("ipv4-address-generator") |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
752 |
{ |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
753 |
AddTestCase (new NetworkNumberAllocatorTestCase ()); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
754 |
AddTestCase (new AddressAllocatorTestCase ()); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
755 |
AddTestCase (new NetworkAndAddressTestCase ()); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
756 |
AddTestCase (new ExampleAddressGeneratorTestCase ()); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
757 |
AddTestCase (new AddressCollisionTestCase ()); |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
758 |
} |
c0ea2fce5bcc
bug 675: convert unit tests to new test framework
Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
parents:
4184
diff
changeset
|
759 |
} g_ipv4AddressGeneratorTestSuite; |
2722
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
760 |
|
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
761 |
} // namespace ns3 |
f59635c9c679
address generator, address collision checker
Craig Dowell <craigdo@ee.washington.edu>
parents:
diff
changeset
|
762 |