Commit 4593a9ab authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3232] Renamed two functions in the test DHCPv6 client.

parent 1b86037d
......@@ -181,15 +181,15 @@ Dhcp6Client::createMsg(const uint8_t msg_type) {
void
Dhcp6Client::doSARR() {
doSolicitAdvertise();
doSolicit();
// Don't send the Request if there was no Advertise.
if (context_.response_) {
doRequestReply();
doRequest();
}
}
void
Dhcp6Client::doSolicitAdvertise() {
Dhcp6Client::doSolicit() {
context_.query_ = createMsg(DHCPV6_SOLICIT);
if (use_na_) {
context_.query_->addOption(Option6IAPtr(new Option6IA(D6O_IA_NA,
......@@ -206,7 +206,7 @@ Dhcp6Client::doSolicitAdvertise() {
}
void
Dhcp6Client::doRequestReply() {
Dhcp6Client::doRequest() {
Pkt6Ptr query = createMsg(DHCPV6_REQUEST);
query->addOption(context_.response_->getOption(D6O_SERVERID));
copyIAs(context_.response_, query);
......
......@@ -102,7 +102,7 @@ public:
/// This function simulates the first transaction of the 4-way exchange,
/// i.e. sends a Solicit to the server and receives Advertise. It doesn't
/// set the lease configuration in the @c config_.
void doSolicitAdvertise();
void doSolicit();
/// @brief Sends a Rebind to the server and receives the Reply.
///
......@@ -120,7 +120,7 @@ public:
/// from the current context (server's Advertise) to request acquisition
/// of offered IAs. If the server responds to the Request (leases are
/// acquired) the client's lease configuration is updated.
void doRequestReply();
void doRequest();
/// @brief Simulates aging of leases by the specified number of seconds.
///
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment