Don't create a protocol tree or do anything to the columns before

calling "tcp_dissect_pdus()", so that if we don't have the final segment
of a multi-segment packet, we don't change the columns or put in an
empty protocol tree item for NDPS.

Rename "ndps.desegment_ndps" to "ndps.desegment_tcp" - the "ndps." is
sufficient to indicate that it's for desegmenting NDPS, but we now have
a flag for desegmenting NDPS-over-SPX, so we should indicate that the
other flag is for desegmenting NDPS-over-TCP.

svn path=/trunk/; revision=7425

1 files changed, 5 insertions, 1 deletions

diff --git a/prefs.c b/prefs.c
index ab305fb24a..04ed71c809 100644
--- a/prefs.c
+++ b/prefs.c
@@ -1,7 +1,7 @@
 /* prefs.c
  * Routines for handling preferences
  *
- * $Id: prefs.c,v 1.98 2003/03/13 18:17:59 guy Exp $
+ * $Id: prefs.c,v 1.99 2003/04/09 08:43:53 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1731,6 +1731,10 @@ set_pref(gchar *pref_name, gchar *value)
         /* Handle old names for UDP preferences. */
         if (strcmp(dotp, "udp_summary_in_tree") == 0)
           pref = find_preference(module, "summary_in_tree");
+      } else if (strcmp(module->name, "ndps") == 0) {
+        /* Handle old names for NDPS preferences. */
+        if (strcmp(dotp, "desegment_ndps") == 0)
+          pref = find_preference(module, "desegment_tcp");
       }
     }
     if (pref == NULL)