Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
senf
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wiback
senf
Commits
9b5621f0
Commit
9b5621f0
authored
16 years ago
by
dw6
Browse files
Options
Downloads
Patches
Plain Diff
adding MACAddress::toString()
parent
c23e1ae9
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Socket/Protocols/Raw/MACAddress.cc
+8
-0
8 additions, 0 deletions
Socket/Protocols/Raw/MACAddress.cc
Socket/Protocols/Raw/MACAddress.hh
+10
-1
10 additions, 1 deletion
Socket/Protocols/Raw/MACAddress.hh
Socket/Protocols/Raw/MACAddress.test.cc
+4
-2
4 additions, 2 deletions
Socket/Protocols/Raw/MACAddress.test.cc
with
22 additions
and
3 deletions
Socket/Protocols/Raw/MACAddress.cc
+
8
−
0
View file @
9b5621f0
...
@@ -28,6 +28,8 @@
...
@@ -28,6 +28,8 @@
// Custom includes
// Custom includes
#include
<iomanip>
#include
<iomanip>
#include
<string>
#include
<sstream>
#include
<boost/tokenizer.hpp>
#include
<boost/tokenizer.hpp>
#include
<boost/io/ios_state.hpp>
#include
<boost/io/ios_state.hpp>
#include
<boost/range.hpp>
#include
<boost/range.hpp>
...
@@ -105,6 +107,12 @@ prefix_ senf::MACAddress senf::MACAddress::from_eui64(boost::uint64_t v)
...
@@ -105,6 +107,12 @@ prefix_ senf::MACAddress senf::MACAddress::from_eui64(boost::uint64_t v)
senf
::
MACAddress
const
senf
::
MACAddress
::
Broadcast
=
senf
::
MACAddress
(
0xFFFFFFFFFFFFull
);
senf
::
MACAddress
const
senf
::
MACAddress
::
Broadcast
=
senf
::
MACAddress
(
0xFFFFFFFFFFFFull
);
senf
::
MACAddress
const
senf
::
MACAddress
::
None
;
senf
::
MACAddress
const
senf
::
MACAddress
::
None
;
prefix_
std
::
string
senf
::
MACAddress
::
toString
()
const
{
std
::
ostringstream
tmp
;
tmp
<<
(
*
this
);
return
tmp
.
str
();
}
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
// namespace members
// namespace members
...
...
This diff is collapsed.
Click to expand it.
Socket/Protocols/Raw/MACAddress.hh
+
10
−
1
View file @
9b5621f0
...
@@ -67,7 +67,14 @@ namespace senf {
...
@@ -67,7 +67,14 @@ namespace senf {
INet6Address(0x2001u,0xDB8u,0x1u,0x0u,0x001Au,0x2BFFu,0xFE3Cu,0x3D5Fu).id())
INet6Address(0x2001u,0xDB8u,0x1u,0x0u,0x001Au,0x2BFFu,0xFE3Cu,0x3D5Fu).id())
\endcode
\endcode
Since MACAddress is based on \c boost::array, you can access the raw data bytes of the
Since MACAddress is based on \c boo Ziel, aber nur ein paar davon sind standardkomform.
Der aktuelle C++ Standard unterstützt drei verschiedene Möglichkeiten eine Zahl in einen String umzuwandeln. Diese Möglichkeiten sind:
* sprintf
* std::strstream
* std::stringstream
st::array, you can access the raw data bytes of the
address using \c begin(), \c end() or \c operator[]:
address using \c begin(), \c end() or \c operator[]:
\code
\code
MACAddress mac = ...;
MACAddress mac = ...;
...
@@ -128,6 +135,8 @@ namespace senf {
...
@@ -128,6 +135,8 @@ namespace senf {
boost
::
uint32_t
nic
()
const
;
///< Return last 3 bytes of the address
boost
::
uint32_t
nic
()
const
;
///< Return last 3 bytes of the address
boost
::
uint64_t
eui64
()
const
;
///< Build EUI-64 from the MAC address
boost
::
uint64_t
eui64
()
const
;
///< Build EUI-64 from the MAC address
std
::
string
toString
()
const
;
///< Return string representation of MAC address like 12:34:56:78:90:ab
};
};
...
...
This diff is collapsed.
Click to expand it.
Socket/Protocols/Raw/MACAddress.test.cc
+
4
−
2
View file @
9b5621f0
...
@@ -39,7 +39,8 @@
...
@@ -39,7 +39,8 @@
BOOST_AUTO_UNIT_TEST
(
macAddress
)
BOOST_AUTO_UNIT_TEST
(
macAddress
)
{
{
senf
::
MACAddress
mac
(
senf
::
MACAddress
::
from_string
(
"A1-b2-C3:d4:E5:f6"
));
std
::
string
test
(
"A1-b2-C3:d4:E5:f6"
);
senf
::
MACAddress
mac
(
senf
::
MACAddress
::
from_string
(
test
));
BOOST_CHECK_EQUAL
(
mac
[
0
],
0xA1u
);
BOOST_CHECK_EQUAL
(
mac
[
0
],
0xA1u
);
BOOST_CHECK_EQUAL
(
mac
[
1
],
0xB2u
);
BOOST_CHECK_EQUAL
(
mac
[
1
],
0xB2u
);
...
@@ -51,7 +52,8 @@ BOOST_AUTO_UNIT_TEST(macAddress)
...
@@ -51,7 +52,8 @@ BOOST_AUTO_UNIT_TEST(macAddress)
std
::
stringstream
str
;
std
::
stringstream
str
;
str
<<
mac
;
str
<<
mac
;
BOOST_CHECK_EQUAL
(
str
.
str
(),
"a1:b2:c3:d4:e5:f6"
);
BOOST_CHECK_EQUAL
(
str
.
str
(),
"a1:b2:c3:d4:e5:f6"
);
BOOST_CHECK_EQUAL
(
mac
.
toString
(),
"a1:b2:c3:d4:e5:f6"
);
BOOST_CHECK
(
!
mac
.
local
()
);
BOOST_CHECK
(
!
mac
.
local
()
);
BOOST_CHECK
(
mac
.
multicast
()
);
BOOST_CHECK
(
mac
.
multicast
()
);
BOOST_CHECK
(
!
mac
.
broadcast
()
);
BOOST_CHECK
(
!
mac
.
broadcast
()
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment