deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #763 from ejoerns/pull-req/cooja-analyzers

Browse source 
[Cooja] Fixes and enhancements for 6lowpan analyzers
This commit is contained in:
Fredrik Österlind 2014-08-06 08:55:29 +02:00
parent 648d3576a0 d894390f3e
commit cb6cb3fc13
7 changed files with 1159 additions and 1002 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
tools/cooja/java/org/contikios/cooja/plugins/RadioLogger.java
View file

@ -27,7 +27,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
* *
*/ */
package org.contikios.cooja.plugins; package org.contikios.cooja.plugins;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@ -111,6 +110,7 @@ import org.contikios.cooja.util.StringUtils;
@ClassDescription("Radio messages") @ClassDescription("Radio messages")
@PluginType(PluginType.SIM_PLUGIN) @PluginType(PluginType.SIM_PLUGIN)
public class RadioLogger extends VisPlugin { public class RadioLogger extends VisPlugin {
private static Logger logger = Logger.getLogger(RadioLogger.class); private static Logger logger = Logger.getLogger(RadioLogger.class);
private static final long serialVersionUID = -6927091711697081353L; private static final long serialVersionUID = -6927091711697081353L;
@ -187,6 +187,7 @@ public class RadioLogger extends VisPlugin {
private static final long serialVersionUID = 1692207305977527004L; private static final long serialVersionUID = 1692207305977527004L;
@Override
public String getColumnName(int col) { public String getColumnName(int col) {
if (col == COLUMN_TIME && formatTimeString) { if (col == COLUMN_TIME && formatTimeString) {
return "Time"; return "Time";
@ -194,14 +195,17 @@ public class RadioLogger extends VisPlugin {
return COLUMN_NAMES[col]; return COLUMN_NAMES[col];
} }
@Override
public int getRowCount() { public int getRowCount() {
return connections.size(); return connections.size();
} }
@Override
public int getColumnCount() { public int getColumnCount() {
return COLUMN_NAMES.length; return COLUMN_NAMES.length;
} }
@Override
public Object getValueAt(int row, int col) { public Object getValueAt(int row, int col) {
if (row < 0 || row >= connections.size()) { if (row < 0 || row >= connections.size()) {
return ""; return "";
@ -247,6 +251,7 @@ public class RadioLogger extends VisPlugin {
return null; return null;
} }
@Override
public boolean isCellEditable(int row, int col) { public boolean isCellEditable(int row, int col) {
if (col == COLUMN_FROM) { if (col == COLUMN_FROM) {
/* Highlight source */ /* Highlight source */
@ -265,6 +270,7 @@ public class RadioLogger extends VisPlugin {
return false; return false;
} }
@Override
public Class<?> getColumnClass(int c) { public Class<?> getColumnClass(int c) {
return getValueAt(0, c).getClass(); return getValueAt(0, c).getClass();
} }
@ -274,6 +280,7 @@ public class RadioLogger extends VisPlugin {
private static final long serialVersionUID = -2199726885069809686L; private static final long serialVersionUID = -2199726885069809686L;
@Override
public String getToolTipText(MouseEvent e) { public String getToolTipText(MouseEvent e) {
java.awt.Point p = e.getPoint(); java.awt.Point p = e.getPoint();
int rowIndex = rowAtPoint(p); int rowIndex = rowAtPoint(p);
@ -290,14 +297,13 @@ public class RadioLogger extends VisPlugin {
/* TODO This entry may represent several hidden connections */ /* TODO This entry may represent several hidden connections */
RadioConnectionLog conn = connections.get(modelRowIndex); RadioConnectionLog conn = connections.get(modelRowIndex);
if (modelColumnIndex == COLUMN_TIME) { if (modelColumnIndex == COLUMN_TIME) {
return return "<html>"
"<html>" + + "Start time (us): " + conn.startTime
"Start time (us): " + conn.startTime + + "<br>"
"<br>" + + "End time (us): " + conn.endTime
"End time (us): " + conn.endTime + + "<br><br>"
"<br><br>" + + "Duration (us): " + (conn.endTime - conn.startTime)
"Duration (us): " + (conn.endTime - conn.startTime) + + "</html>";
"</html>";
} else if (modelColumnIndex == COLUMN_FROM) { } else if (modelColumnIndex == COLUMN_FROM) {
return conn.connection.getSource().getMote().toString(); return conn.connection.getSource().getMote().toString();
} else if (modelColumnIndex == COLUMN_TO) { } else if (modelColumnIndex == COLUMN_TO) {
@ -329,6 +335,7 @@ public class RadioLogger extends VisPlugin {
/* Toggle time format */ /* Toggle time format */
dataTable.getTableHeader().addMouseListener(new MouseAdapter() { dataTable.getTableHeader().addMouseListener(new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
int colIndex = dataTable.columnAtPoint(e.getPoint()); int colIndex = dataTable.columnAtPoint(e.getPoint());
int columnIndex = dataTable.convertColumnIndexToModel(colIndex); int columnIndex = dataTable.convertColumnIndexToModel(colIndex);
@ -343,11 +350,12 @@ public class RadioLogger extends VisPlugin {
}); });
dataTable.addKeyListener(new KeyAdapter() { dataTable.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_SPACE) { if (e.getKeyCode() == KeyEvent.VK_SPACE) {
showInAllAction.actionPerformed(null); showInAllAction.actionPerformed(null);
} else if (e.getKeyCode() == KeyEvent.VK_F && } else if (e.getKeyCode() == KeyEvent.VK_F
(e.getModifiers() & KeyEvent.CTRL_MASK) != 0) { && (e.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
searchField.setVisible(true); searchField.setVisible(true);
searchField.requestFocus(); searchField.requestFocus();
searchField.selectAll(); searchField.selectAll();
@ -367,6 +375,7 @@ public class RadioLogger extends VisPlugin {
dataTable.setRowSorter(logFilter); dataTable.setRowSorter(logFilter);
dataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { dataTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@Override
public void valueChanged(ListSelectionEvent e) { public void valueChanged(ListSelectionEvent e) {
int row = dataTable.getSelectedRow(); int row = dataTable.getSelectedRow();
if (row < 0) { if (row < 0) {
@ -395,11 +404,13 @@ public class RadioLogger extends VisPlugin {
payloadMenu.add(new JMenuItem(aliasAction)); payloadMenu.add(new JMenuItem(aliasAction));
payloadMenu.add(new JCheckBoxMenuItem(showDuplicatesAction) { payloadMenu.add(new JCheckBoxMenuItem(showDuplicatesAction) {
@Override
public boolean isSelected() { public boolean isSelected() {
return showDuplicates; return showDuplicates;
} }
}); });
payloadMenu.add(new JCheckBoxMenuItem(hideNoDestinationAction) { payloadMenu.add(new JCheckBoxMenuItem(hideNoDestinationAction) {
@Override
public boolean isSelected() { public boolean isSelected() {
return hideNoDestinationPackets; return hideNoDestinationPackets;
} }
@ -407,7 +418,6 @@ public class RadioLogger extends VisPlugin {
fileMenu.add(new JMenuItem(saveAction)); fileMenu.add(new JMenuItem(saveAction));
JPopupMenu popupMenu = new JPopupMenu(); JPopupMenu popupMenu = new JPopupMenu();
JMenu focusMenu = new JMenu("Show in"); JMenu focusMenu = new JMenu("Show in");
@ -418,7 +428,6 @@ public class RadioLogger extends VisPlugin {
popupMenu.add(focusMenu); popupMenu.add(focusMenu);
//a group of radio button menu items //a group of radio button menu items
ButtonGroup group = new ButtonGroup(); ButtonGroup group = new ButtonGroup();
JRadioButtonMenuItem rbMenuItem = new JRadioButtonMenuItem( JRadioButtonMenuItem rbMenuItem = new JRadioButtonMenuItem(
createAnalyzerAction("No Analyzer", "none", null, true)); createAnalyzerAction("No Analyzer", "none", null, true));
@ -436,15 +445,15 @@ public class RadioLogger extends VisPlugin {
analyzerMenu.add(rbMenuItem); analyzerMenu.add(rbMenuItem);
/* Load additional analyzers specified by projects (cooja.config) */ /* Load additional analyzers specified by projects (cooja.config) */
String[] projectAnalyzerSuites = String[] projectAnalyzerSuites
gui.getProjectConfig().getStringArrayValue(RadioLogger.class, "ANALYZERS"); = gui.getProjectConfig().getStringArrayValue(RadioLogger.class, "ANALYZERS");
if (projectAnalyzerSuites != null) { if (projectAnalyzerSuites != null) {
for (String suiteName: projectAnalyzerSuites) { for (String suiteName: projectAnalyzerSuites) {
if (suiteName == null || suiteName.trim().isEmpty()) { if (suiteName == null || suiteName.trim().isEmpty()) {
continue; continue;
} }
Class<? extends RadioLoggerAnalyzerSuite> suiteClass = Class<? extends RadioLoggerAnalyzerSuite> suiteClass
gui.tryLoadClass(RadioLogger.this, RadioLoggerAnalyzerSuite.class, suiteName); = gui.tryLoadClass(RadioLogger.this, RadioLoggerAnalyzerSuite.class, suiteName);
try { try {
RadioLoggerAnalyzerSuite suite = suiteClass.newInstance(); RadioLoggerAnalyzerSuite suite = suiteClass.newInstance();
ArrayList<PacketAnalyzer> suiteAnalyzers = suite.getAnalyzers(); ArrayList<PacketAnalyzer> suiteAnalyzers = suite.getAnalyzers();
@ -472,6 +481,7 @@ public class RadioLogger extends VisPlugin {
/* Search text field */ /* Search text field */
searchField.setVisible(false); searchField.setVisible(false);
searchField.addKeyListener(new KeyAdapter() { searchField.addKeyListener(new KeyAdapter() {
@Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) { if (e.getKeyCode() == KeyEvent.VK_ENTER) {
searchSelectNext( searchSelectNext(
@ -497,6 +507,7 @@ public class RadioLogger extends VisPlugin {
adjuster.packColumns(); adjuster.packColumns();
radioMedium.addRadioMediumObserver(radioMediumObserver = new Observer() { radioMedium.addRadioMediumObserver(radioMediumObserver = new Observer() {
@Override
public void update(Observable obs, Object obj) { public void update(Observable obs, Object obj) {
RadioConnection conn = radioMedium.getLastConnection(); RadioConnection conn = radioMedium.getLastConnection();
if (conn == null) { if (conn == null) {
@ -508,6 +519,7 @@ public class RadioLogger extends VisPlugin {
loggedConn.connection = conn; loggedConn.connection = conn;
loggedConn.packet = conn.getSource().getLastPacketTransmitted(); loggedConn.packet = conn.getSource().getLastPacketTransmitted();
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
@Override
public void run() { public void run() {
int lastSize = connections.size(); int lastSize = connections.size();
// Check if the last row is visible // Check if the last row is visible
@ -539,6 +551,7 @@ public class RadioLogger extends VisPlugin {
} }
} }
@Override
public void startPlugin() { public void startPlugin() {
super.startPlugin(); super.startPlugin();
rebuildAllEntries(); rebuildAllEntries();
@ -586,6 +599,7 @@ public class RadioLogger extends VisPlugin {
*/ */
public void trySelectTime(final long time) { public void trySelectTime(final long time) {
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
@Override
public void run() { public void run() {
if (dataTable.getRowCount() == 0) { if (dataTable.getRowCount() == 0) {
return; return;
@ -617,6 +631,7 @@ public class RadioLogger extends VisPlugin {
try { try {
logFilter.setRowFilter(null); logFilter.setRowFilter(null);
RowFilter<Object, Object> filter = new RowFilter<Object, Object>() { RowFilter<Object, Object> filter = new RowFilter<Object, Object>() {
@Override
public boolean include(RowFilter.Entry<? extends Object, ? extends Object> entry) { public boolean include(RowFilter.Entry<? extends Object, ? extends Object> entry) {
int row = (Integer) entry.getIdentifier(); int row = (Integer) entry.getIdentifier();
RadioConnectionLog current = connections.get(row); RadioConnectionLog current = connections.get(row);
@ -625,10 +640,10 @@ public class RadioLogger extends VisPlugin {
if (!showDuplicates && row > 0) { if (!showDuplicates && row > 0) {
RadioConnectionLog previous = connections.get(row - 1); RadioConnectionLog previous = connections.get(row - 1);
byte[] previousData = previous.packet.getPacketData(); byte[] previousData = previous.packet.getPacketData();
if (!showDuplicates && if (!showDuplicates
Arrays.equals(previousData, currentData) && && Arrays.equals(previousData, currentData)
previous.connection.getSource() == current.connection.getSource() && && previous.connection.getSource() == current.connection.getSource()
Arrays.equals(previous.connection.getAllDestinations(), current.connection.getAllDestinations())) { && Arrays.equals(previous.connection.getAllDestinations(), current.connection.getAllDestinations())) {
if (connections.get(row - 1).hiddenBy == null) { if (connections.get(row - 1).hiddenBy == null) {
connections.get(row - 1).hides++; connections.get(row - 1).hides++;
connections.get(row).hiddenBy = connections.get(row - 1); connections.get(row).hiddenBy = connections.get(row - 1);
@ -670,8 +685,8 @@ public class RadioLogger extends VisPlugin {
return; return;
} }
StringBuffer brief = new StringBuffer(); StringBuilder brief = new StringBuilder();
StringBuffer verbose = new StringBuffer(); StringBuilder verbose = new StringBuilder();
/* default analyzer */ /* default analyzer */
PacketAnalyzer.Packet packet = new PacketAnalyzer.Packet(data, PacketAnalyzer.MAC_LEVEL); PacketAnalyzer.Packet packet = new PacketAnalyzer.Packet(data, PacketAnalyzer.MAC_LEVEL);
@ -698,7 +713,7 @@ public class RadioLogger extends VisPlugin {
} }
} }
private boolean analyzePacket(PacketAnalyzer.Packet packet, StringBuffer brief, StringBuffer verbose) { private boolean analyzePacket(PacketAnalyzer.Packet packet, StringBuilder brief, StringBuilder verbose) {
if (analyzers == null) return false; if (analyzers == null) return false;
try { try {
boolean analyze = true; boolean analyze = true;
@ -739,36 +754,38 @@ public class RadioLogger extends VisPlugin {
if (packet instanceof ConvertedRadioPacket && packet.getPacketData().length > 0) { if (packet instanceof ConvertedRadioPacket && packet.getPacketData().length > 0) {
byte[] original = ((ConvertedRadioPacket) packet).getOriginalPacketData(); byte[] original = ((ConvertedRadioPacket) packet).getOriginalPacketData();
byte[] converted = ((ConvertedRadioPacket) packet).getPacketData(); byte[] converted = ((ConvertedRadioPacket) packet).getPacketData();
conn.tooltip = "<html><font face=\"Monospaced\">" + conn.tooltip = "<html><font face=\"Monospaced\">"
"<b>Packet data (" + original.length + " bytes)</b><br>" + + "<b>Packet data (" + original.length + " bytes)</b><br>"
"<pre>" + StringUtils.hexDump(original) + "</pre>" + + "<pre>" + StringUtils.hexDump(original) + "</pre>"
"</font><font face=\"Monospaced\">" + + "</font><font face=\"Monospaced\">"
"<b>Cross-level packet data (" + converted.length + " bytes)</b><br>" + + "<b>Cross-level packet data (" + converted.length + " bytes)</b><br>"
"<pre>" + StringUtils.hexDump(converted) + "</pre>" + + "<pre>" + StringUtils.hexDump(converted) + "</pre>"
"</font></html>"; + "</font></html>";
} else if (packet instanceof ConvertedRadioPacket) { } else if (packet instanceof ConvertedRadioPacket) {
byte[] original = ((ConvertedRadioPacket) packet).getOriginalPacketData(); byte[] original = ((ConvertedRadioPacket) packet).getOriginalPacketData();
conn.tooltip = "<html><font face=\"Monospaced\">" + conn.tooltip = "<html><font face=\"Monospaced\">"
"<b>Packet data (" + original.length + " bytes)</b><br>" + + "<b>Packet data (" + original.length + " bytes)</b><br>"
"<pre>" + StringUtils.hexDump(original) + "</pre>" + + "<pre>" + StringUtils.hexDump(original) + "</pre>"
"</font><font face=\"Monospaced\">" + + "</font><font face=\"Monospaced\">"
"<b>No cross-level conversion available</b><br>" + + "<b>No cross-level conversion available</b><br>"
"</font></html>"; + "</font></html>";
} else { } else {
byte[] data = packet.getPacketData(); byte[] data = packet.getPacketData();
conn.tooltip = "<html><font face=\"Monospaced\">" + conn.tooltip = "<html><font face=\"Monospaced\">"
"<b>Packet data (" + data.length + " bytes)</b><br>" + + "<b>Packet data (" + data.length + " bytes)</b><br>"
"<pre>" + StringUtils.hexDump(data) + "</pre>" + + "<pre>" + StringUtils.hexDump(data) + "</pre>"
"</font></html>"; + "</font></html>";
} }
} }
@Override
public void closePlugin() { public void closePlugin() {
if (radioMediumObserver != null) { if (radioMediumObserver != null) {
radioMedium.deleteRadioMediumObserver(radioMediumObserver); radioMedium.deleteRadioMediumObserver(radioMediumObserver);
} }
} }
@Override
public Collection<Element> getConfigXML() { public Collection<Element> getConfigXML() {
ArrayList<Element> config = new ArrayList<Element>(); ArrayList<Element> config = new ArrayList<Element>();
@ -815,6 +832,7 @@ public class RadioLogger extends VisPlugin {
return config; return config;
} }
@Override
public boolean setConfigXML(Collection<Element> configXML, boolean visAvailable) { public boolean setConfigXML(Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) { for (Element element : configXML) {
String name = element.getName(); String name = element.getName();
@ -838,6 +856,7 @@ public class RadioLogger extends VisPlugin {
final Action action; final Action action;
if (analyzerName != null && ((action = analyzerMap.get(analyzerName)) != null)) { if (analyzerName != null && ((action = analyzerMap.get(analyzerName)) != null)) {
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
@Override
public void run() { public void run() {
action.putValue(Action.SELECTED_KEY, Boolean.TRUE); action.putValue(Action.SELECTED_KEY, Boolean.TRUE);
action.actionPerformed(null); action.actionPerformed(null);
@ -853,6 +872,7 @@ public class RadioLogger extends VisPlugin {
} }
private class RadioConnectionLog { private class RadioConnectionLog {
long startTime; long startTime;
long endTime; long endTime;
RadioConnection connection; RadioConnection connection;
@ -864,15 +884,15 @@ public class RadioLogger extends VisPlugin {
String data = null; String data = null;
String tooltip = null; String tooltip = null;
@Override
public String toString() { public String toString() {
if (data == null) { if (data == null) {
RadioLogger.this.prepareDataString(this); RadioLogger.this.prepareDataString(this);
} }
return return Long.toString(startTime / Simulation.MILLISECOND) + "\t"
Long.toString(startTime / Simulation.MILLISECOND) + "\t" + + connection.getSource().getMote().getID() + "\t"
connection.getSource().getMote().getID() + "\t" + + getDestString(this) + "\t"
getDestString(this) + "\t" + + data;
data;
} }
} }
@ -909,6 +929,7 @@ public class RadioLogger extends VisPlugin {
Action action = new AbstractAction(name) { Action action = new AbstractAction(name) {
private static final long serialVersionUID = -608913700422638454L; private static final long serialVersionUID = -608913700422638454L;
@Override
public void actionPerformed(ActionEvent event) { public void actionPerformed(ActionEvent event) {
if (analyzers != analyzerList) { if (analyzers != analyzerList) {
analyzers = analyzerList; analyzers = analyzerList;
@ -925,6 +946,7 @@ public class RadioLogger extends VisPlugin {
private Action clearAction = new AbstractAction("Clear") { private Action clearAction = new AbstractAction("Clear") {
private static final long serialVersionUID = -6135583266684643117L; private static final long serialVersionUID = -6135583266684643117L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int size = connections.size(); int size = connections.size();
if (size > 0) { if (size > 0) {
@ -938,6 +960,7 @@ public class RadioLogger extends VisPlugin {
private Action copyAction = new AbstractAction("Copy selected") { private Action copyAction = new AbstractAction("Copy selected") {
private static final long serialVersionUID = 8412062977916108054L; private static final long serialVersionUID = 8412062977916108054L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@ -957,6 +980,7 @@ public class RadioLogger extends VisPlugin {
private Action copyAllAction = new AbstractAction("Copy all") { private Action copyAllAction = new AbstractAction("Copy all") {
private static final long serialVersionUID = 1905586689441157304L; private static final long serialVersionUID = 1905586689441157304L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@ -973,6 +997,7 @@ public class RadioLogger extends VisPlugin {
private Action saveAction = new AbstractAction("Save to file...") { private Action saveAction = new AbstractAction("Save to file...") {
private static final long serialVersionUID = -3942984643211482179L; private static final long serialVersionUID = -3942984643211482179L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
JFileChooser fc = new JFileChooser(); JFileChooser fc = new JFileChooser();
int returnVal = fc.showSaveDialog(Cooja.getTopParentContainer()); int returnVal = fc.showSaveDialog(Cooja.getTopParentContainer());
@ -1016,6 +1041,8 @@ public class RadioLogger extends VisPlugin {
private Action timeLineAction = new AbstractAction("Timeline") { private Action timeLineAction = new AbstractAction("Timeline") {
private static final long serialVersionUID = -4035633464748224192L; private static final long serialVersionUID = -4035633464748224192L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int selectedRow = dataTable.getSelectedRow(); int selectedRow = dataTable.getSelectedRow();
if (selectedRow < 0) return; if (selectedRow < 0) return;
@ -1039,6 +1066,8 @@ public class RadioLogger extends VisPlugin {
private Action logListenerAction = new AbstractAction("Mote output") { private Action logListenerAction = new AbstractAction("Mote output") {
private static final long serialVersionUID = 1985006491187878651L; private static final long serialVersionUID = 1985006491187878651L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int selectedRow = dataTable.getSelectedRow(); int selectedRow = dataTable.getSelectedRow();
if (selectedRow < 0) return; if (selectedRow < 0) return;
@ -1062,9 +1091,12 @@ public class RadioLogger extends VisPlugin {
private Action showInAllAction = new AbstractAction("Timeline and mote output") { private Action showInAllAction = new AbstractAction("Timeline and mote output") {
private static final long serialVersionUID = -3888292108886138128L; private static final long serialVersionUID = -3888292108886138128L;
{ {
putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0, true)); putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, 0, true));
} }
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
timeLineAction.actionPerformed(null); timeLineAction.actionPerformed(null);
logListenerAction.actionPerformed(null); logListenerAction.actionPerformed(null);
@ -1075,6 +1107,7 @@ public class RadioLogger extends VisPlugin {
private Action aliasAction = new AbstractAction("Payload alias...") { private Action aliasAction = new AbstractAction("Payload alias...") {
private static final long serialVersionUID = -1678771087456128721L; private static final long serialVersionUID = -1678771087456128721L;
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
int selectedRow = dataTable.getSelectedRow(); int selectedRow = dataTable.getSelectedRow();
if (selectedRow < 0) return; if (selectedRow < 0) return;
@ -1088,9 +1121,9 @@ public class RadioLogger extends VisPlugin {
String alias = (String) JOptionPane.showInputDialog( String alias = (String) JOptionPane.showInputDialog(
Cooja.getTopParentContainer(), Cooja.getTopParentContainer(),
"Enter alias for all packets with identical payload.\n" + "Enter alias for all packets with identical payload.\n"
"An empty string removes the current alias.\n\n" + + "An empty string removes the current alias.\n\n"
connections.get(selectedRow).data + "\n", + connections.get(selectedRow).data + "\n",
"Create packet payload alias", "Create packet payload alias",
JOptionPane.QUESTION_MESSAGE, JOptionPane.QUESTION_MESSAGE,
null, null,
@ -1126,6 +1159,7 @@ public class RadioLogger extends VisPlugin {
private boolean showDuplicates = false; private boolean showDuplicates = false;
private AbstractAction showDuplicatesAction = new AbstractAction("Show duplicates") { private AbstractAction showDuplicatesAction = new AbstractAction("Show duplicates") {
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
showDuplicates = !showDuplicates; showDuplicates = !showDuplicates;
rebuildAllEntries(); rebuildAllEntries();
@ -1134,6 +1168,7 @@ public class RadioLogger extends VisPlugin {
private boolean hideNoDestinationPackets = false; private boolean hideNoDestinationPackets = false;
private AbstractAction hideNoDestinationAction = new AbstractAction("Hide airshots") { private AbstractAction hideNoDestinationAction = new AbstractAction("Hide airshots") {
@Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
hideNoDestinationPackets = !hideNoDestinationPackets; hideNoDestinationPackets = !hideNoDestinationPackets;
rebuildAllEntries(); rebuildAllEntries();
@ -1147,10 +1182,10 @@ public class RadioLogger extends VisPlugin {
sb.append(c.toString() + "\n"); sb.append(c.toString() + "\n");
} }
return sb.toString(); return sb.toString();
}; }
public void saveConnectionsToFile(String fileName) { public void saveConnectionsToFile(String fileName) {
StringUtils.saveToFile(new File(fileName), getConnectionsString()); StringUtils.saveToFile(new File(fileName), getConnectionsString());
}; }
} }

39
tools/cooja/java/org/contikios/cooja/plugins/analyzers/ICMPv6Analyzer.java
View file

@ -32,28 +32,36 @@ public class ICMPv6Analyzer extends PacketAnalyzer {
public static final int MTU_INFO = 5; public static final int MTU_INFO = 5;
public static final String[] TYPE_NAME = new String[]{ public static final String[] TYPE_NAME = new String[]{
"ECHO_REQUEST", "ECHO_REPLY", "Echo Request", "Echo Reply",
"GROUP_QUERY", "GROUP_REPORT", "GROUP_REDUCTION", "Group Query", "Group Report", "Group Reduction",
"ROUTER_SOLICITATION", "ROUTER_ADVERTISEMENT", "Router Solicitation", "Router Advertisement",
"NEIGHBOR_SOLICITATION", "NEIGHBOR_ADVERTISEMENT", "REDIRECT", "Neighbor Solicitation", "Neighbor Advertisement", "Redirect",
"ROUTER RENUMBER", "NODE INFORMATION QUERY", "NODE INFORMATION RESPONSE"}; "Router Renumber", "Node Information Query", "Node Information Response"};
public static final String[] BRIEF_TYPE_NAME = new String[]{
"ECHO REQ", "ECHO RPLY",
"GRP QUERY", "GRP REPORT", "GRP REDUCTION",
"RS", "RA",
"NS", "NA", "REDIRECT",
"ROUTER RENUMBER", "NODE INFO QUERY", "NODE INFO RESP"};
public int analyzePacket(Packet packet, StringBuffer brief, @Override
StringBuffer verbose) { public int analyzePacket(Packet packet, StringBuilder brief,
StringBuilder verbose) {
int type = packet.get(0) & 0xff; int type = packet.get(0) & 0xff;
int code = packet.get(1) & 0xff; int code = packet.get(1) & 0xff;
// int checksum = ((packet.get(2) & 0xff) << 8) | packet.get(3) & 0xff; // int checksum = ((packet.get(2) & 0xff) << 8) | packet.get(3) & 0xff;
brief.append("ICMPv6 "); brief.append("ICMPv6 ");
verbose.append("<b>ICMPv6</b>");
if (type >= 128 && (type - 128) < TYPE_NAME.length) { if (type >= 128 && (type - 128) < TYPE_NAME.length) {
brief.append(TYPE_NAME[type - 128]).append(' ').append(code); brief.append(BRIEF_TYPE_NAME[type - 128]).append(' ').append(code);
verbose.append("Type: ").append(TYPE_NAME[type - 128]); verbose.append("<br/>Type: ").append(TYPE_NAME[type - 128]);
verbose.append(" Code:").append(code); verbose.append(", Code:").append(code);
} else if (type == 155) { } else if (type == 155) {
/* RPL */ /* RPL */
brief.append("RPL "); brief.append("RPL ");
verbose.append("Type: RPL Code: "); verbose.append("<br/>Type: RPL Code: ");
switch (code) { switch (code) {
case RPL_CODE_DIS: case RPL_CODE_DIS:
brief.append("DIS"); brief.append("DIS");
@ -67,10 +75,13 @@ public class ICMPv6Analyzer extends PacketAnalyzer {
int version = packet.get(5) & 0xff; int version = packet.get(5) & 0xff;
int rank = ((packet.get(6) & 0xff) << 8) + (packet.get(7) & 0xff); int rank = ((packet.get(6) & 0xff) << 8) + (packet.get(7) & 0xff);
int mop = (packet.get(8) >> 3) & 0x07; int mop = (packet.get(8) >> 3) & 0x07;
int dtsn = packet.get(9); int dtsn = packet.get(9) & 0xFF;
verbose.append(" InstanceID: " + instanceID + " Version: " + version + verbose.append(" InstanceID: ").append(instanceID)
" Rank:" + rank + " MOP: " + mop + " DTSN: " + dtsn); .append(", Version: ").append(version)
.append(", Rank: ").append(rank)
.append(", MOP: ").append(mop)
.append(", DTSN: ").append(dtsn);
packet.consumeBytesStart(8); packet.consumeBytesStart(8);
break; break;

131
tools/cooja/java/org/contikios/cooja/plugins/analyzers/IEEE802154Analyzer.java
View file

@ -7,35 +7,36 @@ import org.contikios.cooja.util.StringUtils;
public class IEEE802154Analyzer extends PacketAnalyzer { public class IEEE802154Analyzer extends PacketAnalyzer {
/* TODO: fix this to be correct */ // Addressing modes
public static final int NO_ADDRESS = 0; public static final int NO_ADDRESS = 0;
public static final int RSV_ADDRESS = 1; public static final int RSV_ADDRESS = 1;
public static final int SHORT_ADDRESS = 2; public static final int SHORT_ADDRESS = 2;
public static final int LONG_ADDRESS = 3; public static final int LONG_ADDRESS = 3;
// Frame types
public static final int BEACONFRAME = 0x00; public static final int BEACONFRAME = 0x00;
public static final int DATAFRAME = 0x01; public static final int DATAFRAME = 0x01;
public static final int ACKFRAME = 0x02; public static final int ACKFRAME = 0x02;
public static final int CMDFRAME = 0x03; public static final int CMDFRAME = 0x03;
// private static final byte[] BROADCAST_ADDR = {(byte)0xff, (byte)0xff}; // private static final byte[] BROADCAST_ADDR = {(byte)0xff, (byte)0xff};
private static final String[] typeS = {"-", "D", "A", "C"};
private static final String[] typeS = {"-", "D", "A"}; private static final String[] typeVerbose = {"BEACON", "DATA", "ACK", "CMD"};
private static final String[] typeVerbose = {"BEACON", "DATA", "ACK"}; private static final String[] addrModeNames = {"None", "Reserved", "Short", "Long"};
private PcapExporter pcapExporter; private PcapExporter pcapExporter;
// private int defaultAddressMode = LONG_ADDRESS; // private int defaultAddressMode = LONG_ADDRESS;
// private byte seqNo = 0; // private byte seqNo = 0;
// private int myPanID = 0xabcd; // private int myPanID = 0xabcd;
public IEEE802154Analyzer(boolean pcap) { public IEEE802154Analyzer(boolean pcap) {
if (pcap) try { if (pcap) {
try {
pcapExporter = new PcapExporter(); pcapExporter = new PcapExporter();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}
public void setPcapFile(File pcapFile) { public void setPcapFile(File pcapFile) {
if (pcapExporter != null) { if (pcapExporter != null) {
@ -48,6 +49,7 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
} }
} }
@Override
public boolean matchPacket(Packet packet) { public boolean matchPacket(Packet packet) {
return packet.level == MAC_LEVEL; return packet.level == MAC_LEVEL;
} }
@ -59,7 +61,9 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
/* create a 802.15.4 packet of the bytes and "dispatch" to the /* create a 802.15.4 packet of the bytes and "dispatch" to the
* next handler * next handler
*/ */
public int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) {
@Override
public int analyzePacket(Packet packet, StringBuilder brief, StringBuilder verbose) {
if (pcapExporter != null) { if (pcapExporter != null) {
try { try {
@ -71,15 +75,18 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
} }
int pos = packet.pos; int pos = packet.pos;
int type = packet.data[pos + 0] & 7; // FCF field
// int security = (packet.data[pos + 0] >> 3) & 1; int fcfType = packet.data[pos + 0] & 0x07;
// int pending = (packet.data[pos + 0] >> 4) & 1; boolean fcfSecurity = ((packet.data[pos + 0] >> 3) & 0x01) != 0;
// int ackRequired = (packet.data[pos + 0] >> 5) & 1; boolean fcfPending = ((packet.data[pos + 0] >> 4) & 0x01) != 0;
int panCompression = (packet.data[pos + 0]>> 6) & 1; boolean fcfAckRequested = ((packet.data[pos + 0] >> 5) & 0x01) != 0;
int destAddrMode = (packet.data[pos + 1] >> 2) & 3; boolean fcfIntraPAN = ((packet.data[pos + 0] >> 6) & 0x01) != 0;
// int frameVersion = (packet.data[pos + 1] >> 4) & 3; int fcfDestAddrMode = (packet.data[pos + 1] >> 2) & 0x03;
int srcAddrMode = (packet.data[pos + 1] >> 6) & 3; int fcfFrameVersion = (packet.data[pos + 1] >> 4) & 0x03;
int fcfSrcAddrMode = (packet.data[pos + 1] >> 6) & 0x03;
// Sequence number
int seqNumber = packet.data[pos + 2] & 0xff; int seqNumber = packet.data[pos + 2] & 0xff;
// Addressing Fields
int destPanID = 0; int destPanID = 0;
int srcPanID = 0; int srcPanID = 0;
byte[] sourceAddress = null; byte[] sourceAddress = null;
@ -87,15 +94,15 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
pos += 3; pos += 3;
if (destAddrMode > 0) { if (fcfDestAddrMode > 0) {
destPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8); destPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8);
pos += 2; pos += 2;
if (destAddrMode == SHORT_ADDRESS) { if (fcfDestAddrMode == SHORT_ADDRESS) {
destAddress = new byte[2]; destAddress = new byte[2];
destAddress[1] = packet.data[pos]; destAddress[1] = packet.data[pos];
destAddress[0] = packet.data[pos + 1]; destAddress[0] = packet.data[pos + 1];
pos += 2; pos += 2;
} else if (destAddrMode == LONG_ADDRESS) { } else if (fcfDestAddrMode == LONG_ADDRESS) {
destAddress = new byte[8]; destAddress = new byte[8];
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
destAddress[i] = packet.data[pos + 7 - i]; destAddress[i] = packet.data[pos + 7 - i];
@ -104,19 +111,19 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
} }
} }
if (srcAddrMode > 0) { if (fcfSrcAddrMode > 0) {
if (panCompression == 0){ if (fcfIntraPAN) {
srcPanID = destPanID;
} else {
srcPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8); srcPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8);
pos += 2; pos += 2;
} else {
srcPanID = destPanID;
} }
if (srcAddrMode == SHORT_ADDRESS) { if (fcfSrcAddrMode == SHORT_ADDRESS) {
sourceAddress = new byte[2]; sourceAddress = new byte[2];
sourceAddress[1] = packet.data[pos]; sourceAddress[1] = packet.data[pos];
sourceAddress[0] = packet.data[pos + 1]; sourceAddress[0] = packet.data[pos + 1];
pos += 2; pos += 2;
} else if (srcAddrMode == LONG_ADDRESS) { } else if (fcfSrcAddrMode == LONG_ADDRESS) {
sourceAddress = new byte[8]; sourceAddress = new byte[8];
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
sourceAddress[i] = packet.data[pos + 7 - i]; sourceAddress[i] = packet.data[pos + 7 - i];
@ -126,56 +133,80 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
} }
// int payloadLen = packet.data.length - pos; // int payloadLen = packet.data.length - pos;
brief.append("15.4 "); brief.append("15.4 ");
brief.append(type < typeS.length ? typeS[type] : "?").append(' '); brief.append(fcfType < typeS.length ? typeS[fcfType] : "?").append(' ');
verbose.append("<html><b>IEEE 802.15.4 ") verbose.append("<html><b>IEEE 802.15.4 ")
.append(type < typeVerbose.length ? typeVerbose[type] : "?") .append(fcfType < typeVerbose.length ? typeVerbose[fcfType] : "?")
.append(' ').append(seqNumber); .append("</b> #").append(seqNumber);
if (type != ACKFRAME) {
printAddress(brief, srcAddrMode, sourceAddress);
brief.append(' ');
printAddress(brief, destAddrMode, destAddress);
verbose.append("</b><br>From "); if (fcfType != ACKFRAME) {
printAddress(brief, fcfSrcAddrMode, sourceAddress);
brief.append(' ');
printAddress(brief, fcfDestAddrMode, destAddress);
verbose.append("<br>From ");
if (srcPanID != 0) { if (srcPanID != 0) {
verbose.append(StringUtils.toHex((byte)(srcPanID >> 8))) verbose.append("0x")
.append(StringUtils.toHex((byte) (srcPanID >> 8)))
.append(StringUtils.toHex((byte) (srcPanID & 0xff))) .append(StringUtils.toHex((byte) (srcPanID & 0xff)))
.append('/'); .append('/');
} }
printAddress(verbose, srcAddrMode, sourceAddress); printAddress(verbose, fcfSrcAddrMode, sourceAddress);
verbose.append(" to "); verbose.append(" to ");
if (destPanID != 0) { if (destPanID != 0) {
verbose.append(StringUtils.toHex((byte)(destPanID >> 8))) verbose.append("0x")
.append(StringUtils.toHex((byte) (destPanID >> 8)))
.append(StringUtils.toHex((byte) (destPanID & 0xff))) .append(StringUtils.toHex((byte) (destPanID & 0xff)))
.append('/'); .append('/');
} }
printAddress(verbose, destAddrMode, destAddress); printAddress(verbose, fcfDestAddrMode, destAddress);
} else { }
verbose.append("<br/>Sec = ").append(fcfSecurity)
.append(", Pend = ").append(fcfPending)
.append(", ACK = ").append(fcfAckRequested)
.append(", iPAN = ").append(fcfIntraPAN)
.append(", DestAddr = ").append(addrModeNames[fcfDestAddrMode])
.append(", Vers. = ").append(fcfFrameVersion)
.append(", SrcAddr = ").append(addrModeNames[fcfSrcAddrMode]);
/* update packet */
packet.pos = pos;
/* remove CRC from the packet */
packet.consumeBytesEnd(2);
if (fcfType == ACKFRAME) {
/* got ack - no more to do ... */ /* got ack - no more to do ... */
return ANALYSIS_OK_FINAL; return ANALYSIS_OK_FINAL;
} }
/* update packet */
packet.pos = pos;
packet.level = NETWORK_LEVEL; packet.level = NETWORK_LEVEL;
/* remove CRC from the packet */
packet.consumeBytesEnd(2);
packet.llsender = sourceAddress; packet.llsender = sourceAddress;
packet.llreceiver = destAddress; packet.llreceiver = destAddress;
return ANALYSIS_OK_CONTINUE; return ANALYSIS_OK_CONTINUE;
} }
private void printAddress(StringBuffer sb, int type, byte[] addr) { private void printAddress(StringBuilder sb, int type, byte[] addr) {
if (type == SHORT_ADDRESS) { if (type == SHORT_ADDRESS) {
sb.append(StringUtils.toHex(addr)); sb.append("0x").append(StringUtils.toHex(addr));
} else if (type == LONG_ADDRESS) { } else if (type == LONG_ADDRESS) {
sb.append(StringUtils.toHex(addr[0]) + StringUtils.toHex(addr[1]) + ":" + sb.append(StringUtils.toHex(addr[0]))
StringUtils.toHex(addr[2]) + StringUtils.toHex(addr[3]) + ":" + .append(':')
StringUtils.toHex(addr[4]) + StringUtils.toHex(addr[5]) + ":" + .append(StringUtils.toHex(addr[1]))
StringUtils.toHex(addr[6]) + StringUtils.toHex(addr[7])); .append(':')
.append(StringUtils.toHex(addr[2]))
.append(':')
.append(StringUtils.toHex(addr[3]))
.append(':')
.append(StringUtils.toHex(addr[4]))
.append(':')
.append(StringUtils.toHex(addr[5]))
.append(':')
.append(StringUtils.toHex(addr[6]))
.append(':')
.append(StringUtils.toHex(addr[7]));
} }
} }
} }

191
tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPHCPacketAnalyzer.java
View file

@ -4,14 +4,18 @@ import org.contikios.cooja.util.StringUtils;
public class IPHCPacketAnalyzer extends PacketAnalyzer { public class IPHCPacketAnalyzer extends PacketAnalyzer {
public final static int SICSLOWPAN_UDP_PORT_MIN = 0xF0B0; public final static int SICSLOWPAN_UDP_4_BIT_PORT_MIN = 0xF0B0;
public final static int SICSLOWPAN_UDP_PORT_MAX = 0xF0BF; /* F0B0 + 15 */ public final static int SICSLOWPAN_UDP_4_BIT_PORT_MAX = 0xF0BF; /* F0B0 + 15 */
public final static int SICSLOWPAN_UDP_8_BIT_PORT_MIN = 0xF000;
public final static int SICSLOWPAN_UDP_8_BIT_PORT_MAX = 0xF0FF; /* F000 + 255 */
public final static int SICSLOWPAN_DISPATCH_IPV6 = 0x41; /* 01000001 = 65 */ public final static int SICSLOWPAN_DISPATCH_IPV6 = 0x41; /* 01000001 = 65 */
public final static int SICSLOWPAN_DISPATCH_HC1 = 0x42; /* 01000010 = 66 */ public final static int SICSLOWPAN_DISPATCH_HC1 = 0x42; /* 01000010 = 66 */
public final static int SICSLOWPAN_DISPATCH_IPHC = 0x60; /* 011xxxxx = ... */ public final static int SICSLOWPAN_DISPATCH_IPHC = 0x60; /* 011xxxxx = ... */
public final static int SICSLOWPAN_DISPATCH_FRAG1 = 0xc0; /* 1100= 0xxx */
public final static int SICSLOWPAN_DISPATCH_FRAGN = 0xe0; /* 1110= 0xxx */ public final static int EXT_HDR_HOP_BY_HOP = 0;
public final static int EXT_HDR_ROUTING = 43;
public final static int EXT_HDR_FRAGMENT = 44;
/* /*
* Values of fields within the IPHC encoding first byte * Values of fields within the IPHC encoding first byte
@ -44,16 +48,17 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
private static final int SICSLOWPAN_NDC_UDP_MASK = 0xf8; private static final int SICSLOWPAN_NDC_UDP_MASK = 0xf8;
private static final int SICSLOWPAN_NHC_UDP_ID = 0xf0; private static final int SICSLOWPAN_NHC_UDP_ID = 0xf0;
private static final int SICSLOWPAN_NHC_UDP_C = 0xf3; private static final int SICSLOWPAN_NHC_UDP_00 = 0xf0;
private static final int SICSLOWPAN_NHC_UDP_I = 0xf0; private static final int SICSLOWPAN_NHC_UDP_01 = 0xf1;
private static final int SICSLOWPAN_NHC_UDP_10 = 0xf2;
private static final int SICSLOWPAN_NHC_UDP_11 = 0xf3;
public final static int PROTO_UDP = 17; public final static int PROTO_UDP = 17;
public final static int PROTO_TCP = 6; public final static int PROTO_TCP = 6;
public final static int PROTO_ICMP = 58; public final static int PROTO_ICMP = 58;
public final static byte[] UNSPECIFIED_ADDRESS
public final static byte[] UNSPECIFIED_ADDRESS = = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
private static byte[][] addrContexts = new byte[][]{ private static byte[][] addrContexts = new byte[][]{
{(byte) 0xaa, (byte) 0xaa, 0, 0, 0, 0, 0, 0} {(byte) 0xaa, (byte) 0xaa, 0, 0, 0, 0, 0, 0}
@ -62,12 +67,14 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
private static final int IPHC_DISPATCH = 0x60; private static final int IPHC_DISPATCH = 0x60;
/* packet must be on network level && have a IPHC dispatch */ /* packet must be on network level && have a IPHC dispatch */
@Override
public boolean matchPacket(Packet packet) { public boolean matchPacket(Packet packet) {
return packet.level == NETWORK_LEVEL && (packet.get(0) & 0xe0) == IPHC_DISPATCH; return packet.level == NETWORK_LEVEL && (packet.get(0) & 0xe0) == IPHC_DISPATCH;
} }
public int analyzePacket(Packet packet, StringBuffer brief, @Override
StringBuffer verbose) { public int analyzePacket(Packet packet, StringBuilder brief,
StringBuilder verbose) {
/* if packet has less than 3 bytes it is not interesting ... */ /* if packet has less than 3 bytes it is not interesting ... */
if (packet.size() < 3) return ANALYSIS_FAILED; if (packet.size() < 3) return ANALYSIS_FAILED;
@ -75,10 +82,24 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
int tf = (packet.get(0) >> 3) & 0x03; int tf = (packet.get(0) >> 3) & 0x03;
boolean nhc = (packet.get(0) & SICSLOWPAN_IPHC_NH_C) > 0; boolean nhc = (packet.get(0) & SICSLOWPAN_IPHC_NH_C) > 0;
int hlim = (packet.get(0) & 0x03); int hlim = (packet.get(0) & 0x03);
switch (hlim) {
case 0x00:
hlim = 0;
break;
case 0x01:
hlim = 1;
break;
case 0x02:
hlim = 64;
break;
case 0x03:
hlim = 255;
break;
}
int cid = (packet.get(1) >> 7) & 0x01; int cid = (packet.get(1) >> 7) & 0x01;
int sac = (packet.get(1) >> 6) & 0x01; int sac = (packet.get(1) >> 6) & 0x01;
int sam = (packet.get(1) >> 4) & 0x03; int sam = (packet.get(1) >> 4) & 0x03;
int m = (packet.get(1) >> 3) & 0x01; boolean m = ((packet.get(1) >> 3) & 0x01) != 0;
int dac = (packet.get(1) >> 2) & 0x01; int dac = (packet.get(1) >> 2) & 0x01;
int dam = packet.get(1) & 0x03; int dam = packet.get(1) & 0x03;
int sci = 0; int sci = 0;
@ -89,14 +110,19 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
brief.append("IPHC"); brief.append("IPHC");
/* need to decompress while analyzing - add that later... */ /* need to decompress while analyzing - add that later... */
verbose.append("<b>IPHC HC-06</b><br>"); verbose.append("<b>IPHC HC-06</b><br>");
verbose.append("tf = " + tf + " nhc = " + nhc + " hlim = " + hlim verbose.append("TF = ").append(tf)
+ " cid = " + cid + " sac = " + sac + " sam = " + sam .append(", NH = ").append(nhc ? "compressed" : "inline")
+ " MCast = " + m + " dac = " + dac + " dam = " + dam); .append(", HLIM = ").append(hlim == 0 ? "inline" : hlim)
.append(", CID = ").append(cid)
.append(", SAC = ").append(sac == 1 ? "stateless" : "stateful")
.append(", SAM = ").append(sam)
.append(", MCast = ").append(m)
.append(", DAC = ").append(dac == 1 ? "stateless" : "stateful")
.append(", DAM = ").append(dam);
if (cid == 1) { if (cid == 1) {
verbose.append("<br>Contexts: sci=" + (packet.get(2) >> 4) + " dci=" verbose.append("<br>Contexts: sci=").append(packet.get(2) >> 4).
+ (packet.get(2) & 0x0f)); append(" dci=").append(packet.get(2) & 0x0f);
sci = packet.get(2) >> 4; sci = packet.get(2) >> 4;
dci = packet.get(2) & 0x0f; dci = packet.get(2) & 0x0f;
} }
@ -115,7 +141,6 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
int srcPort = 0; int srcPort = 0;
int destPort = 0; int destPort = 0;
try { try {
/* Traffic class and flow label */ /* Traffic class and flow label */
if ((packet.get(0) & SICSLOWPAN_IPHC_FL_C) == 0) { if ((packet.get(0) & SICSLOWPAN_IPHC_FL_C) == 0) {
@ -159,7 +184,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
ttl = 1; ttl = 1;
break; break;
case SICSLOWPAN_IPHC_TTL_64: case SICSLOWPAN_IPHC_TTL_64:
ttl = 2; ttl = 64;
break; break;
case SICSLOWPAN_IPHC_TTL_255: case SICSLOWPAN_IPHC_TTL_255:
ttl = 255; ttl = 255;
@ -185,6 +210,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */ case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */
/* copy prefix from context */ /* copy prefix from context */
System.arraycopy(context, 0, srcAddress, 0, 8); System.arraycopy(context, 0, srcAddress, 0, 8);
/* copy IID from packet */ /* copy IID from packet */
packet.copy(hc06_ptr, srcAddress, 8, 8); packet.copy(hc06_ptr, srcAddress, 8, 8);
@ -192,6 +218,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */ case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */
/* unicast address */ /* unicast address */
System.arraycopy(context, 0, srcAddress, 0, 8); System.arraycopy(context, 0, srcAddress, 0, 8);
/* copy 6 NULL bytes then 2 last bytes of IID */ /* copy 6 NULL bytes then 2 last bytes of IID */
packet.copy(hc06_ptr, srcAddress, 14, 2); packet.copy(hc06_ptr, srcAddress, 14, 2);
@ -199,6 +226,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_SAM_11: /* 0-bits */ case SICSLOWPAN_IPHC_SAM_11: /* 0-bits */
/* copy prefix from context */ /* copy prefix from context */
System.arraycopy(context, 0, srcAddress, 0, 8); System.arraycopy(context, 0, srcAddress, 0, 8);
/* infer IID from L2 address */ /* infer IID from L2 address */
System.arraycopy(packet.llsender, 0, srcAddress, System.arraycopy(packet.llsender, 0, srcAddress,
@ -211,10 +239,12 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
switch (packet.get(1) & SICSLOWPAN_IPHC_SAM_11) { switch (packet.get(1) & SICSLOWPAN_IPHC_SAM_11) {
case SICSLOWPAN_IPHC_SAM_00: /* 128 bits */ case SICSLOWPAN_IPHC_SAM_00: /* 128 bits */
/* copy whole address from packet */ /* copy whole address from packet */
packet.copy(hc06_ptr, srcAddress, 0, 16); packet.copy(hc06_ptr, srcAddress, 0, 16);
hc06_ptr += 16; hc06_ptr += 16;
break; break;
case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */ case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */
srcAddress[0] = (byte) 0xfe; srcAddress[0] = (byte) 0xfe;
srcAddress[1] = (byte) 0x80; srcAddress[1] = (byte) 0x80;
/* copy IID from packet */ /* copy IID from packet */
@ -222,6 +252,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
hc06_ptr += 8; hc06_ptr += 8;
break; break;
case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */ case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */
srcAddress[0] = (byte) 0xfe; srcAddress[0] = (byte) 0xfe;
srcAddress[1] = (byte) 0x80; srcAddress[1] = (byte) 0x80;
packet.copy(hc06_ptr, srcAddress, 14, 2); packet.copy(hc06_ptr, srcAddress, 14, 2);
@ -229,6 +260,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_SAM_11: /* 0 bits */ case SICSLOWPAN_IPHC_SAM_11: /* 0 bits */
/* setup link-local address */ /* setup link-local address */
srcAddress[0] = (byte) 0xfe; srcAddress[0] = (byte) 0xfe;
srcAddress[1] = (byte) 0x80; srcAddress[1] = (byte) 0x80;
/* infer IID from L2 address */ /* infer IID from L2 address */
@ -250,22 +282,26 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) { switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */ case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */
/* copy whole address from packet */ /* copy whole address from packet */
packet.copy(hc06_ptr, destAddress, 0, 16); packet.copy(hc06_ptr, destAddress, 0, 16);
hc06_ptr += 16; hc06_ptr += 16;
break; break;
case SICSLOWPAN_IPHC_DAM_01: /* 48 bits FFXX::00XX:XXXX:XXXX */ case SICSLOWPAN_IPHC_DAM_01: /* 48 bits FFXX::00XX:XXXX:XXXX */
destAddress[0] = (byte) 0xff; destAddress[0] = (byte) 0xff;
destAddress[1] = packet.get(hc06_ptr); destAddress[1] = packet.get(hc06_ptr);
packet.copy(hc06_ptr + 1, destAddress, 11, 5); packet.copy(hc06_ptr + 1, destAddress, 11, 5);
hc06_ptr += 6; hc06_ptr += 6;
break; break;
case SICSLOWPAN_IPHC_DAM_10: /* 32 bits FFXX::00XX:XXXX */ case SICSLOWPAN_IPHC_DAM_10: /* 32 bits FFXX::00XX:XXXX */
destAddress[0] = (byte) 0xff; destAddress[0] = (byte) 0xff;
destAddress[1] = packet.get(hc06_ptr); destAddress[1] = packet.get(hc06_ptr);
packet.copy(hc06_ptr + 1, destAddress, 13, 3); packet.copy(hc06_ptr + 1, destAddress, 13, 3);
hc06_ptr += 4; hc06_ptr += 4;
break; break;
case SICSLOWPAN_IPHC_DAM_11: /* 8 bits FF02::00XX */ case SICSLOWPAN_IPHC_DAM_11: /* 8 bits FF02::00XX */
destAddress[0] = (byte) 0xff; destAddress[0] = (byte) 0xff;
destAddress[1] = (byte) 0x02; destAddress[1] = (byte) 0x02;
destAddress[15] = packet.get(hc06_ptr); destAddress[15] = packet.get(hc06_ptr);
@ -281,6 +317,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) { switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */ case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */
System.arraycopy(context, 0, destAddress, 0, 8); System.arraycopy(context, 0, destAddress, 0, 8);
/* copy IID from packet */ /* copy IID from packet */
packet.copy(hc06_ptr, destAddress, 8, 8); packet.copy(hc06_ptr, destAddress, 8, 8);
@ -288,6 +325,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */ case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */
/* unicast address */ /* unicast address */
System.arraycopy(context, 0, destAddress, 0, 8); System.arraycopy(context, 0, destAddress, 0, 8);
/* copy IID from packet */ /* copy IID from packet */
packet.copy(hc06_ptr, destAddress, 14, 2); packet.copy(hc06_ptr, destAddress, 14, 2);
@ -295,6 +333,7 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
break; break;
case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */ case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */
/* unicast address */ /* unicast address */
System.arraycopy(context, 0, destAddress, 0, 8); System.arraycopy(context, 0, destAddress, 0, 8);
/* infer IID from L2 address */ /* infer IID from L2 address */
System.arraycopy(packet.llreceiver, 0, destAddress, System.arraycopy(packet.llreceiver, 0, destAddress,
@ -305,22 +344,26 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
/* not context based => link local M = 0, DAC = 0 - same as SAC */ /* not context based => link local M = 0, DAC = 0 - same as SAC */
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) { switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */ case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */
packet.copy(hc06_ptr, destAddress, 0, 16); packet.copy(hc06_ptr, destAddress, 0, 16);
hc06_ptr += 16; hc06_ptr += 16;
break; break;
case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */ case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */
destAddress[0] = (byte) 0xfe; destAddress[0] = (byte) 0xfe;
destAddress[1] = (byte) 0x80; destAddress[1] = (byte) 0x80;
packet.copy(hc06_ptr, destAddress, 8, 8); packet.copy(hc06_ptr, destAddress, 8, 8);
hc06_ptr += 8; hc06_ptr += 8;
break; break;
case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */ case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */
destAddress[0] = (byte) 0xfe; destAddress[0] = (byte) 0xfe;
destAddress[1] = (byte) 0x80; destAddress[1] = (byte) 0x80;
packet.copy(hc06_ptr, destAddress, 14, 2); packet.copy(hc06_ptr, destAddress, 14, 2);
hc06_ptr += 2; hc06_ptr += 2;
break; break;
case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */ case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */
destAddress[0] = (byte) 0xfe; destAddress[0] = (byte) 0xfe;
destAddress[1] = (byte) 0x80; destAddress[1] = (byte) 0x80;
System.arraycopy(packet.llreceiver, 0, destAddress, System.arraycopy(packet.llreceiver, 0, destAddress,
@ -336,33 +379,51 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
/* The next header is compressed, NHC is following */ /* The next header is compressed, NHC is following */
if ((packet.get(hc06_ptr) & SICSLOWPAN_NDC_UDP_MASK) == SICSLOWPAN_NHC_UDP_ID) { if ((packet.get(hc06_ptr) & SICSLOWPAN_NDC_UDP_MASK) == SICSLOWPAN_NHC_UDP_ID) {
proto = PROTO_UDP; proto = PROTO_UDP;
switch(packet.get(hc06_ptr)) { switch (packet.get(hc06_ptr) & (byte) SICSLOWPAN_NHC_UDP_11) {
case (byte) SICSLOWPAN_NHC_UDP_C: case (byte) SICSLOWPAN_NHC_UDP_00:
/* 1 byte for NHC, 1 byte for ports, 2 bytes chksum */
srcPort = SICSLOWPAN_UDP_PORT_MIN + (packet.get(hc06_ptr + 1) >> 4);
destPort = SICSLOWPAN_UDP_PORT_MIN + (packet.get(hc06_ptr + 1) & 0x0F);
// memcpy(&SICSLOWPAN_UDP_BUF->udpchksum, hc06_ptr + 2, 2);
// PRINTF("IPHC: Uncompressed UDP ports (4): %x, %x\n",
// SICSLOWPAN_UDP_BUF->srcport, SICSLOWPAN_UDP_BUF->destport);
hc06_ptr += 4;
break;
case (byte) SICSLOWPAN_NHC_UDP_I:
/* 1 byte for NHC, 4 byte for ports, 2 bytes chksum */ /* 1 byte for NHC, 4 byte for ports, 2 bytes chksum */
srcPort = packet.getInt(hc06_ptr + 1, 2); srcPort = packet.getInt(hc06_ptr + 1, 2) & 0xFFFF;
destPort = packet.getInt(hc06_ptr + 3, 2); destPort = packet.getInt(hc06_ptr + 3, 2) & 0xFFFF;
// memcpy(&SICSLOWPAN_UDP_BUF->udpchksum, hc06_ptr + 5, 2);
// PRINTF("IPHC: Uncompressed UDP ports (7): %x, %x\n",
// SICSLOWPAN_UDP_BUF->srcport, SICSLOWPAN_UDP_BUF->destport);
hc06_ptr += 7; hc06_ptr += 7;
break; break;
default: case (byte) SICSLOWPAN_NHC_UDP_01:
// PRINTF("sicslowpan uncompress_hdr: error unsupported UDP compression\n"); /* 1 byte for NHC, 3 byte for ports, 2 bytes chksum */
return ANALYSIS_FAILED; srcPort = packet.getInt(hc06_ptr + 1, 2);
} destPort = SICSLOWPAN_UDP_8_BIT_PORT_MIN + (packet.get(hc06_ptr + 3) & 0xFF);
hc06_ptr += 6;
break;
case (byte) SICSLOWPAN_NHC_UDP_10:
/* 1 byte for NHC, 3 byte for ports, 2 bytes chksum */
srcPort = SICSLOWPAN_UDP_8_BIT_PORT_MIN + (packet.get(hc06_ptr + 1) & 0xFF);
destPort = packet.getInt(hc06_ptr + 2, 2);
hc06_ptr += 6;
break;
case (byte) SICSLOWPAN_NHC_UDP_11:
/* 1 byte for NHC, 1 byte for ports, 2 bytes chksum */
srcPort = SICSLOWPAN_UDP_4_BIT_PORT_MIN + (packet.get(hc06_ptr + 1) >> 4);
destPort = SICSLOWPAN_UDP_4_BIT_PORT_MIN + (packet.get(hc06_ptr + 1) & 0x0F);
hc06_ptr += 4;
break;
} }
} }
} else {
// Skip extension header
// XXX TODO: Handle others, too?
if (proto == EXT_HDR_HOP_BY_HOP) {
proto = packet.get(hc06_ptr) & 0xFF;
// header length is length specified in field, rounded up to 64 bit
int hdr_len = ((packet.get(hc06_ptr + 1) / 8) + 1) * 8;
hc06_ptr += hdr_len;
// UDP hadling
if (proto == PROTO_UDP) {
srcPort = packet.getInt(hc06_ptr, 2) & 0xFFFF;
destPort = packet.getInt(hc06_ptr + 2, 2) & 0xFFFF;
hc06_ptr += 4;
}
}
}
// /* IP length field. */ // /* IP length field. */
// if(ip_len == 0) { // if(ip_len == 0) {
@ -374,14 +435,12 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
// SICSLOWPAN_IP_BUF->len[0] = (ip_len - UIP_IPH_LEN) >> 8; // SICSLOWPAN_IP_BUF->len[0] = (ip_len - UIP_IPH_LEN) >> 8;
// SICSLOWPAN_IP_BUF->len[1] = (ip_len - UIP_IPH_LEN) & 0x00FF; // SICSLOWPAN_IP_BUF->len[1] = (ip_len - UIP_IPH_LEN) & 0x00FF;
// } // }
// /* length field in UDP header */ // /* length field in UDP header */
// if(SICSLOWPAN_IP_BUF->proto == UIP_PROTO_UDP) { // if(SICSLOWPAN_IP_BUF->proto == UIP_PROTO_UDP) {
// memcpy(&SICSLOWPAN_UDP_BUF->udplen, ipBuf + len[0], 2); // memcpy(&SICSLOWPAN_UDP_BUF->udplen, ipBuf + len[0], 2);
// } // }
/*--------------------------------------------- */ /*--------------------------------------------- */
} catch (Exception e) { } catch (Exception e) {
// some kind of unexpected error... // some kind of unexpected error...
error = " error during IPHC parsing: " + e.getMessage(); error = " error during IPHC parsing: " + e.getMessage();
@ -391,20 +450,44 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
String protoStr = "" + proto; String protoStr = "" + proto;
if (proto == PROTO_ICMP) { if (proto == PROTO_ICMP) {
protoStr = "ICMPv6"; protoStr = "ICMPv6";
} else if (proto == PROTO_UDP) protoStr = "UDP"; } else if (proto == PROTO_UDP) {
else if (proto == PROTO_TCP) protoStr = "TCP"; protoStr = "UDP";
} else if (proto == PROTO_TCP) {
protoStr = "TCP";
} else {
protoStr = String.valueOf(proto);
}
verbose.append("<br><b>IPv6 ").append(protoStr).append("</b> TC = " + trafficClass + // IPv6 Information
" FL: " + flowLabel + "<br>");
brief.append("|IPv6");
verbose.append("<br/><b>IPv6</b>")
.append(" TC = ").append(trafficClass)
.append(", FL = ").append(flowLabel)
.append("<br>");
verbose.append("From "); verbose.append("From ");
printAddress(verbose, srcAddress); printAddress(verbose, srcAddress);
verbose.append(" to "); verbose.append(" to ");
printAddress(verbose, destAddress); printAddress(verbose, destAddress);
if (error != null) verbose.append(" " + error); if (error != null) {
verbose.append(" ").append(error);
}
// Application Layer Information
if (proto != PROTO_ICMP) {
brief.append('|').append(protoStr);
verbose.append("<br/><b>").append(protoStr).append("</b>");
}
if (proto == PROTO_UDP) {
brief.append(' ').append(srcPort).append(' ').append(destPort);
verbose.append("<br/>Src Port: ").append(srcPort);
verbose.append(", Dst Port: ").append(destPort);
}
packet.lastDispatch = (byte) (proto & 0xff); packet.lastDispatch = (byte) (proto & 0xff);
if (proto == PROTO_UDP || proto == PROTO_ICMP || if (proto == PROTO_UDP || proto == PROTO_ICMP
proto == PROTO_TCP) { || proto == PROTO_TCP) {
packet.level = APPLICATION_LEVEL; packet.level = APPLICATION_LEVEL;
return ANALYSIS_OK_CONTINUE; return ANALYSIS_OK_CONTINUE;
} else { } else {
@ -413,15 +496,13 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
} }
} }
public static void printAddress(StringBuffer out, byte[] address) { public static void printAddress(StringBuilder out, byte[] address) {
for (int i = 0; i < 16; i += 2) { for (int i = 0; i < 16; i += 2) {
out.append(StringUtils.toHex((byte) (address[i] & 0xff)) + out.append(StringUtils.toHex((byte) (address[i] & 0xff))
StringUtils.toHex((byte) (address[i + 1] & 0xff))); + StringUtils.toHex((byte) (address[i + 1] & 0xff)));
if (i < 14) { if (i < 14) {
out.append(":"); out.append(":");
} }
} }
} }
} }

33
tools/cooja/java/org/contikios/cooja/plugins/analyzers/IPv6PacketAnalyzer.java
View file

@ -4,32 +4,30 @@ import org.contikios.cooja.util.StringUtils;
public class IPv6PacketAnalyzer extends PacketAnalyzer { public class IPv6PacketAnalyzer extends PacketAnalyzer {
public final static int PROTO_UDP = 17; public final static int PROTO_UDP = 17;
public final static int PROTO_TCP = 6; public final static int PROTO_TCP = 6;
public final static int PROTO_ICMP = 58; public final static int PROTO_ICMP = 58;
public final static byte[] UNSPECIFIED_ADDRESS
public final static byte[] UNSPECIFIED_ADDRESS = = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
private static final int IPV6_DISPATCH = 0x41; private static final int IPV6_DISPATCH = 0x41;
@Override
public boolean matchPacket(Packet packet) { public boolean matchPacket(Packet packet) {
return packet.level == NETWORK_LEVEL && packet.get(0) == IPV6_DISPATCH; return packet.level == NETWORK_LEVEL && packet.get(0) == IPV6_DISPATCH;
} }
public int analyzePacket(Packet packet, StringBuffer brief, @Override
StringBuffer verbose) { public int analyzePacket(Packet packet, StringBuilder brief,
StringBuilder verbose) {
/* if packet has less than 40 bytes it is not interesting ... */ /* if packet has less than 40 bytes it is not interesting ... */
if (packet.size() < 40) return ANALYSIS_FAILED; if (packet.size() < 40) return ANALYSIS_FAILED;
brief.append("IPv6"); brief.append("IPv6");
/* need to decompress while analyzing - add that later... */ /* need to decompress while analyzing - add that later... */
verbose.append("<b>IPv6</b><br>"); verbose.append("<b>IPv6</b><br>");
int pos = 1; int pos = 1;
@ -49,14 +47,18 @@ public class IPv6PacketAnalyzer extends PacketAnalyzer {
String protoStr = "" + proto; String protoStr = "" + proto;
if (proto == PROTO_ICMP) { if (proto == PROTO_ICMP) {
protoStr = "ICMPv6"; protoStr = "ICMPv6";
} else if (proto == PROTO_UDP) protoStr = "UDP"; } else if (proto == PROTO_UDP) {
else if (proto == PROTO_TCP) protoStr = "TCP"; protoStr = "UDP";
} else if (proto == PROTO_TCP) {
protoStr = "TCP";
}
/* consume dispatch + IP header */ /* consume dispatch + IP header */
packet.pos += 41; packet.pos += 41;
verbose.append("<br><b>IPv6 ").append(protoStr).append("</b> TC = " + trafficClass + verbose.append("<br><b>IPv6 ").append(protoStr)
" FL: " + flowLabel + "<br>"); .append("</b> TC = ").append(trafficClass)
.append(" FL: ").append(flowLabel).append("<br>");
verbose.append("From "); verbose.append("From ");
printAddress(verbose, srcAddress); printAddress(verbose, srcAddress);
verbose.append(" to "); verbose.append(" to ");
@ -67,15 +69,14 @@ public class IPv6PacketAnalyzer extends PacketAnalyzer {
return ANALYSIS_OK_CONTINUE; return ANALYSIS_OK_CONTINUE;
} }
public static void printAddress(StringBuffer out, byte[] address) { public static void printAddress(StringBuilder out, byte[] address) {
for (int i = 0; i < 16; i += 2) { for (int i = 0; i < 16; i += 2) {
out.append(StringUtils.toHex((byte) (address[i] & 0xff)) + out.append(StringUtils.toHex((byte) (address[i] & 0xff))
StringUtils.toHex((byte) (address[i + 1] & 0xff))); + StringUtils.toHex((byte) (address[i + 1] & 0xff)));
if (i < 14) { if (i < 14) {
out.append(":"); out.append(":");
} }
} }
} }
} }

8
tools/cooja/java/org/contikios/cooja/plugins/analyzers/PacketAnalyzer.java
View file

@ -12,6 +12,7 @@ public abstract class PacketAnalyzer {
public static final int APPLICATION_LEVEL = 3; public static final int APPLICATION_LEVEL = 3;
public static class Packet { public static class Packet {
byte[] data; byte[] data;
int pos; int pos;
int level; int level;
@ -30,7 +31,6 @@ public abstract class PacketAnalyzer {
this.size = data.length; this.size = data.length;
} }
public void consumeBytesStart(int bytes) { public void consumeBytesStart(int bytes) {
pos += bytes; pos += bytes;
} }
@ -39,7 +39,6 @@ public abstract class PacketAnalyzer {
size -= bytes; size -= bytes;
} }
public boolean hasMoreData() { public boolean hasMoreData() {
return size > pos; return size > pos;
} }
@ -56,12 +55,11 @@ public abstract class PacketAnalyzer {
public int getInt(int index, int size) { public int getInt(int index, int size) {
int value = 0; int value = 0;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
value = (value << 8) + get(index + i); value = (value << 8) + (get(index + i) & 0xFF);
} }
return value; return value;
} }
public byte[] getPayload() { public byte[] getPayload() {
byte[] pload = new byte[size - pos]; byte[] pload = new byte[size - pos];
System.arraycopy(data, pos, pload, 0, pload.length); System.arraycopy(data, pos, pload, 0, pload.length);
@ -85,5 +83,5 @@ public abstract class PacketAnalyzer {
public abstract boolean matchPacket(Packet packet); public abstract boolean matchPacket(Packet packet);
public abstract int analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose); public abstract int analyzePacket(Packet packet, StringBuilder brief, StringBuilder verbose);
} }

4
tools/cooja/java/org/contikios/cooja/plugins/analyzers/PcapExporter.java
View file

@ -31,9 +31,11 @@ public class PcapExporter {
out.writeInt(0); out.writeInt(0);
out.writeInt(4096); out.writeInt(4096);
out.writeInt(195); /* 195 for LINKTYPE_IEEE802_15_4 */ out.writeInt(195); /* 195 for LINKTYPE_IEEE802_15_4 */
out.flush(); out.flush();
System.out.println("Opened pcap file " + pcapFile); System.out.println("Opened pcap file " + pcapFile);
} }
public void closePcap() throws IOException { public void closePcap() throws IOException {
out.close(); out.close();
out = null; out = null;
@ -58,6 +60,4 @@ public class PcapExporter {
} }
} }
} }