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
Simonstrator
PeerfactSim.KOM
Commits
b16aca8c
Commit
b16aca8c
authored
Jun 28, 2016
by
Christoph Storm
Browse files
DefaultTopology Fix by Nils,
removed previous 'fix' to AbstractTopology
parent
8f97b2ee
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
View file @
b16aca8c
...
...
@@ -511,7 +511,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
if
(!
onlyOnline
||
mac
.
isOnline
())
{
INode
node
=
currentView
.
createNode
(
mac
.
getHost
().
getId
());
node
.
setProperty
(
SiSTypes
.
PHY_LOCATION
,
topoView
.
getPosition
(
mac
.
getMacAddress
()));
topoView
.
getPosition
(
mac
.
getMacAddress
())
.
clone
()
);
currentView
.
addElement
(
node
);
}
}
...
...
src/de/tud/kom/p2psim/impl/topology/views/AbstractTopologyView.java
View file @
b16aca8c
...
...
@@ -340,14 +340,6 @@ public abstract class AbstractTopologyView<L extends DefaultLink> implements
for
(
Entry
<
MacAddress
,
Boolean
>
entry
:
neighborsOutdated
.
entrySet
())
{
entry
.
setValue
(
true
);
// Fix Christoph Storm: Update positions map
// This relies on location being a PositionVector...
if
(
location
instanceof
PositionVector
&&
host
.
getNetworkComponent
().
getByName
(
phy
.
getNetInterfaceName
())
.
getLocalInetAddress
().
equals
(
macs
.
get
(
entry
.
getKey
()).
getNetId
())){
positions
.
put
(
entry
.
getKey
(),
new
PositionVector
(
(
PositionVector
)
location
));
}
}
}
}
...
...
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