Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ycai
simbricks
Commits
f1da1400
"vscode:/vscode.git/clone" did not exist on "49b959b5408b97274e2ee423059d9239445aea26"
Commit
f1da1400
authored
Aug 28, 2020
by
Antoine Kaufmann
Browse files
libnicbm: support generating a MAC address
parent
895dd2ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
0 deletions
+17
-0
libnicbm/include/nicbm.h
libnicbm/include/nicbm.h
+2
-0
libnicbm/nicbm.cc
libnicbm/nicbm.cc
+15
-0
No files found.
libnicbm/include/nicbm.h
View file @
f1da1400
...
@@ -63,6 +63,7 @@ class Runner {
...
@@ -63,6 +63,7 @@ class Runner {
protected:
protected:
Device
&
dev
;
Device
&
dev
;
uint64_t
mac_addr
;
struct
nicsim_params
nsparams
;
struct
nicsim_params
nsparams
;
volatile
union
cosim_pcie_proto_d2h
*
d2h_alloc
(
void
);
volatile
union
cosim_pcie_proto_d2h
*
d2h_alloc
(
void
);
...
@@ -89,6 +90,7 @@ class Runner {
...
@@ -89,6 +90,7 @@ class Runner {
void
eth_send
(
const
void
*
data
,
size_t
len
);
void
eth_send
(
const
void
*
data
,
size_t
len
);
uint64_t
time_ps
()
const
;
uint64_t
time_ps
()
const
;
uint64_t
get_mac_addr
()
const
;
};
};
/**
/**
...
...
libnicbm/nicbm.cc
View file @
f1da1400
...
@@ -5,6 +5,8 @@
...
@@ -5,6 +5,8 @@
#include <unistd.h>
#include <unistd.h>
#include <signal.h>
#include <signal.h>
#include <cassert>
#include <cassert>
#include <ctime>
#include <iostream>
#include <nicbm.h>
#include <nicbm.h>
...
@@ -260,9 +262,22 @@ uint64_t Runner::time_ps() const
...
@@ -260,9 +262,22 @@ uint64_t Runner::time_ps() const
return
main_time
;
return
main_time
;
}
}
uint64_t
Runner
::
get_mac_addr
()
const
{
return
mac_addr
;
}
Runner
::
Runner
(
Device
&
dev_
)
Runner
::
Runner
(
Device
&
dev_
)
:
dev
(
dev_
)
:
dev
(
dev_
)
{
{
//mac_addr = lrand48() & ~(3ULL << 46);
srand48
(
time
(
NULL
)
^
getpid
());
mac_addr
=
lrand48
();
mac_addr
<<=
16
;
mac_addr
^=
lrand48
();
mac_addr
&=
~
(
3ULL
<<
40
);
std
::
cerr
<<
std
::
hex
<<
mac_addr
<<
std
::
endl
;
}
}
int
Runner
::
runMain
(
int
argc
,
char
*
argv
[])
int
Runner
::
runMain
(
int
argc
,
char
*
argv
[])
...
...
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