From Greg Morris:

makefile.common.diff - epan directory
1. Adds new packet-ncp-sss.c and packet-ncp-sss.h for new Secret Store dissector
 
New Novell Secret Store Services dissector
packet-ncp-sss.c
packet-ncp-sss.h
 
ncp2222.py.diff
1. Adds a number of return values
2. Adds 64bit file size support
3. Add NCP 89,xx NCP's for UTF8 support
4. Fixes a number of field values for proper dissection
5. Adds support for Secret Store dissector
 
packet-ncp2222.inc.diff
1. Skwelches some compiler warnings
2. Redo of fix for bug 535 which original fix broke dissection of NDS verb 5
3. Adds support for Secret Store dissector
4. Adds expert data
5. Adds tap for service response time
6. Fixes dissection of stream attribute
7. Fixes defragmentation problem with more then 10 fragments
8. Fixes NDS dissection if reply buffer was less then 7
 
packet-ncp.c.diff
1. Adds tap data
2. Adds expert data
3. Fixes calculation for NCP connection number
4. Fixes malformed packet for destroy service connection
 
packet-ncp.c.diff
1. Adds tap data


svn path=/trunk/; revision=16266

1 files changed, 25 insertions, 4 deletions

diff --git a/epan/dissectors/packet-ncp-int.h b/epan/dissectors/packet-ncp-int.h
index 765ec04d83..1b5417b992 100644
--- a/epan/dissectors/packet-ncp-int.h
+++ b/epan/dissectors/packet-ncp-int.h
@@ -30,6 +30,8 @@
 #ifndef __PACKET_NCP_INT_H__
 #define __PACKET_NCP_INT_H__
 
+#include <epan/expert.h>
+
 typedef struct _ptvc_record ptvc_record;
 typedef struct _sub_ptvc_record sub_ptvc_record;
 
@@ -44,6 +46,17 @@ struct _ptvc_record {
 	unsigned int	special_fmt	: 2;
 };
 
+/*
+ * Every NCP packet has this common header (except for burst packets).
+ */
+struct ncp_common_header {
+	guint16	type;
+	guint8	sequence;
+	guint8	conn_low;
+	guint8	task;
+	guint8	conn_high; /* type=0x5555 doesn't have this */
+};
+
 #define NCP_FMT_NONE			0
 #define NCP_FMT_NW_DATE			1
 #define NCP_FMT_NW_TIME			2
@@ -68,6 +81,14 @@ typedef struct {
 	const char		*repeat_string;
 } info_string_t;
 
+
+struct novell_tap {
+    int stat;
+    int hdr;
+};
+
+typedef struct novell_tap _novell_tap;
+
 typedef struct {
 	guint8		error_in_packet;
 	gint		ncp_error_index;
@@ -105,7 +126,7 @@ void dissect_ncp_request(tvbuff_t*, packet_info*, guint16,
 		guint8, guint16, proto_tree*);
 
 void dissect_ncp_reply(tvbuff_t *, packet_info*, guint16, guint8,
-		guint16, proto_tree*);
+		guint16, proto_tree*, struct novell_tap*);
 
 void dissect_ping_req(tvbuff_t *, packet_info*, guint16, guint8,
 		guint16, proto_tree*);
@@ -114,7 +135,7 @@ void dissect_nds_request(tvbuff_t*, packet_info*, guint16,
 		guint8, guint16, proto_tree*);
 
 void nds_defrag(tvbuff_t*, packet_info*, guint16,
-		guint8, guint16, proto_tree*);
+		guint8, guint16, proto_tree*, struct novell_tap*);
 
 extern int proto_ncp;
 extern gint ett_ncp;
@@ -122,10 +143,10 @@ extern gint ett_nds;
 extern gint ett_nds_segments;
 extern gint ett_nds_segment;
 
-
+/*extern dissector_handle_t nds_data_handle;*/
 extern GHashTable *nds_fragment_table;
 extern GHashTable *nds_reassembled_table;
-extern dissector_handle_t nds_data_handle;
+
 /*
  * NCP packet types.
  */