Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
445
Issues
445
List
Boards
Labels
Service Desk
Milestones
Merge Requests
71
Merge Requests
71
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
27441216
Commit
27441216
authored
Dec 29, 2014
by
Tomek Mrugalski
🛰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[3548] Rebase fix
parent
3a25cf88
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
56 deletions
+1
-56
src/lib/dhcp/pkt.h
src/lib/dhcp/pkt.h
+0
-55
src/lib/dhcp/pkt4.h
src/lib/dhcp/pkt4.h
+1
-1
No files found.
src/lib/dhcp/pkt.h
View file @
27441216
...
...
@@ -37,61 +37,6 @@ namespace dhcp {
/// @note This is abstract class. Please instantiate derived classes
/// such as @c Pkt4 or @c Pkt6.
class
Pkt
{
<<<<<<<
HEAD
=======
public:
/// @defgroup hw_sources Specifies where a given MAC/hardware address was
/// obtained.
///
/// @brief The list covers all possible MAC/hw address sources.
///
/// @note The uncommented ones are currently supported. When you implement
/// a new method, please uncomment appropriate line here.
///
/// @{
/// Not really a type, only used in getMAC() calls.
static
const
uint32_t
HWADDR_SOURCE_ANY
=
0xffff
;
/// Used when actual origin is not known, e.g. when reading from a
/// lease database that didn't store that information.
static
const
uint32_t
HWADDR_SOURCE_UNKNOWN
=
0x0000
;
/// Obtained first hand from raw socket (100% reliable).
static
const
uint32_t
HWADDR_SOURCE_RAW
=
0x0001
;
/// Extracted from DUID-LL or DUID-LLT (not 100% reliable as the client
/// can send fake DUID).
static
const
uint32_t
HWADDR_SOURCE_DUID
=
0x0002
;
/// Extracted from IPv6 link-local address. Not 100% reliable, as the
/// client can use different IID other than EUI-64, e.g. Windows supports
/// RFC4941 and uses random values instead of EUI-64.
static
const
uint32_t
HWADDR_SOURCE_IPV6_LINK_LOCAL
=
0x0004
;
/// Get it from RFC6939 option. (A relay agent can insert client link layer
/// address option). Note that a skilled attacker can fake that by sending
/// his request relayed, so the legitimate relay will think it's a second
/// relay.
static
const
uint32_t
HWADDR_SOURCE_CLIENT_ADDR_RELAY_OPTION
=
0x0008
;
/// A relay can insert remote-id. In some deployments it contains a MAC
/// address (RFC4649).
//static const uint32_t HWADDR_SOURCE_REMOTE_ID = 0x0010;
/// A relay can insert a subscriber-id option. In some deployments it
/// contains a MAC address (RFC4580).
//static const uint32_t HWADDR_SOURCE_SUBSCRIBER_ID = 0x0020;
/// A CMTS (acting as DHCP relay agent) that supports DOCSIS standard
/// can insert DOCSIS options that contain client's MAC address.
/// Client in this context would be a cable modem.
//static const uint32_t HWADDR_SOURCE_DOCSIS_OPTIONS = 0x0040;
/// @}
>>>>>>>
[
3548
]
Patch
as
provided
by
Adam
Kalmus
protected:
/// @brief Constructor.
...
...
src/lib/dhcp/pkt4.h
View file @
27441216
...
...
@@ -422,7 +422,7 @@ protected:
///
/// @return always NULL
virtual
HWAddrPtr
getMACFromDUID
(){
return
(
HWAddrPtr
());
return
(
HWAddrPtr
());
}
/// local HW address (dst if receiving packet, src if sending packet)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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