From 6e4980e59bd740a30c53f0d229a82025e68f9c09 Mon Sep 17 00:00:00 2001
From: Jakob Olsson <jakob.olsson@iopsys.eu>
Date: Tue, 21 Dec 2021 14:23:18 +0100
Subject: [PATCH] Revert "avoid segfault in cmdu_defrag()"
This reverts commit 1ee33754d404ef84b82ac5ab43eeb78ba110f8e3.
---
src/cmdu.h | 2 +-
src/cmdufrag.c | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/cmdu.h b/src/cmdu.h
index 19de49a8..bc3d757a 100644
--- a/src/cmdu.h
+++ b/src/cmdu.h
@@ -39,7 +39,7 @@ struct cmdu_header {
#define CMDU_SET_LAST_FRAGMENT(c) (c)->hdr.flag |= 0x80
#define CMDU_SET_RELAY_MCAST(c) (c)->hdr.flag |= 0x40
-#define CMDU_DEFAULT_TIMEOUT 3000
+#define CMDU_DEFAULT_TIMEOUT 1000
/** struct cmdu_linear - represents a CMDU frame with header and TLVs */
struct cmdu_linear {
diff --git a/src/cmdufrag.c b/src/cmdufrag.c
index 2a53f117..4eec337f 100644
--- a/src/cmdufrag.c
+++ b/src/cmdufrag.c
@@ -425,9 +425,6 @@ struct cmdu_buff *cmdu_defrag(void *rxfq, struct cmdu_buff *lastfrag)
}
pthread_mutex_unlock(&q->qlock);
- if (!frag)
- return NULL;
-
/* alloc unfragmented cmdu */
cmdu = cmdu_alloc_frame(frag->tlen + 3); /* including EOM */
if (!cmdu) {
--
GitLab