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
740ed390
Commit
740ed390
authored
Nov 03, 2015
by
Björn Richerzhagen
Browse files
Removed unused PHY 802.11 - use WiFi instead.
parent
24ce3927
Changes
2
Show whitespace changes
Inline
Side-by-side
src/de/tud/kom/p2psim/api/linklayer/mac/PhyType.java
View file @
740ed390
...
...
@@ -21,7 +21,6 @@
package
de.tud.kom.p2psim.api.linklayer.mac
;
import
de.tud.kom.p2psim.api.linklayer.LinkLayer
;
import
de.tud.kom.p2psim.impl.linklayer.DefaultLinkLayerMessage
;
import
de.tud.kom.p2psim.impl.simengine.Simulator
;
import
de.tudarmstadt.maki.simonstrator.api.Time
;
import
de.tudarmstadt.maki.simonstrator.api.component.network.NetworkComponent.NetInterfaceName
;
...
...
@@ -42,25 +41,8 @@ public enum PhyType {
/**
* Direct wireless connections between adjacent hosts or AP-based (decided
* by the MAC/TopologyView used)
*
* The provided values are based on the paper
* by the MAC/TopologyView used). Based on
* "WiFi in Ad Hoc Mode: A Meaurement Study" by Anastasi et al. (2004),
* which describes the behavior of a 802.11B WiFi interface. The following
* setup contains the values for the usage of this model with a Bitrate of
* 1Mbit/s:<br>
* <li>TODO For the drop-rate, the authors must be addressed to provide the
* underlying values <li>netto BW of 758000Bit/s (Based on mathematical
* calculations) <li>500us latency <li>2346 Byte (minus 2x6 Bytes for the
* sender and receiver address, which are automatically added by the
* {@link DefaultLinkLayerMessage}. <li>Broadcast
*/
WIFI80211B
(
NetInterfaceName
.
WIFI
,
-
1
,
758000
/
8
,
500
*
Time
.
MICROSECOND
,
2334
,
true
),
/**
* Direct wireless connections between adjacent hosts or AP-based (decided
* by the MAC/TopologyView used)
*
* Assuming the following defaults: 1% drop-rate of LinkLayer-Packets
* (LinkLayer might add retransmission behavior as in 802.11), 5MBit/s netto
...
...
src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java
View file @
740ed390
...
...
@@ -63,7 +63,6 @@ import de.tudarmstadt.maki.simonstrator.api.component.sis.SiSDataCallback;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.SiSInfoProperties
;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.SiSInformationProvider.SiSProviderHandle
;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.exception.InformationNotAvailableException
;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.type.SiSType
;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.type.SiSTypes
;
import
de.tudarmstadt.maki.simonstrator.api.component.sis.util.SiSTopologyProvider
;
import
de.tudarmstadt.maki.simonstrator.api.component.topology.TopologyID
;
...
...
@@ -149,9 +148,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
@Override
public
void
eventOccurred
(
Object
content
,
int
type
)
{
if
(
getTopology
().
getTopologyView
(
PhyType
.
WIFI
)
!=
null
||
getTopology
()
.
getTopologyView
(
PhyType
.
WIFI80211B
)
!=
null
)
{
if
(
getTopology
().
getTopologyView
(
PhyType
.
WIFI
)
!=
null
)
{
new
SiSTopologyProvider
(
sis
,
SiSTypes
.
NEIGHBORS_WIFI
,
DefaultTopologyComponent
.
this
,
getTopologyID
(
NetInterfaceName
.
WIFI
,
true
),
...
...
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