diff options
| author | Michael Tüxen <tuexen@fh-muenster.de> | 2005-05-02 14:07:33 +0000 |
|---|---|---|
| committer | Michael Tüxen <tuexen@fh-muenster.de> | 2005-05-02 14:07:33 +0000 |
| commit | 23d022349ddb36bed7a04aa6fc70188a2b39d055 (patch) | |
| tree | 2a687d23dd6499bedbc1849f839374382901ccf5 /epan/packet.c | |
| parent | 5e89412e0c0b3584ecc2214c1c19addd6547ab41 (diff) | |
- Add support for libpcap files for MTP2 with a per packet header
indicating the direction, narrowband/broadband, and interface number.
- Add support to display the direction and interface number.
- Add support to packet-mtp2.c to use the broadband/narrowband indication.
svn path=/trunk/; revision=14265
Diffstat (limited to 'epan/packet.c')
| -rw-r--r-- | epan/packet.c | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/epan/packet.c b/epan/packet.c index db3f2a7591..9f2ca913fb 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -305,19 +305,21 @@ dissect_packet(epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, edt->pi.want_pdu_tracking = 0; edt->pi.p2p_dir = P2P_DIR_UNKNOWN; edt->pi.private_data = NULL; - edt->pi.oxid = 0; - edt->pi.rxid = 0; - edt->pi.r_ctl = 0; - edt->pi.src_idx = 0; - edt->pi.dst_idx = 0; - edt->pi.vsan = 0; - edt->pi.dcectxid = 0; - edt->pi.dcetransporttype = -1; + edt->pi.oxid = 0; + edt->pi.rxid = 0; + edt->pi.r_ctl = 0; + edt->pi.src_idx = 0; + edt->pi.dst_idx = 0; + edt->pi.vsan = 0; + edt->pi.dcectxid = 0; + edt->pi.dcetransporttype = -1; edt->pi.decrypt_gssapi_tvb = 0; edt->pi.gssapi_wrap_tvb = NULL; edt->pi.gssapi_encrypted_tvb = NULL; edt->pi.gssapi_decrypted_tvb = NULL; - edt->pi.layer_names = NULL; + edt->pi.layer_names = NULL; + edt->pi.link_number = 0; + edt->pi.annex_a_used = MTP2_ANNEX_A_USED_UNKNOWN; TRY { edt->tvb = tvb_new_real_data(pd, fd->cap_len, fd->pkt_len); @@ -336,13 +338,12 @@ dissect_packet(epan_dissect_t *edt, union wtap_pseudo_header *pseudo_header, g_assert_not_reached(); } CATCH(ReportedBoundsError) { - if(proto_malformed != -1){ - proto_tree_add_protocol_format(edt->tree, proto_malformed, edt->tvb, 0, 0, - "[Malformed Frame: Packet Length]" ); - } - else { - g_assert_not_reached(); - } + if(proto_malformed != -1){ + proto_tree_add_protocol_format(edt->tree, proto_malformed, edt->tvb, 0, 0, + "[Malformed Frame: Packet Length]" ); + } else { + g_assert_not_reached(); + } } ENDTRY; |