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

Bug fix: only continue to analyze packet data when ANALYSIS_OK_CONTINUE is returned from previous analyzer.

Browse source
This commit is contained in:
nifi 2010-03-17 14:16:13 +00:00
parent fc738a5809
commit 0a579e0c6a
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/cooja/java/se/sics/cooja/plugins/RadioLogger.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: RadioLogger.java,v 1.32 2010/03/12 16:02:47 fros4943 Exp $ * $Id: RadioLogger.java,v 1.33 2010/03/17 14:16:13 nifi Exp $
*/ */
package se.sics.cooja.plugins; package se.sics.cooja.plugins;
@ -450,15 +450,14 @@ public class RadioLogger extends VisPlugin {
PacketAnalyzer analyzer = analyzers.get(i); PacketAnalyzer analyzer = analyzers.get(i);
if (analyzer.matchPacket(packet)) { if (analyzer.matchPacket(packet)) {
int res = analyzer.analyzePacket(packet, brief, verbose); int res = analyzer.analyzePacket(packet, brief, verbose);
if (res != analyzer.ANALYSIS_OK_FINAL) { if (res != PacketAnalyzer.ANALYSIS_OK_CONTINUE) {
/* continue another round if more bytes left */ /* this was the final or the analysis failed - no analyzable payload possible here... */
analyze = packet.hasMoreData();
brief.append('|');
verbose.append("<p>");
} else {
/* this was the final - no analyzable payload possible here... */
return brief.length() > 0; return brief.length() > 0;
} }
/* continue another round if more bytes left */
analyze = packet.hasMoreData();
brief.append('|');
verbose.append("<p>");
break; break;
} }
} }