Commit a40c7ec9 authored by Joost Bekkers's avatar Joost Bekkers Committed by Baptiste Jonglez
Browse files

Added RAI options (RFC 3046)

KEA_QUERY4_RAI	hex string of the entire optin 82
KEA_QUERY4_RAI_CIRCUIT_ID hex string of suboption 1
KEA_QUERY4_RAI_REMOTE_ID hex string of suboption 2
parent bf0f8f65
Pipeline #38 canceled with stages
in 4 minutes and 40 seconds
......@@ -197,6 +197,9 @@ and reference of the possible values. Booleans are simply expressed with
| `KEA_QUERY4_SIADDR` | `string` | Server IP address | [dhcp/pkt4.h](https://jenkins.isc.org/job/Kea_doc/doxygen/de/d13/classisc_1_1dhcp_1_1Pkt4.html) |
| `KEA_QUERY4_YIADDR` | `string` | Your IP address | [dhcp/pkt4.h](https://jenkins.isc.org/job/Kea_doc/doxygen/de/d13/classisc_1_1dhcp_1_1Pkt4.html) |
| `KEA_QUERY4_GIADDR` | `string` | Gateway IP address (inserted by DHCP relay) | [dhcp/pkt4.h](https://jenkins.isc.org/job/Kea_doc/doxygen/de/d13/classisc_1_1dhcp_1_1Pkt4.html) |
| `KEA_QUERY4_RAI` | `string` | Relay Agent Information (RFC 3046) | |
| `KEA_QUERY4_RAI_CIRCUIT_ID` | `string` | RAI sub-option 1 Circuit id (RFC 3046) | |
| `KEA_QUERY4_RAI_REMOTE_ID` | `string` | RAI sub-option 2 Remote id (RFC 3046) | |
| `KEA_RESPONSE4_TYPE` | `string` | Type of DHCP message | [dhcp/dhcp4.h](https://jenkins.isc.org/job/Kea_doc/doxygen/d5/d8c/namespaceisc_1_1dhcp.html#aa5bfdcc4861aa3dab5328dba89362016) |
| `KEA_RESPONSE4_INTERFACE` | `string` | Interface on which response is being sent | |
| `KEA_RESPONSE4_IFINDEX` | `int` | Index of the interface on which response is being sent | |
......@@ -243,6 +246,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
### [`pkt4_send`](https://jenkins.isc.org/job/Kea_doc/doxygen/de/df3/dhcpv4Hooks.html#dhcpv4HooksPkt4Send)
......@@ -259,6 +265,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_RESPONSE4_TYPE`
- `KEA_RESPONSE4_INTERFACE`
- `KEA_RESPONSE4_IFINDEX`
......@@ -286,6 +295,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_SUBNET4_PREFIX`
- `KEA_SUBNET4_PREFIXLEN`
- `KEA_SUBNET4`
......@@ -304,6 +316,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_SUBNET4_PREFIX`
- `KEA_SUBNET4_PREFIXLEN`
- `KEA_SUBNET4`
......@@ -331,6 +346,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_SUBNET4_PREFIX`
- `KEA_SUBNET4_PREFIXLEN`
- `KEA_SUBNET4`
......@@ -357,6 +375,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_LEASE4_ADDRESS`
- `KEA_LEASE4_TYPE`
- `KEA_LEASE4_STATE`
......@@ -380,6 +401,9 @@ script.
- `KEA_QUERY4_SIADDR`
- `KEA_QUERY4_YIADDR`
- `KEA_QUERY4_GIADDR`
- `KEA_QUERY4_RAI`
- `KEA_QUERY4_RAI_CIRCUIT_ID`
- `KEA_QUERY4_RAI_REMOTE_ID`
- `KEA_LEASE4_ADDRESS`
- `KEA_LEASE4_TYPE`
- `KEA_LEASE4_STATE`
......
......@@ -62,6 +62,21 @@ void extract_pkt4(std::vector<std::string>& env, const std::string envprefix, co
if (option60) {
env.push_back(envprefix + "OPTION60=" + option60->toString());
}
OptionPtr rai = pkt4->getOption(82);
if (rai) {
env.push_back(envprefix + "RAI=" + rai->toHexString());
OptionPtr circuit_id = rai->getOption(RAI_OPTION_AGENT_CIRCUIT_ID);
if (circuit_id) {
env.push_back(envprefix + "RAI_CIRCUIT_ID=" + circuit_id->toHexString());
}
OptionPtr remote_id = rai->getOption(RAI_OPTION_REMOTE_ID);
if (remote_id) {
env.push_back(envprefix + "RAI_REMOTE_ID=" + remote_id->toHexString());
}
}
}
void extract_query4(std::vector<std::string>& env, const Pkt4Ptr query)
......
Supports Markdown
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