added support for hc06 decompression in radiologger / analyzer
This commit is contained in:
joxe
parent
b9827d2b36
commit
83d203afb5
@ -118,6 +118,9 @@ public class IEEE802154Analyzer extends PacketAnalyzer {
|
|||||||
/* update packet */
|
/* update packet */
|
||||||
packet.pos = pos;
|
packet.pos = pos;
|
||||||
packet.level = NETWORK_LEVEL;
|
packet.level = NETWORK_LEVEL;
|
||||||
|
|
||||||
|
packet.llsender = sourceAddress;
|
||||||
|
packet.llreceiver = destAddress;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void printAddress(StringBuffer sb, int type, byte[] addr) {
|
private void printAddress(StringBuffer sb, int type, byte[] addr) {
|
||||||
|
|||||||
@ -4,8 +4,62 @@ import se.sics.cooja.util.StringUtils;
|
|||||||
|
|
||||||
public class IPHCPacketAnalyzer extends PacketAnalyzer {
|
public class IPHCPacketAnalyzer extends PacketAnalyzer {
|
||||||
|
|
||||||
private static final int IPHC_DISPATCH = 0x60;
|
public final static int SICSLOWPAN_UDP_PORT_MIN = 0xF0B0;
|
||||||
|
public final static int SICSLOWPAN_UDP_PORT_MAX = 0xF0BF; /* F0B0 + 15 */
|
||||||
|
|
||||||
|
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_IPHC = 0x60; /* 011xxxxx = ... */
|
||||||
|
public final static int SICSLOWPAN_DISPATCH_FRAG1 = 0xc0; /* 1100= 0xxx */
|
||||||
|
public final static int SICSLOWPAN_DISPATCH_FRAGN = 0xe0; /* 1110= 0xxx */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Values of fields within the IPHC encoding first byte
|
||||||
|
* (C stands for compressed and I for inline)
|
||||||
|
*/
|
||||||
|
public final static int SICSLOWPAN_IPHC_TC_C = 0x10;
|
||||||
|
public final static int SICSLOWPAN_IPHC_FL_C = 0x08;
|
||||||
|
public final static int SICSLOWPAN_IPHC_NH_C = 0x04;
|
||||||
|
public final static int SICSLOWPAN_IPHC_TTL_1 = 0x01;
|
||||||
|
public final static int SICSLOWPAN_IPHC_TTL_64 = 0x02;
|
||||||
|
public final static int SICSLOWPAN_IPHC_TTL_255 = 0x03;
|
||||||
|
public final static int SICSLOWPAN_IPHC_TTL_I = 0x00;
|
||||||
|
|
||||||
|
|
||||||
|
/* Values of fields within the IPHC encoding second byte */
|
||||||
|
public final static int SICSLOWPAN_IPHC_CID = 0x80;
|
||||||
|
|
||||||
|
public final static int SICSLOWPAN_IPHC_SAC = 0x40;
|
||||||
|
public final static int SICSLOWPAN_IPHC_SAM_00 = 0x00;
|
||||||
|
public final static int SICSLOWPAN_IPHC_SAM_01 = 0x10;
|
||||||
|
public final static int SICSLOWPAN_IPHC_SAM_10 = 0x20;
|
||||||
|
public final static int SICSLOWPAN_IPHC_SAM_11 = 0x30;
|
||||||
|
|
||||||
|
public final static int SICSLOWPAN_IPHC_M = 0x08;
|
||||||
|
public final static int SICSLOWPAN_IPHC_DAC = 0x04;
|
||||||
|
public final static int SICSLOWPAN_IPHC_DAM_00 = 0x00;
|
||||||
|
public final static int SICSLOWPAN_IPHC_DAM_01 = 0x01;
|
||||||
|
public final static int SICSLOWPAN_IPHC_DAM_10 = 0x02;
|
||||||
|
public final static int SICSLOWPAN_IPHC_DAM_11 = 0x03;
|
||||||
|
|
||||||
|
private static final int SICSLOWPAN_NHC_UDP_ID = 0xf8;
|
||||||
|
private static final int SICSLOWPAN_NHC_UDP_C = 0xFB;
|
||||||
|
private static final int SICSLOWPAN_NHC_UDP_I = 0xF8;
|
||||||
|
|
||||||
|
public final static int PROTO_UDP = 17;
|
||||||
|
public final static int PROTO_TCP = 6;
|
||||||
|
public final static int PROTO_ICMP = 58;
|
||||||
|
|
||||||
|
|
||||||
|
public final static byte[] UNSPECIFIED_ADDRESS =
|
||||||
|
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||||
|
|
||||||
|
private static byte[][] addrContexts = new byte[][] {
|
||||||
|
{(byte)0xaa, (byte)0xaa, 0, 0, 0, 0, 0, 0}
|
||||||
|
};
|
||||||
|
|
||||||
|
private static final int IPHC_DISPATCH = 0x60;
|
||||||
|
|
||||||
public boolean matchPacket(Packet packet) {
|
public boolean matchPacket(Packet packet) {
|
||||||
return (packet.get(0) & 0xe0) == IPHC_DISPATCH;
|
return (packet.get(0) & 0xe0) == IPHC_DISPATCH;
|
||||||
}
|
}
|
||||||
@ -22,6 +76,8 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
|
|||||||
int m = (packet.get(1) >> 3) & 0x01;
|
int m = (packet.get(1) >> 3) & 0x01;
|
||||||
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 dci = 0;
|
||||||
|
|
||||||
brief.append("iphc tf=" + tf + (nh == 1 ? " nh" : "") + " hl=" + hlim + (cid == 1 ? " cid " : ""));
|
brief.append("iphc tf=" + tf + (nh == 1 ? " nh" : "") + " hl=" + hlim + (cid == 1 ? " cid " : ""));
|
||||||
brief.append((sac == 1 ? " sac" : "") + " sam=" + sam + (m == 1 ? " M" : "") +
|
brief.append((sac == 1 ? " sac" : "") + " sam=" + sam + (m == 1 ? " M" : "") +
|
||||||
@ -31,21 +87,347 @@ public class IPHCPacketAnalyzer extends PacketAnalyzer {
|
|||||||
brief.append(" sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
|
brief.append(" sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
|
||||||
}
|
}
|
||||||
/* need to decompress while analyzing - add that later... */
|
/* need to decompress while analyzing - add that later... */
|
||||||
|
|
||||||
verbose.append("<br><b>IPHC HC-06</b><br>");
|
verbose.append("<br><b>IPHC HC-06</b><br>");
|
||||||
verbose.append("tf = " + tf + " nhc = " + nh + " hlim = " + hlim + " cid = " + cid);
|
verbose.append("tf = " + tf + " nhc = " + nh + " hlim = " + hlim + " cid = " + cid);
|
||||||
verbose.append("sac = " + sac + " sam = " + sam + " MCast = " + m + " dac = " + dac +
|
verbose.append("sac = " + sac + " sam = " + sam + " MCast = " + m + " dac = " + dac +
|
||||||
" dam = " + dam + "<br>");
|
" dam = " + dam + "<br>");
|
||||||
if (cid == 1) {
|
if (cid == 1) {
|
||||||
verbose.append("Contexts: sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
|
verbose.append("Contexts: sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
|
||||||
|
sci = packet.get(2) >> 4;
|
||||||
|
dci = packet.get(2) & 0x0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
packet.pos += cid == 1 ? 3 : 2;
|
int hc06_ptr = 2 + cid;
|
||||||
brief.append("|").append(StringUtils.toHex(packet.getPayload(), 4));
|
|
||||||
verbose.append("Payload: ").append(StringUtils.toHex(packet.getPayload(), 4));
|
int version = 6;
|
||||||
|
int trafficClass = 0;
|
||||||
|
int flowLabel = 0;
|
||||||
|
int len = 0;
|
||||||
|
int proto = 0;
|
||||||
|
int ttl = 0;
|
||||||
|
byte[] srcAddress = null;
|
||||||
|
byte[] destAddress = null;
|
||||||
|
|
||||||
|
int srcPort = 0;
|
||||||
|
int destPort = 0;
|
||||||
|
|
||||||
|
/* Traffic class and flow label */
|
||||||
|
if((packet.get(0) & SICSLOWPAN_IPHC_FL_C) == 0) {
|
||||||
|
/* Flow label are carried inline */
|
||||||
|
if((packet.get(0) & SICSLOWPAN_IPHC_TC_C) == 0) {
|
||||||
|
/* Traffic class is carried inline */
|
||||||
|
flowLabel = packet.getInt(hc06_ptr + 1, 3);
|
||||||
|
int tmp = packet.get(hc06_ptr);
|
||||||
|
hc06_ptr += 4;
|
||||||
|
/* hc06 format of tc is ECN | DSCP , original is DSCP | ECN */
|
||||||
|
trafficClass = ((tmp >> 2) & 0x3f) | (tmp << 6) & (0x80 + 0x40);
|
||||||
|
/* ECN rolled down two steps + lowest DSCP bits at top two bits */
|
||||||
|
} else {
|
||||||
|
/* highest flow label bits + ECN bits */
|
||||||
|
int tmp = packet.get(hc06_ptr);
|
||||||
|
trafficClass = (tmp >> 6) & 0x0f;
|
||||||
|
flowLabel = packet.getInt(hc06_ptr + 1, 2);
|
||||||
|
hc06_ptr += 3;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* Version is always 6! */
|
||||||
|
/* Version and flow label are compressed */
|
||||||
|
if((packet.get(0) & SICSLOWPAN_IPHC_TC_C) == 0) {
|
||||||
|
/* Traffic class is inline */
|
||||||
|
trafficClass =((packet.get(hc06_ptr) >> 6) & 0x03);
|
||||||
|
trafficClass = (packet.get(hc06_ptr) << 2);
|
||||||
|
hc06_ptr += 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Next Header */
|
||||||
|
if((packet.get(0) & SICSLOWPAN_IPHC_NH_C) == 0) {
|
||||||
|
/* Next header is carried inline */
|
||||||
|
proto = packet.get(hc06_ptr);
|
||||||
|
hc06_ptr += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Hop limit */
|
||||||
|
switch(packet.get(0) & 0x03) {
|
||||||
|
case SICSLOWPAN_IPHC_TTL_1:
|
||||||
|
ttl = 1;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_TTL_64:
|
||||||
|
ttl = 2;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_TTL_255:
|
||||||
|
ttl = 255;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_TTL_I:
|
||||||
|
ttl = packet.get(hc06_ptr);
|
||||||
|
hc06_ptr += 1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* context based compression */
|
||||||
|
if((packet.get(1) & SICSLOWPAN_IPHC_SAC) > 0) {
|
||||||
|
/* Source address */
|
||||||
|
byte[] context = null;
|
||||||
|
if((packet.get(1) & SICSLOWPAN_IPHC_SAM_11) != SICSLOWPAN_IPHC_SAM_00) {
|
||||||
|
context = addrContexts[sci];
|
||||||
|
}
|
||||||
|
|
||||||
|
switch(packet.get(1) & SICSLOWPAN_IPHC_SAM_11) {
|
||||||
|
case SICSLOWPAN_IPHC_SAM_00:
|
||||||
|
/* copy the unspecificed address */
|
||||||
|
srcAddress = UNSPECIFIED_ADDRESS;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */
|
||||||
|
/* copy prefix from context */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, srcAddress, 0, 8);
|
||||||
|
/* copy IID from packet */
|
||||||
|
packet.copy(hc06_ptr, srcAddress, 8, 8);
|
||||||
|
hc06_ptr += 8;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */
|
||||||
|
/* unicast address */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, srcAddress, 0, 8);
|
||||||
|
/* copy 6 NULL bytes then 2 last bytes of IID */
|
||||||
|
packet.copy(hc06_ptr, srcAddress, 14, 2);
|
||||||
|
hc06_ptr += 2;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_11: /* 0-bits */
|
||||||
|
/* copy prefix from context */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, srcAddress, 0, 8);
|
||||||
|
/* infer IID from L2 address */
|
||||||
|
System.arraycopy(packet.llsender, 0, srcAddress,
|
||||||
|
16 - packet.llsender.length, packet.llsender.length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
/* end context based compression */
|
||||||
|
} else {
|
||||||
|
/* no compression and link local */
|
||||||
|
switch(packet.get(1) & SICSLOWPAN_IPHC_SAM_11) {
|
||||||
|
case SICSLOWPAN_IPHC_SAM_00: /* 128 bits */
|
||||||
|
/* copy whole address from packet */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
packet.copy(hc06_ptr, srcAddress, 0, 16);
|
||||||
|
hc06_ptr += 16;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_01: /* 64 bits */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
srcAddress[0] = (byte) 0xfe;
|
||||||
|
srcAddress[1] = (byte) 0x80;
|
||||||
|
/* copy IID from packet */
|
||||||
|
packet.copy(hc06_ptr, srcAddress, 8, 8);
|
||||||
|
hc06_ptr += 8;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_10: /* 16 bits */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
srcAddress[0] = (byte) 0xfe;
|
||||||
|
srcAddress[1] = (byte) 0x80;
|
||||||
|
packet.copy(hc06_ptr, srcAddress, 14, 2);
|
||||||
|
hc06_ptr += 2;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_SAM_11: /* 0 bits */
|
||||||
|
/* setup link-local address */
|
||||||
|
srcAddress = new byte[16];
|
||||||
|
srcAddress[0] = (byte) 0xfe;
|
||||||
|
srcAddress[1] = (byte) 0x80;
|
||||||
|
/* infer IID from L2 address */
|
||||||
|
System.arraycopy(packet.llsender, 0, srcAddress,
|
||||||
|
16 - packet.llsender.length, packet.llsender.length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Destination address */
|
||||||
|
|
||||||
|
/* multicast compression */
|
||||||
|
if((packet.get(1) & SICSLOWPAN_IPHC_M) != 0) {
|
||||||
|
/* context based multicast compression */
|
||||||
|
if((packet.get(1) & SICSLOWPAN_IPHC_DAC) != 0) {
|
||||||
|
/* TODO: implement this */
|
||||||
|
} else {
|
||||||
|
/* non-context based multicast compression */
|
||||||
|
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
|
||||||
|
case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */
|
||||||
|
/* copy whole address from packet */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
packet.copy(hc06_ptr, destAddress, 0, 16);
|
||||||
|
hc06_ptr += 16;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_01: /* 48 bits FFXX::00XX:XXXX:XXXX */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xff;
|
||||||
|
destAddress[1] = packet.get(hc06_ptr);
|
||||||
|
packet.copy(hc06_ptr + 1, destAddress, 11, 5);
|
||||||
|
hc06_ptr += 6;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_10: /* 32 bits FFXX::00XX:XXXX */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xff;
|
||||||
|
destAddress[1] = packet.get(hc06_ptr);
|
||||||
|
packet.copy(hc06_ptr + 1, destAddress, 13, 3);
|
||||||
|
hc06_ptr += 4;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_11: /* 8 bits FF02::00XX */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xff;
|
||||||
|
destAddress[1] = (byte) 0x02;
|
||||||
|
destAddress[15] = packet.get(hc06_ptr);
|
||||||
|
hc06_ptr++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* no multicast */
|
||||||
|
/* Context based */
|
||||||
|
if((packet.get(1) & SICSLOWPAN_IPHC_DAC) != 0) {
|
||||||
|
byte[] context = addrContexts[dci];
|
||||||
|
|
||||||
|
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
|
||||||
|
case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, destAddress, 0, 8);
|
||||||
|
/* copy IID from packet */
|
||||||
|
packet.copy(hc06_ptr, destAddress, 8, 8);
|
||||||
|
hc06_ptr += 8;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */
|
||||||
|
/* unicast address */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, destAddress, 0, 8);
|
||||||
|
/* copy IID from packet */
|
||||||
|
packet.copy(hc06_ptr, destAddress, 14, 2);
|
||||||
|
hc06_ptr += 2;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */
|
||||||
|
/* unicast address */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
System.arraycopy(context, 0, destAddress, 0, 8);
|
||||||
|
/* infer IID from L2 address */
|
||||||
|
System.arraycopy(packet.llreceiver, 0, destAddress,
|
||||||
|
16 - packet.llreceiver.length, packet.llreceiver.length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* not context based => link local M = 0, DAC = 0 - same as SAC */
|
||||||
|
switch (packet.get(1) & SICSLOWPAN_IPHC_DAM_11) {
|
||||||
|
case SICSLOWPAN_IPHC_DAM_00: /* 128 bits */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
packet.copy(hc06_ptr, destAddress, 0, 16);
|
||||||
|
hc06_ptr += 16;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_01: /* 64 bits */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xfe;
|
||||||
|
destAddress[1] = (byte) 0x80;
|
||||||
|
packet.copy(hc06_ptr, destAddress, 8, 8);
|
||||||
|
hc06_ptr += 8;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_10: /* 16 bits */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xfe;
|
||||||
|
destAddress[1] = (byte) 0x80;
|
||||||
|
packet.copy(hc06_ptr, destAddress, 14, 2);
|
||||||
|
hc06_ptr += 2;
|
||||||
|
break;
|
||||||
|
case SICSLOWPAN_IPHC_DAM_11: /* 0 bits */
|
||||||
|
destAddress = new byte[16];
|
||||||
|
destAddress[0] = (byte) 0xfe;
|
||||||
|
destAddress[1] = (byte) 0x80;
|
||||||
|
System.arraycopy(packet.llreceiver, 0, destAddress,
|
||||||
|
16 - packet.llreceiver.length, packet.llreceiver.length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Next header processing - continued */
|
||||||
|
if((packet.get(0) & SICSLOWPAN_IPHC_NH_C) != 0) {
|
||||||
|
/* TODO: check if this is correct in hc-06 */
|
||||||
|
/* The next header is compressed, NHC is following */
|
||||||
|
if((packet.get(hc06_ptr) & 0xFC) == SICSLOWPAN_NHC_UDP_ID) {
|
||||||
|
proto = PROTO_UDP;
|
||||||
|
switch(packet.get(hc06_ptr)) {
|
||||||
|
case (byte) SICSLOWPAN_NHC_UDP_C:
|
||||||
|
/* 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 */
|
||||||
|
srcPort = packet.getInt(hc06_ptr + 1, 2);
|
||||||
|
destPort = packet.getInt(hc06_ptr + 3, 2);
|
||||||
|
// 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;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// PRINTF("sicslowpan uncompress_hdr: error unsupported UDP compression\n");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
packet.pos += hc06_ptr;
|
||||||
|
|
||||||
|
// /* IP length field. */
|
||||||
|
// if(ip_len == 0) {
|
||||||
|
// /* This is not a fragmented packet */
|
||||||
|
// SICSLOWPAN_IP_BUF->len[0] = 0;
|
||||||
|
// SICSLOWPAN_IP_BUF->len[1] = packetbuf_datalen() - rime_hdr_len + uncomp_hdr_len - UIP_IPH_LEN;
|
||||||
|
// } else {
|
||||||
|
// /* This is a 1st fragment */
|
||||||
|
// SICSLOWPAN_IP_BUF->len[0] = (ip_len - UIP_IPH_LEN) >> 8;
|
||||||
|
// SICSLOWPAN_IP_BUF->len[1] = (ip_len - UIP_IPH_LEN) & 0x00FF;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// /* length field in UDP header */
|
||||||
|
// if(SICSLOWPAN_IP_BUF->proto == UIP_PROTO_UDP) {
|
||||||
|
// memcpy(&SICSLOWPAN_UDP_BUF->udplen, ipBuf + len[0], 2);
|
||||||
|
// }
|
||||||
|
|
||||||
|
/*--------------------------------------------- */
|
||||||
|
|
||||||
|
// packet.pos += cid == 1 ? 3 : 2;
|
||||||
|
|
||||||
|
String protoStr = "" + proto;
|
||||||
|
if (proto == PROTO_ICMP) protoStr = "ICMPv6";
|
||||||
|
else if (proto == PROTO_UDP) protoStr = "UDP";
|
||||||
|
else if (proto == PROTO_TCP) protoStr = "TCP";
|
||||||
|
|
||||||
|
verbose.append("<br><b>IPv6 Packet: ").append(protoStr).append("</b><br>");
|
||||||
|
verbose.append("From: ");
|
||||||
|
printAddress(verbose, srcAddress);
|
||||||
|
verbose.append(" to ");
|
||||||
|
printAddress(verbose, destAddress);
|
||||||
|
verbose.append("<br>");
|
||||||
|
|
||||||
|
brief.append("|").append(StringUtils.toHex(packet.getPayload(), 4));
|
||||||
|
verbose.append("Payload:<br><pre>").append(StringUtils.hexDump(packet.getPayload())).
|
||||||
|
append("</pre>");
|
||||||
|
|
||||||
packet.pos = packet.data.length;
|
packet.pos = packet.data.length;
|
||||||
packet.level = NETWORK_LEVEL;
|
packet.level = NETWORK_LEVEL;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void printAddress(StringBuffer out, byte[] address) {
|
||||||
|
for (int i = 0; i < 16; i+=2) {
|
||||||
|
out.append(StringUtils.toHex((byte) (address[i] & 0xff)) +
|
||||||
|
StringUtils.toHex((byte) (address[i + 1] & 0xff)));
|
||||||
|
if (i < 14) {
|
||||||
|
out.append(":");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,6 +11,10 @@ public abstract class PacketAnalyzer {
|
|||||||
int pos;
|
int pos;
|
||||||
int level;
|
int level;
|
||||||
|
|
||||||
|
/* L2 addresseses */
|
||||||
|
byte[] llsender;
|
||||||
|
byte[] llreceiver;
|
||||||
|
|
||||||
public Packet(byte[] data, int level) {
|
public Packet(byte[] data, int level) {
|
||||||
this.level = level;
|
this.level = level;
|
||||||
this.data = data;
|
this.data = data;
|
||||||
@ -23,12 +27,35 @@ public abstract class PacketAnalyzer {
|
|||||||
public byte get(int index) {
|
public byte get(int index) {
|
||||||
return data[pos + index];
|
return data[pos + index];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int getInt(int index, int size) {
|
||||||
|
int value = 0;
|
||||||
|
for (int i = 0; i < size; i++) {
|
||||||
|
value = (value << 8) + get(index + i);
|
||||||
|
}
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public byte[] getPayload() {
|
public byte[] getPayload() {
|
||||||
byte[] pload = new byte[data.length - pos];
|
byte[] pload = new byte[data.length - pos];
|
||||||
System.arraycopy(data, pos, pload, 0, pload.length);
|
System.arraycopy(data, pos, pload, 0, pload.length);
|
||||||
return pload;
|
return pload;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void copy(int srcpos, byte[] arr, int pos, int len) {
|
||||||
|
for (int i = 0; i < len; i++) {
|
||||||
|
arr[pos + i] = get(srcpos + i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] getLLSender() {
|
||||||
|
return llsender;
|
||||||
|
}
|
||||||
|
|
||||||
|
public byte[] getLLReceiver() {
|
||||||
|
return llreceiver;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
public abstract boolean matchPacket(Packet packet);
|
public abstract boolean matchPacket(Packet packet);
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: StringUtils.java,v 1.4 2010/02/23 22:32:57 joxe Exp $
|
* $Id: StringUtils.java,v 1.5 2010/02/25 22:36:08 joxe Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.sics.cooja.util;
|
package se.sics.cooja.util;
|
||||||
@ -108,7 +108,7 @@ public class StringUtils {
|
|||||||
}
|
}
|
||||||
sb.append(" ");
|
sb.append(" ");
|
||||||
for (int i = 0; i < n; i++) {
|
for (int i = 0; i < n; i++) {
|
||||||
if (data[j + i] > 32) {
|
if (data[j + i] >= 32) {
|
||||||
sb.append((char)(data[j + i] & 0xff));
|
sb.append((char)(data[j + i] & 0xff));
|
||||||
} else {
|
} else {
|
||||||
sb.append('.');
|
sb.append('.');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user