[GitHub] sterlinghughes closed pull request #950: net/oic; detect duplicate frames using fragmentation seq number.

[GitBox <gi...@apache.org>]

sterlinghughes closed pull request #950: net/oic; detect duplicate frames using fragmentation seq number.
URL: https://github.com/apache/mynewt-core/pull/950
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/net/oic/src/port/mynewt/lora_adaptor.c b/net/oic/src/port/mynewt/lora_adaptor.c
index 5316b7e20..f56ab5165 100644
--- a/net/oic/src/port/mynewt/lora_adaptor.c
+++ b/net/oic/src/port/mynewt/lora_adaptor.c
@@ -31,6 +31,10 @@
 #include <stats/stats.h>
 #include <crc/crc16.h>
 
+#ifdef OC_DUMP_LORA
+#include <console/console.h>
+#endif
+
 #include <node/lora.h>
 
 #include "oic/oc_log.h"
@@ -69,6 +73,7 @@ STATS_SECT_START(oc_lora_stats)
     STATS_SECT_ENTRY(icsum)
     STATS_SECT_ENTRY(ishort)
     STATS_SECT_ENTRY(ioof)
+    STATS_SECT_ENTRY(idup)
     STATS_SECT_ENTRY(oframe)
     STATS_SECT_ENTRY(obytes)
     STATS_SECT_ENTRY(oerr)
@@ -82,6 +87,7 @@ STATS_NAME_START(oc_lora_stats)
     STATS_NAME(oc_lora_stats, icsum)
     STATS_NAME(oc_lora_stats, ishort)
     STATS_NAME(oc_lora_stats, ioof)
+    STATS_NAME(oc_lora_stats, idup)
     STATS_NAME(oc_lora_stats, oframe)
     STATS_NAME(oc_lora_stats, obytes)
     STATS_NAME(oc_lora_stats, oerr)
@@ -130,6 +136,38 @@ oc_ep_lora_size(const struct oc_endpoint *oe)
     return sizeof(struct oc_endpoint_lora);
 }
 
+#ifdef OC_DUMP_LORA
+static void
+oc_mbuf_dump_chain(struct os_mbuf *m, char *msg)
+{
+    char buf[80];
+    int off;
+    int i, cnt;
+    struct os_mbuf *o;
+
+    off = 0;
+    cnt = 0;
+    console_printf("%s\n", msg);
+    for (o = m; o; o = SLIST_NEXT(o, om_next)) {
+        for (i = 0; i < o->om_len; i++) {
+            off += snprintf(buf + off, sizeof(buf) - off, "%2x ",
+              o->om_data[i]);
+            cnt++;
+            if (cnt == 8) {
+                off = 0;
+                cnt = 0;
+                console_printf("%s\n", buf);
+            }
+        }
+    }
+    if (cnt) {
+        console_printf("%s\n", buf);
+    }
+}
+#else
+#define oc_mbuf_dump_chain(...)
+#endif
+
 void
 oc_send_frag_lora(struct oc_lora_state *os)
 {
@@ -189,6 +227,8 @@ oc_send_frag_lora(struct oc_lora_state *os)
     os_mbuf_adj(m, blk_len);
     STATS_INC(oc_lora_stats, oframe);
     STATS_INCN(oc_lora_stats, obytes, OS_MBUF_PKTLEN(n));
+
+    oc_mbuf_dump_chain(n, "lora frag tx");
     if (lora_app_port_send(oe->port, MCPS_CONFIRMED, n)) {
         STATS_INC(oc_lora_stats, oerr);
         goto err;
@@ -287,7 +327,7 @@ oc_lora_deliver(struct oc_lora_state *os)
     if (OS_MBUF_USRHDR_LEN(m) < sizeof(struct oc_endpoint_lora)) {
         n = os_msys_get_pkthdr(0, sizeof(struct oc_endpoint_lora));
         if (!n) {
-            OC_LOG_ERROR("oc_lora_rx_cb: Could not allocate mbuf\n");
+            OC_LOG_ERROR("oc_lora_deliver: Could not allocate mbuf\n");
             STATS_INC(oc_lora_stats, ierr);
             os_mbuf_free_chain(m);
             return;
@@ -342,6 +382,7 @@ oc_lora_rx_reass(struct os_mbuf *m, uint16_t port)
 
     pkt = OS_MBUF_PKTHDR(m);
 
+reprocess:
     if (os->rx_pkt == NULL) {
         /*
          * If no frame being reassembled, then it must have frag num 0,
@@ -361,10 +402,17 @@ oc_lora_rx_reass(struct os_mbuf *m, uint16_t port)
         /*
          * Subsequent fragments must come in order.
          */
+        if (frag_num == os->rx_frag_num && os->rx_port == port && frag_num) {
+            STATS_INC(oc_lora_stats, idup);
+            goto err;
+        }
         if (frag_num != os->rx_frag_num + 1 || os->rx_port != port) {
             os_mbuf_free_chain(OS_MBUF_PKTHDR_TO_MBUF(os->rx_pkt));
             os->rx_pkt = NULL;
             STATS_INC(oc_lora_stats, ioof);
+            if (frag_num == 0) {
+                goto reprocess;
+            }
             goto err;
         }
         os->rx_frag_num++;
@@ -388,6 +436,7 @@ oc_lora_rx_cb(uint8_t port, LoRaMacEventInfoStatus_t status, Mcps_t pkt_type,
 {
     assert(port == MYNEWT_VAL(OC_LORA_PORT));
     STATS_INC(oc_lora_stats, iframe);
+    oc_mbuf_dump_chain(m, "oc_lora_rx_cb");
     if (status != LORAMAC_EVENT_INFO_STATUS_OK) {
         STATS_INC(oc_lora_stats, ierr);
         os_mbuf_free_chain(m);


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services