← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/wireshark/gutsy-security

« back to all changes in this revision

Viewing changes to epan/dissectors/packet-tftp.c

  • Committer: Bazaar Package Importer
  • Author(s): Frederic Peters
  • Date: 2007-04-01 08:58:40 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070401085840-or3qhrpv8alt1bwg
Tags: 0.99.5-1
* New upstream release.
* debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
epan/dissectors/packet-tftp.c
7
7
 * Joerg Mayer (see AUTHORS file)
8
8
 *      RFC2348 TFTP Blocksize Option
9
9
 *
10
 
 * $Id: packet-tftp.c 19162 2006-09-06 08:24:36Z jmayer $
 
10
 * $Id: packet-tftp.c 20670 2007-02-01 18:40:28Z gerald $
11
11
 *
12
12
 * Wireshark - Network traffic analyzer
13
13
 * By Gerald Combs <gerald@wireshark.org>
158
158
{
159
159
        proto_tree       *tftp_tree = NULL;
160
160
        proto_item       *ti;
161
 
        conversation_t   *conversation;
 
161
        conversation_t   *conversation = NULL;
162
162
        gint             offset = 0;
163
163
        guint16          opcode;
164
164
        guint16          bytes;
196
196
        } else {
197
197
          conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
198
198
                pinfo->ptype, pinfo->srcport, pinfo->destport, 0);
199
 
          DISSECTOR_ASSERT(conversation);
 
199
          if( (conversation == NULL) || (conversation->dissector_handle!=tftp_handle) ){
 
200
            conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst, PT_UDP,
 
201
                                            pinfo->destport, pinfo->srcport, 0);
 
202
            conversation_set_dissector(conversation, tftp_handle);
 
203
          }
200
204
        }
201
205
        tftp_info = conversation_get_proto_data(conversation, proto_tftp);
202
206
        if (!tftp_info) {