From 81da8e0b6bed80799f81d711329f1a35c1539b84 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Thu, 13 May 2010 18:55:31 +0000 Subject: Use find_or_create_conversation() in some ASN.1 dissectors svn path=/trunk/; revision=32791 --- asn1/spnego/spnego.cnf | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'asn1/spnego/spnego.cnf') diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index f5ce61ff75..1da039c96a 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -66,7 +66,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC * Now dissect the GSS_Wrap token; it's assumed to be in the * rest of the tvbuff. */ - item = proto_tree_add_item(tree, hf_spnego_wraptoken, tvb, offset, -1, FALSE); + item = proto_tree_add_item(tree, hf_spnego_wraptoken, tvb, offset, -1, FALSE); subtree = proto_item_add_subtree(item, ett_spnego_wraptoken); @@ -95,21 +95,12 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC %(DEFAULT_BODY)s - /* + /* * If we saw a mechType we need to store it in case the negTokenTarg * does not provide a supportedMech. */ if(saw_mechanism){ - conversation = find_conversation(actx->pinfo->fd->num, - &actx->pinfo->src, &actx->pinfo->dst, - actx->pinfo->ptype, - actx->pinfo->srcport, actx->pinfo->destport, 0); - if(!conversation){ - conversation = conversation_new(actx->pinfo->fd->num, - &actx->pinfo->src, &actx->pinfo->dst, - actx->pinfo->ptype, - actx->pinfo->srcport, actx->pinfo->destport, 0); - } + conversation = find_or_create_conversation(actx->pinfo); conversation_add_proto_data(conversation, proto_spnego, next_level_value); } @@ -140,7 +131,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC /* * There seems to be two different forms this can take, - * one as an octet string, and one as a general string in a + * one as an octet string, and one as a general string in a * sequence. * * Peek at the header, and then decide which it is we're seeing. @@ -179,20 +170,11 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC /* * If we saw an explicit mechType we store this in the conversation so that - * it will override any mechType we might have picked up from the + * it will override any mechType we might have picked up from the * negTokenInit. */ if(saw_mechanism){ - conversation = find_conversation(actx->pinfo->fd->num, - &actx->pinfo->src, &actx->pinfo->dst, - actx->pinfo->ptype, - actx->pinfo->srcport, actx->pinfo->destport, 0); - if(!conversation){ - conversation = conversation_new(actx->pinfo->fd->num, - &actx->pinfo->src, &actx->pinfo->dst, - actx->pinfo->ptype, - actx->pinfo->srcport, actx->pinfo->destport, 0); - } + conversation = find_or_create_conversation(actx->pinfo); conversation_add_proto_data(conversation, proto_spnego, next_level_value); } @@ -212,7 +194,7 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC /* * Now, we should be able to dispatch, if we've gotten a tvbuff for * the token and we have information on how to dissect its contents. - * However, we should make sure that there is something in the + * However, we should make sure that there is something in the * response token ... */ if (responseToken_tvb && (tvb_reported_length(responseToken_tvb) > 0) ){ -- cgit v1.2.3