From: Marcin Siodelski Date: Wed, 18 Mar 2015 08:38:30 +0000 (+0100) Subject: [3689] Trivial: rename infRequest to inf_request per coding guidelines. X-Git-Tag: kea-0.9.1~8^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2217c352f70842db58861b1172624a387d85f40;p=thirdparty%2Fkea.git [3689] Trivial: rename infRequest to inf_request per coding guidelines. --- diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc index 5a216741a1..3f2c0e47b9 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -2501,24 +2501,24 @@ Dhcpv6Srv::processDecline(const Pkt6Ptr& decline) { } Pkt6Ptr -Dhcpv6Srv::processInfRequest(const Pkt6Ptr& infRequest) { +Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) { // Let's create a simplified client context here. - AllocEngine::ClientContext6 ctx = createContext(infRequest); + AllocEngine::ClientContext6 ctx = createContext(inf_request); // Create a Reply packet, with the same trans-id as the client's. - Pkt6Ptr reply(new Pkt6(DHCPV6_REPLY, infRequest->getTransid())); + Pkt6Ptr reply(new Pkt6(DHCPV6_REPLY, inf_request->getTransid())); // Copy client options (client-id, also relay information if present) - copyClientOptions(infRequest, reply); + copyClientOptions(inf_request, reply); // Append default options, i.e. options that the server is supposed // to put in all messages it sends (server-id for now, but possibly other // options once we start supporting authentication) - appendDefaultOptions(infRequest, reply); + appendDefaultOptions(inf_request, reply); // Try to assign options that were requested by the client. - appendRequestedOptions(infRequest, reply, ctx); + appendRequestedOptions(inf_request, reply, ctx); return (reply); } diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h index 483d2c0d6c..aeeefb21d8 100644 --- a/src/bin/dhcp6/dhcp6_srv.h +++ b/src/bin/dhcp6/dhcp6_srv.h @@ -242,8 +242,8 @@ protected: /// @brief Stub function that will handle incoming INF-REQUEST messages. /// - /// @param infRequest message received from client - Pkt6Ptr processInfRequest(const Pkt6Ptr& infRequest); + /// @param inf_request message received from client + Pkt6Ptr processInfRequest(const Pkt6Ptr& inf_request); /// @brief Creates status-code option. ///