Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
9bd4c62d
Commit
9bd4c62d
authored
Jun 06, 2016
by
Marcin Siodelski
Browse files
[4320] Rename ResourceContainer to HintContainer.
parent
b2b8f69d
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp6/dhcp6_srv.cc
View file @
9bd4c62d
...
...
@@ -1615,7 +1615,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
// those prefixes and remove those that we have already processed. We
// don't want to remove them from the context, so we need to copy them
// into temporary container.
AllocEngine
::
Resource
Container
hints
=
ctx
.
currentIA
().
hints_
;
AllocEngine
::
Hint
Container
hints
=
ctx
.
currentIA
().
hints_
;
// For all leases we have now, add the IAADDR with non-zero lifetimes.
for
(
Lease6Collection
::
const_iterator
l
=
leases
.
begin
();
l
!=
leases
.
end
();
++
l
)
{
...
...
@@ -1662,7 +1662,7 @@ Dhcpv6Srv::extendIA_NA(const Pkt6Ptr& query, const Pkt6Ptr& answer,
// Finally, if there are any addresses requested that we haven't dealt with
// already, inform the client that he can't have them.
for
(
AllocEngine
::
Resource
Container
::
const_iterator
hint
=
hints
.
begin
();
for
(
AllocEngine
::
Hint
Container
::
const_iterator
hint
=
hints
.
begin
();
hint
!=
hints
.
end
();
++
hint
)
{
Option6IAAddrPtr
iaaddr
(
new
Option6IAAddr
(
D6O_IAADDR
,
hint
->
first
,
0
,
0
));
...
...
@@ -1775,7 +1775,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query,
// those prefixes and remove those that we have already processed. We
// don't want to remove them from the context, so we need to copy them
// into temporary container.
AllocEngine
::
Resource
Container
hints
=
ctx
.
currentIA
().
hints_
;
AllocEngine
::
Hint
Container
hints
=
ctx
.
currentIA
().
hints_
;
// For all the leases we have now, add the IAPPREFIX with non-zero lifetimes
for
(
Lease6Collection
::
const_iterator
l
=
leases
.
begin
();
l
!=
leases
.
end
();
++
l
)
{
...
...
@@ -1802,7 +1802,7 @@ Dhcpv6Srv::extendIA_PD(const Pkt6Ptr& query,
// zero lifetimes
// Finally, if there are any addresses requested that we haven't dealt with
// already, inform the client that he can't have them.
for
(
AllocEngine
::
Resource
Container
::
const_iterator
prefix
=
hints
.
begin
();
for
(
AllocEngine
::
Hint
Container
::
const_iterator
prefix
=
hints
.
begin
();
prefix
!=
hints
.
end
();
++
prefix
)
{
// Send the prefix with the zero lifetimes only if the prefix
// contains non-zero value. A zero value indicates that the hint was
...
...
src/lib/dhcpsrv/alloc_engine.h
View file @
9bd4c62d
...
...
@@ -24,6 +24,7 @@
#include
<list>
#include
<map>
#include
<set>
#include
<utility>
namespace
isc
{
...
...
@@ -251,7 +252,7 @@ public:
typedef
std
::
pair
<
isc
::
asiolink
::
IOAddress
,
uint8_t
>
ResourceType
;
/// @brief Container for client's hints.
typedef
std
::
vector
<
ResourceType
>
Resource
Container
;
typedef
std
::
vector
<
ResourceType
>
Hint
Container
;
/// @brief A tuple holding host identifier type and value.
typedef
std
::
pair
<
Host
::
IdentifierType
,
std
::
vector
<
uint8_t
>
>
IdentifierPair
;
...
...
@@ -351,10 +352,10 @@ public:
///
/// There will typically be just one address, but the protocol
/// allows more than one address or prefix for each IA container.
Resource
Container
hints_
;
Hint
Container
hints_
;
/// @brief Holds addresses or prefixes allocated for this IA.
Resource
Container
allocated_resources_
;
Hint
Container
allocated_resources_
;
/// @brief A pointer to any old leases that the client had before
/// update but are no longer valid after the update/allocation.
...
...
src/lib/dhcpsrv/tests/alloc_engine6_unittest.cc
View file @
9bd4c62d
...
...
@@ -690,7 +690,7 @@ TEST_F(AllocEngine6Test, renewExtendLeaseLifetime) {
AllocEngine
engine
(
AllocEngine
::
ALLOC_ITERATIVE
,
100
);
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
IOAddress
(
"2001:db8:1::15"
),
128
));
// Client should receive a lease.
...
...
@@ -723,7 +723,7 @@ TEST_F(AllocEngine6Test, renewExtendLeaseLifetimeForReservation) {
AllocEngine
engine
(
AllocEngine
::
ALLOC_ITERATIVE
,
100
);
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
IOAddress
(
"2001:db8:1::15"
),
128
));
// Client should receive a lease.
...
...
@@ -1273,7 +1273,7 @@ TEST_F(AllocEngine6Test, addressRenewal) {
ASSERT_EQ
(
1
,
leases
.
size
());
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
leases
[
0
]
->
addr_
,
128
));
Lease6Collection
renewed
=
renewTest
(
engine
,
pool_
,
hints
,
true
);
...
...
@@ -1304,7 +1304,7 @@ TEST_F(AllocEngine6Test, reservedAddressRenewal) {
ASSERT_EQ
(
"2001:db8:1::1c"
,
leases
[
0
]
->
addr_
.
toText
());
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
leases
[
0
]
->
addr_
,
128
));
Lease6Collection
renewed
=
renewTest
(
engine
,
pool_
,
hints
,
true
);
...
...
@@ -1440,7 +1440,7 @@ TEST_F(AllocEngine6Test, reservedAddressRenewChange) {
ASSERT_NE
(
"2001:db8:1::1c"
,
leases
[
0
]
->
addr_
.
toText
());
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
leases
[
0
]
->
addr_
,
128
));
// Create reservation for the client. This is in-pool reservation,
...
...
@@ -1464,7 +1464,7 @@ TEST_F(AllocEngine6Test, reservedAddressRenewReserved) {
ASSERT_EQ
(
1
,
leases
.
size
());
// This is what the client will send in his renew message.
AllocEngine
::
Resource
Container
hints
;
AllocEngine
::
Hint
Container
hints
;
hints
.
push_back
(
make_pair
(
leases
[
0
]
->
addr_
,
128
));
// Create reservation for this address, but for another client.
...
...
src/lib/dhcpsrv/tests/alloc_engine_utils.cc
View file @
9bd4c62d
...
...
@@ -319,7 +319,7 @@ AllocEngine6Test::simpleAlloc6Test(const Pool6Ptr& pool, const IOAddress& hint,
Lease6Collection
AllocEngine6Test
::
renewTest
(
AllocEngine
&
engine
,
const
Pool6Ptr
&
pool
,
AllocEngine
::
Resource
Container
&
hints
,
AllocEngine
::
Hint
Container
&
hints
,
bool
in_pool
)
{
Lease
::
Type
type
=
pool
->
getType
();
...
...
src/lib/dhcpsrv/tests/alloc_engine_utils.h
View file @
9bd4c62d
...
...
@@ -276,7 +276,7 @@ public:
/// @param in_pool specifies whether the lease is expected to be in pool
/// @return allocated lease(s) (may be empty)
Lease6Collection
renewTest
(
AllocEngine
&
engine
,
const
Pool6Ptr
&
pool
,
AllocEngine
::
Resource
Container
&
hints
,
AllocEngine
::
Hint
Container
&
hints
,
bool
in_pool
=
true
);
/// @brief Checks if the address allocation with a hint that is in range,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment