Merge branch 'develop' into fix/rpl-br-test-slack

This commit is contained in:
George Oikonomou 2018-03-26 22:14:00 +01:00 committed by GitHub
commit 6604adf0bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions

View File

@ -676,9 +676,9 @@ compress_hdr_iphc(linkaddr_t *link_destaddr)
LOG_DBG("before compression (%d): ", UIP_IP_BUF->len[1]);
for(ndx = 0; ndx < UIP_IP_BUF->len[1] + 40; ndx++) {
uint8_t data = ((uint8_t *) (UIP_IP_BUF))[ndx];
LOG_DBG("%02x", data);
LOG_DBG_("%02x", data);
}
LOG_DBG("\n");
LOG_DBG_("\n");
}
hc06_ptr = PACKETBUF_IPHC_BUF + 2;
@ -1000,9 +1000,9 @@ compress_hdr_iphc(linkaddr_t *link_destaddr)
LOG_DBG("after compression %d: ", (int)(hc06_ptr - packetbuf_ptr));
for(ndx = 0; ndx < hc06_ptr - packetbuf_ptr; ndx++) {
uint8_t data = ((uint8_t *) packetbuf_ptr)[ndx];
LOG_DBG("%02x", data);
LOG_DBG_("%02x", data);
}
LOG_DBG("\n");
LOG_DBG_("\n");
}
packetbuf_hdr_len = hc06_ptr - packetbuf_ptr;
@ -1909,9 +1909,9 @@ input(void)
LOG_DBG("after decompression %u:", UIP_IP_BUF->len[1]);
for (ndx = 0; ndx < UIP_IP_BUF->len[1] + 40; ndx++) {
uint8_t data = ((uint8_t *) (UIP_IP_BUF))[ndx];
LOG_DBG("%02x", data);
LOG_DBG_("%02x", data);
}
LOG_DBG("\n");
LOG_DBG_("\n");
}
/* if callback is set then set attributes and call */