diff options
| author | Michael Mann <mmann78@netscape.net> | 2013-11-21 20:08:20 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2013-11-21 20:08:20 +0000 |
| commit | eabaddaca96a79f609a8235fb09e6151f6b9387f (patch) | |
| tree | d91da11cb14ac06039bc010480a16a42bc7ce141 /epan/exported_pdu.c | |
| parent | 9fa6c9fb800199967b5ec44a93fcfaeeed405085 (diff) | |
Remove ethertype, mpls_label and ppids from packet_info structure.
The information was converted to "proto" data within their respective dissectors strictly for use in "Decode As".
svn path=/trunk/; revision=53489
Diffstat (limited to 'epan/exported_pdu.c')
| -rw-r--r-- | epan/exported_pdu.c | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/epan/exported_pdu.c b/epan/exported_pdu.c index 01314c93ea..7d89b50d7b 100644 --- a/epan/exported_pdu.c +++ b/epan/exported_pdu.c @@ -43,7 +43,7 @@ load_export_pdu_tags(packet_info *pinfo, const char* proto_name, int wtap_encap int tag_buf_size = 0; int str_len = 0; int tag_str_len = 0; - int i = 0, j; + int i = 0; gboolean port_type_defined = FALSE; exp_pdu_data = (exp_pdu_data_t *)g_malloc(sizeof(exp_pdu_data_t)); @@ -89,16 +89,6 @@ load_export_pdu_tags(packet_info *pinfo, const char* proto_name, int wtap_encap tag_buf_size= tag_buf_size + EXP_PDU_TAG_DST_PORT_LEN + 4; } - if((tags_bit_field & EXP_PDU_TAG_SCTP_PPID_BIT) == EXP_PDU_TAG_SCTP_PPID_BIT){ - for(j = 0; j < MAX_NUMBER_OF_PPIDS; j++) { - if (pinfo->ppids[j] != LAST_PPID) { - tag_buf_size= tag_buf_size + EXP_PDU_TAG_SCTP_PPID_LEN + 4; - } else { - break; - } - } - } - if((tags_bit_field & EXP_PDU_TAG_SS7_OPC_BIT) == EXP_PDU_TAG_SS7_OPC_BIT){ if(pinfo->src.type == AT_SS7PC){ tag_buf_size += 4 + EXP_PDU_TAG_SS7_OPC_LEN; @@ -255,28 +245,6 @@ load_export_pdu_tags(packet_info *pinfo, const char* proto_name, int wtap_encap i = i +EXP_PDU_TAG_DST_PORT_LEN; } - if((tags_bit_field & EXP_PDU_TAG_SCTP_PPID_BIT) == EXP_PDU_TAG_SCTP_PPID_BIT){ - for(j = 0; j < MAX_NUMBER_OF_PPIDS; j++) { - if (pinfo->ppids[j] != LAST_PPID) { - exp_pdu_data->tlv_buffer[i] = 0; - i++; - exp_pdu_data->tlv_buffer[i] = EXP_PDU_TAG_SCTP_PPID; - i++; - exp_pdu_data->tlv_buffer[i] = 0; - i++; - exp_pdu_data->tlv_buffer[i] = EXP_PDU_TAG_SCTP_PPID_LEN; /* tag length */ - i++; - exp_pdu_data->tlv_buffer[i] = (pinfo->ppids[j] & 0xff000000) >> 24; - exp_pdu_data->tlv_buffer[i+1] = (pinfo->ppids[j] & 0x00ff0000) >> 16; - exp_pdu_data->tlv_buffer[i+2] = (pinfo->ppids[j] & 0x0000ff00) >> 8; - exp_pdu_data->tlv_buffer[i+3] = (pinfo->ppids[j] & 0x000000ff); - i = i +EXP_PDU_TAG_SCTP_PPID_LEN; - } else { - break; - } - } - } - if((tags_bit_field & EXP_PDU_TAG_SS7_OPC_BIT) == EXP_PDU_TAG_SS7_OPC_BIT){ if(pinfo->src.type == AT_SS7PC){ mtp3_addr_pc_t *mtp3_addr = (mtp3_addr_pc_t *)(pinfo->src.data); |