aboutsummaryrefslogtreecommitdiffstats
path: root/packet-isakmp.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-10-25 23:51:26 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2001-10-25 23:51:26 +0000
commit96eb08c12bb2ecd02d1ce7f56f4025cff5950b2e (patch)
treea13baa35b10e384523ab6ac5961e9cea39363d62 /packet-isakmp.c
parent1eb430ac3af4a305e7bb10766647ae7043ad4f51 (diff)
We no longer try to dissect payloads of type "None", so get rid of
"dissect_none()". git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4082 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-isakmp.c')
-rw-r--r--packet-isakmp.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/packet-isakmp.c b/packet-isakmp.c
index c238c7335e..d19c570dd4 100644
--- a/packet-isakmp.c
+++ b/packet-isakmp.c
@@ -4,7 +4,7 @@
* for ISAKMP (RFC 2407)
* Brad Robel-Forrest <brad.robel-forrest@watchguard.com>
*
- * $Id: packet-isakmp.c,v 1.45 2001/10/25 23:40:28 guy Exp $
+ * $Id: packet-isakmp.c,v 1.46 2001/10/25 23:51:26 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -197,7 +197,6 @@ struct udp_encap_hdr {
static proto_tree *dissect_payload_header(tvbuff_t *, int, int, guint8,
guint8 *, guint16 *, proto_tree *);
-static void dissect_none(tvbuff_t *, int, int, proto_tree *);
static void dissect_sa(tvbuff_t *, int, int, proto_tree *);
static void dissect_proposal(tvbuff_t *, int, int, proto_tree *);
static void dissect_transform(tvbuff_t *, int, int, proto_tree *, guint8);
@@ -236,10 +235,10 @@ static struct strfunc {
const char * str;
void (*func)(tvbuff_t *, int, int, proto_tree *);
} strfuncs[NUM_LOAD_TYPES] = {
- {"NONE", dissect_none },
+ {"NONE", NULL },
{"Security Association", dissect_sa },
{"Proposal", dissect_proposal },
- {"Transform", NULL },
+ {"Transform", NULL },
{"Key Exchange", dissect_key_exch },
{"Identification", dissect_id },
{"Certificate", dissect_cert },
@@ -481,11 +480,6 @@ dissect_payload_header(tvbuff_t *tvb, int offset, int length, guint8 payload,
}
static void
-dissect_none(tvbuff_t *tvb, int offset, int length, proto_tree *tree)
-{
-}
-
-static void
dissect_sa(tvbuff_t *tvb, int offset, int length, proto_tree *tree)
{
guint32 doi;