From 82bbb6f1947bfb98a52422d7202aef331d36b1d7 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Fri, 18 Apr 2014 00:06:18 +0200 Subject: [PATCH] Revert "Guus please check this, I had to fix because my sptps where randomly failing for Unknown IP version" This reverts commit 67103e5e08616983a9b81b88695c3c4cc38cc9ab. --- src/net_packet.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/net_packet.c b/src/net_packet.c index a61ec0e0..818dd388 100644 --- a/src/net_packet.c +++ b/src/net_packet.c @@ -562,7 +562,6 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t } int offset = (type & PKT_MAC) ? 0 : 14; - offset = 0; //TODO: This is just a dirty hack. We dont have IP packets inside libmeshlink if(type & PKT_COMPRESSED) { length_t ulen = uncompress_packet(inpkt.data + offset, (const uint8_t *)data, len, from->incompression); if(ulen < 0) { @@ -577,6 +576,25 @@ bool receive_sptps_record(void *handle, uint8_t type, const char *data, uint16_t inpkt.len = len + offset; } + /* Generate the Ethernet packet type if necessary */ + if(offset) { + switch(inpkt.data[14] >> 4) { + case 4: + inpkt.data[12] = 0x08; + inpkt.data[13] = 0x00; + break; + case 6: + inpkt.data[12] = 0x86; + inpkt.data[13] = 0xDD; + break; + default: + logger(DEBUG_TRAFFIC, LOG_ERR, + "Unknown IP version %d while reading packet from %s (%s)", + inpkt.data[14] >> 4, from->name, from->hostname); + return false; + } + } + receive_packet(from, &inpkt); return true; } -- 2.39.5