Fix the SCCP dissector so it doesn't show non-segmented DT1 messages as

having been reassembled.

Fix the comments in reassembly.c and reassembly.h regarding what the reassembly
routines actually return in the 802.11 and no-sequence-number cases when they
are given the first and last packet (that is, a non-segmented packet): in
particular the routines return a pointer to a list containing just the one
fragment.

svn path=/trunk/; revision=20505

1 files changed, 7 insertions, 3 deletions

diff --git a/epan/reassemble.h b/epan/reassemble.h
index 2937b8f1cf..923a60f645 100644
--- a/epan/reassemble.h
+++ b/epan/reassemble.h
@@ -138,9 +138,13 @@ fragment_add_dcerpc_dg(tvbuff_t *tvb, int offset, packet_info *pinfo, guint32 id
  * head of the fragment list.
  *
  * If this is the first fragment we've seen, and "more_frags" is false,
- * "fragment_add_seq_802_11()" does nothing to the fragment data list,
- * and returns a pointer to the head of that (empty) list.  The other
- * routines return NULL.
+ * the fragment is added to the list.  "fragment_add_seq_check()" will
+ * return NULL (waiting for the earlier sequence numbers) while
+ * "fragment_add_seq_802_11()" (a special hack for the 802.11 dissector) and
+ * "fragment_add_seq_next()" will return a pointer to the (one element) list.
+ * In this latter case reassembly wasn't done (since there was only one
+ * fragment in the packet); dissectors can check the 'next' pointer on the
+ * returned list to see if this case was hit or not.
  *
  * Otherwise, they return NULL.
  *