diff options
| author | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-28 02:30:18 +0000 |
|---|---|---|
| committer | Richard Sharpe <sharpe@ns.aus.com> | 2002-08-28 02:30:18 +0000 |
| commit | 5d6821ad0256bc92f90d1d43904e3d900820eaae (patch) | |
| tree | 901462598b83a2a1c89d4d028c6c409a6afbc11a | |
| parent | 18c0dc0cebfcbb57d6f6e22d79edcd131be5c16d (diff) | |
Ohh, I feel so good. More of SPNEGO ...
Still more to come. SHould have the negTokenInit done soon, then onto the
negTokenTarg ...
svn path=/trunk/; revision=6109
| -rw-r--r-- | packet-gssapi.c | 7 | ||||
| -rw-r--r-- | packet-spnego.c | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/packet-gssapi.c b/packet-gssapi.c index 933d5af15e..ed93008592 100644 --- a/packet-gssapi.c +++ b/packet-gssapi.c @@ -2,7 +2,7 @@ * Dissector for GSS-API tokens as described in rfc2078, section 3.1 * Copyright 2002, Tim Potter <tpot@samba.org> * - * $Id: packet-gssapi.c,v 1.5 2002/08/27 23:30:34 sharpe Exp $ + * $Id: packet-gssapi.c,v 1.6 2002/08/28 02:30:18 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -200,10 +200,13 @@ dissect_gssapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) g_free(oid_string); + /* + * This is not needed, as the sub-dissector adds a tree sub_item = proto_tree_add_item(subtree, value->proto, tvb, offset, -1, FALSE); oid_subtree = proto_item_add_subtree(sub_item, value->ett); + */ handle = find_dissector(value->name); @@ -211,7 +214,7 @@ dissect_gssapi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvbuff_t *oid_tvb; oid_tvb = tvb_new_subset(tvb, offset, -1, -1); - call_dissector(handle, oid_tvb, pinfo, oid_subtree); + call_dissector(handle, oid_tvb, pinfo, subtree); } done: diff --git a/packet-spnego.c b/packet-spnego.c index 0d4fa730e1..e4494ebc07 100644 --- a/packet-spnego.c +++ b/packet-spnego.c @@ -4,7 +4,7 @@ * Copyright 2002, Tim Potter <tpot@samba.org> * Copyright 2002, Richard Sharpe <rsharpe@ns.aus.com> * - * $Id: packet-spnego.c,v 1.4 2002/08/28 01:15:23 sharpe Exp $ + * $Id: packet-spnego.c,v 1.5 2002/08/28 02:30:18 sharpe Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -148,7 +148,7 @@ dissect_spnego_mechTypes(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, goto done; } - oid_string = format_oid(oid, nbytes); + oid_string = format_oid(oid, len); proto_tree_add_text(subtree, tvb, offset, nbytes, "OID: %s", oid_string); @@ -238,6 +238,8 @@ dissect_spnego_negTokenInit(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, goto done; } + offset = hnd->offset; + while (len1) { /* @@ -433,7 +435,7 @@ dissect_spnego(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree) } void -proto_register_snego(void) +proto_register_spnego(void) { static hf_register_info hf[] = { { &hf_spnego, |