2009-04-01 20:09:20 +02:00
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
<simconf>
|
2010-03-10 13:29:24 +01:00
|
|
|
<project>[CONTIKI_DIR]/tools/cooja/apps/mrm</project>
|
|
|
|
<project>[CONTIKI_DIR]/tools/cooja/apps/mspsim</project>
|
|
|
|
<project>[CONTIKI_DIR]/tools/cooja/apps/avrora</project>
|
|
|
|
<project>[CONTIKI_DIR]/tools/cooja/apps/native_gateway</project>
|
2009-04-01 20:09:20 +02:00
|
|
|
<simulation>
|
|
|
|
<title>My simulation</title>
|
|
|
|
<delaytime>0</delaytime>
|
2009-06-24 16:42:50 +02:00
|
|
|
<randomseed>generated</randomseed>
|
|
|
|
<motedelay_us>1000000</motedelay_us>
|
2009-04-01 20:09:20 +02:00
|
|
|
<radiomedium>
|
|
|
|
se.sics.cooja.radiomediums.UDGM
|
|
|
|
<transmitting_range>50.0</transmitting_range>
|
|
|
|
<interference_range>100.0</interference_range>
|
|
|
|
<success_ratio_tx>1.0</success_ratio_tx>
|
|
|
|
<success_ratio_rx>1.0</success_ratio_rx>
|
|
|
|
</radiomedium>
|
2010-03-10 13:29:24 +01:00
|
|
|
<events>
|
|
|
|
<logoutput>40000</logoutput>
|
|
|
|
</events>
|
2009-04-01 20:09:20 +02:00
|
|
|
<motetype>
|
|
|
|
se.sics.cooja.contikimote.ContikiMoteType
|
2010-03-10 13:29:24 +01:00
|
|
|
<identifier>mtype783</identifier>
|
2009-04-01 20:09:20 +02:00
|
|
|
<description>Receiver</description>
|
2010-05-03 16:48:47 +02:00
|
|
|
<contikiapp>[CONTIKI_DIR]/examples/udp-ipv6/udp-server.c</contikiapp>
|
2010-06-01 15:31:23 +02:00
|
|
|
<commands>make TARGET=cooja clean
|
|
|
|
make udp-server.cooja TARGET=cooja</commands>
|
2009-04-01 20:09:20 +02:00
|
|
|
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
2010-03-10 13:29:24 +01:00
|
|
|
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
|
2009-04-01 20:09:20 +02:00
|
|
|
<symbols>false</symbols>
|
|
|
|
</motetype>
|
|
|
|
<motetype>
|
|
|
|
se.sics.cooja.contikimote.ContikiMoteType
|
2010-03-10 13:29:24 +01:00
|
|
|
<identifier>mtype512</identifier>
|
2009-04-01 20:09:20 +02:00
|
|
|
<description>Sender</description>
|
2010-05-03 16:48:47 +02:00
|
|
|
<contikiapp>[CONTIKI_DIR]/examples/udp-ipv6/udp-client.c</contikiapp>
|
core/net/resolv: IPv6 and mDNS ("Bonjour") support. Major refactor.
This patch updates the DNS resolver to support IPv6 and introduces an
improved API for looking up DNS entries. This patch also adds optional
support for mDNS lookups and responses to the DNS resolver.
Here is a quick summary of the changes:
* Added support for IPv6 lookups.
* DNS queries now honor record expiration.
* Added support for mDNS, compatible with "Bonjour".
* Implemented a new lookup api, `resolv_lookup2()`, which provides
more information about the state of the record(error, expired,
looking-up, etc.).
About mDNS/Bonjour Support
--------------------------
This patch adds basic support for mDNS/Bonjour, which allows you to
refer to the name of a device instead of its IP address. This is
incredibly convenient for IPv6 addresses because they tend to be very
long and difficult to remember. It is especially important for
link-local IPv6 addresses, since not all programs support the '%'
notation for indicating a network interface (required on systems with
more than one network interface to disambiguate).
In other words, instead of typing in this:
* `http://[fe80::58dc:d7ed:a644:628f%en1]/`
You can type this instead:
* `http://contiki.local/`
Huge improvement, no?
The convenience extends beyond that: this mechanism can be used for
nodes to talk to each other based on their human-readable names instead
of their IPv6 addresses. So instead of a switch on
`aaaa::58dc:d7ed:a644:628f` triggering an actuator on
`aaaa::ed26:19c1:4bd2:f95b`, `light-switch.local` can trigger the
actuator on `living-room-lights.local`.
What you need to do to be able to look up `.local` names on your
workstation depends on a few factors:
* Your machine needs to be able to send and receive multicast packets
to and from the LoWPAN. You can do this easily with the Jackdaw
firmware on an RZUSBStick. If you have a border router, you will need
it to bridge the mDNS multicast packets across the border.
* If you are using a Mac, you win. All Apple devices support mDNS
lookups.
* If you are using Windows, you can install Apple's Bonjour for Windows
package. (This may be already installed on your machine if you have
installed iTunes) After you install this you can easily do `.local`
lookups.
* If you are using a Unix machine, you can install Avahi.
The default hostname is set to `contiki.local.`. You can change the
hostname programmatically by calling `resolv_set_hostname()`. You can
change the default hostname by changing `CONTIKI_CONF_DEFAULT_HOSTNAME`.
You may disable mDNS support by setting `RESOLV_CONF_SUPPORTS_MDNS` to
`0`.
---------------------------------
core/net/resolv: `resolv_lookup2()` -> `resolv_lookup()`
Note that this patch should fix several `resolv_lookup()` bugs
that already existed. There were many cases where `resolv_lookup()`
was being called and the IP address ignored, but later code
assumed that the IP address had been fetched... ANYWAY, those
should be fixed now.
---------------------------------
examples/udp-ipv6: Updated client to use MDNS to lookup the server.
Also updated the Cooja regression test simulation.
2012-05-17 17:24:08 +02:00
|
|
|
<commands>make udp-client.cooja TARGET=cooja</commands>
|
2009-04-01 20:09:20 +02:00
|
|
|
<moteinterface>se.sics.cooja.interfaces.Position</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.Battery</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiVib</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiMoteID</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRS232</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiBeeper</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiIPAddress</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiRadio</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiButton</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiPIR</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiClock</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiLED</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.contikimote.interfaces.ContikiCFS</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.Mote2MoteRelations</moteinterface>
|
2010-03-10 13:29:24 +01:00
|
|
|
<moteinterface>se.sics.cooja.interfaces.RimeAddress</moteinterface>
|
|
|
|
<moteinterface>se.sics.cooja.interfaces.MoteAttributes</moteinterface>
|
2009-04-01 20:09:20 +02:00
|
|
|
<symbols>false</symbols>
|
|
|
|
</motetype>
|
|
|
|
<mote>
|
|
|
|
<interface_config>
|
|
|
|
se.sics.cooja.interfaces.Position
|
|
|
|
<x>98.76075470611741</x>
|
|
|
|
<y>30.469519951198897</y>
|
|
|
|
<z>0.0</z>
|
|
|
|
</interface_config>
|
|
|
|
<interface_config>
|
|
|
|
se.sics.cooja.contikimote.interfaces.ContikiMoteID
|
|
|
|
<id>1</id>
|
|
|
|
</interface_config>
|
2010-03-10 13:29:24 +01:00
|
|
|
<motetype_identifier>mtype783</motetype_identifier>
|
2009-04-01 20:09:20 +02:00
|
|
|
</mote>
|
|
|
|
<mote>
|
|
|
|
<interface_config>
|
|
|
|
se.sics.cooja.interfaces.Position
|
|
|
|
<x>58.59043340181549</x>
|
|
|
|
<y>22.264557758786697</y>
|
|
|
|
<z>0.0</z>
|
|
|
|
</interface_config>
|
|
|
|
<interface_config>
|
|
|
|
se.sics.cooja.contikimote.interfaces.ContikiMoteID
|
|
|
|
<id>2</id>
|
|
|
|
</interface_config>
|
2010-03-10 13:29:24 +01:00
|
|
|
<motetype_identifier>mtype512</motetype_identifier>
|
2009-04-01 20:09:20 +02:00
|
|
|
</mote>
|
|
|
|
</simulation>
|
|
|
|
<plugin>
|
|
|
|
se.sics.cooja.plugins.SimControl
|
|
|
|
<width>248</width>
|
2010-03-10 13:29:24 +01:00
|
|
|
<z>2</z>
|
2009-04-01 20:09:20 +02:00
|
|
|
<height>200</height>
|
|
|
|
<location_x>0</location_x>
|
|
|
|
<location_y>0</location_y>
|
|
|
|
<minimized>false</minimized>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
se.sics.cooja.plugins.LogListener
|
|
|
|
<plugin_config>
|
|
|
|
<filter>ID:1</filter>
|
|
|
|
</plugin_config>
|
2010-03-10 13:29:24 +01:00
|
|
|
<width>851</width>
|
|
|
|
<z>1</z>
|
|
|
|
<height>187</height>
|
2009-06-24 16:42:50 +02:00
|
|
|
<location_x>1</location_x>
|
|
|
|
<location_y>521</location_y>
|
2009-04-01 20:09:20 +02:00
|
|
|
<minimized>false</minimized>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
se.sics.cooja.plugins.Visualizer
|
|
|
|
<plugin_config>
|
2010-03-10 13:29:24 +01:00
|
|
|
<skin>se.sics.cooja.plugins.skins.UDGMVisualizerSkin</skin>
|
|
|
|
<skin>se.sics.cooja.plugins.skins.IDVisualizerSkin</skin>
|
|
|
|
<skin>se.sics.cooja.plugins.skins.TrafficVisualizerSkin</skin>
|
|
|
|
<viewport>2.565713585691764 0.0 0.0 2.565713585691764 -91.30090099174814 -28.413835696190525</viewport>
|
2009-04-01 20:09:20 +02:00
|
|
|
</plugin_config>
|
2009-06-24 16:42:50 +02:00
|
|
|
<width>246</width>
|
|
|
|
<z>3</z>
|
|
|
|
<height>121</height>
|
|
|
|
<location_x>1</location_x>
|
|
|
|
<location_y>201</location_y>
|
2009-04-01 20:09:20 +02:00
|
|
|
<minimized>false</minimized>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
se.sics.cooja.plugins.RadioLogger
|
2010-03-10 13:29:24 +01:00
|
|
|
<plugin_config>
|
|
|
|
<split>150</split>
|
|
|
|
</plugin_config>
|
2009-06-24 16:42:50 +02:00
|
|
|
<width>246</width>
|
2010-03-10 13:29:24 +01:00
|
|
|
<z>4</z>
|
2009-06-24 16:42:50 +02:00
|
|
|
<height>198</height>
|
2009-04-01 20:09:20 +02:00
|
|
|
<location_x>0</location_x>
|
2009-06-24 16:42:50 +02:00
|
|
|
<location_y>323</location_y>
|
|
|
|
<minimized>false</minimized>
|
|
|
|
</plugin>
|
|
|
|
<plugin>
|
|
|
|
se.sics.cooja.plugins.ScriptRunner
|
|
|
|
<plugin_config>
|
|
|
|
<script>TIMEOUT(100000, log.log("last msg: " + msg + "\n")); /* print last msg at timeout */
|
|
|
|
count = 0;
|
|
|
|
while (count++ < 5) {
|
|
|
|
/* Message from sender process to receiver process */
|
2010-05-03 16:48:47 +02:00
|
|
|
YIELD_THEN_WAIT_UNTIL(msg.contains("Client sending"));
|
|
|
|
YIELD_THEN_WAIT_UNTIL(msg.contains("Server received"));
|
2009-06-24 16:42:50 +02:00
|
|
|
log.log(count + ": Sender -> Receiver OK\n");
|
|
|
|
|
|
|
|
/* Message from receiver process to sender process */
|
2010-05-03 16:48:47 +02:00
|
|
|
YIELD_THEN_WAIT_UNTIL(msg.contains("Responding with"));
|
|
|
|
YIELD_THEN_WAIT_UNTIL(msg.contains("Response from"));
|
2009-06-24 16:42:50 +02:00
|
|
|
log.log(count + ": Receiver -> Sender OK\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
log.testOK(); /* Report test success and quit */</script>
|
|
|
|
<active>true</active>
|
|
|
|
</plugin_config>
|
|
|
|
<width>600</width>
|
|
|
|
<z>0</z>
|
2010-03-10 13:29:24 +01:00
|
|
|
<height>520</height>
|
2009-06-24 16:42:50 +02:00
|
|
|
<location_x>250</location_x>
|
|
|
|
<location_y>-1</location_y>
|
2009-04-01 20:09:20 +02:00
|
|
|
<minimized>false</minimized>
|
|
|
|
</plugin>
|
|
|
|
</simconf>
|
|
|
|
|