diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-12-15 20:22:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-12-15 20:22:54 +0000 |
| commit | a106a9047a85bffcd7127ad075ef365a44a1298d (patch) | |
| tree | 63b29ce5862123782964213d5deb9cf0d9ccc930 /epan/dissectors/packet-rohc.c | |
| parent | 98ed218772afa2a23bdde72700abdef94628f498 (diff) | |
Call the rohc dissector directly, the code will be cleaned up
in the next weeks or so.
svn path=/trunk/; revision=40213
Diffstat (limited to 'epan/dissectors/packet-rohc.c')
| -rw-r--r-- | epan/dissectors/packet-rohc.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index c1bd4fc6cd..50f5189cff 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -927,6 +927,7 @@ dissect_rohc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean is_add_cid = FALSE; rohc_info *p_rohc_info = NULL; rohc_info g_rohc_info; + void *save_private_data = pinfo->private_data; if(pinfo->private_data != NULL){ p_rohc_info = pinfo->private_data; @@ -1003,6 +1004,7 @@ start_over: proto_tree_add_item(rohc_tree, hf_rohc_feedback, tvb, offset, 1, ENC_BIG_ENDIAN); col_append_str(pinfo->cinfo, COL_INFO, "Error packet"); proto_tree_add_text(rohc_tree, tvb, offset, -1, "Error packet"); + pinfo->private_data = save_private_data; return; }else{ col_append_str(pinfo->cinfo, COL_INFO, "Feedback "); @@ -1052,6 +1054,7 @@ start_over: offset = offset + size; if(offset<length) goto start_over; + pinfo->private_data = save_private_data; return; } }/*feedback */ @@ -1065,6 +1068,7 @@ start_over: PROTO_ITEM_SET_GENERATED(item); } proto_tree_add_text(rohc_tree, tvb, offset, -1, "Segment [Desegmentation not implemented yet]"); + pinfo->private_data = save_private_data; return; } /* 6) Here, it is known that the rest is forward information (unless the @@ -1096,6 +1100,8 @@ start_over: }else if ((oct&0xe0)==0xc0){ col_set_str(pinfo->cinfo, COL_INFO, "Paket type 2"); } + + pinfo->private_data = save_private_data; } void |