forked from osmocom/wireshark
Make it possible to match transaction Id:s for Conversation where
both Originatingand Responding TID is present. svn path=/trunk/; revision=31156
This commit is contained in:
parent
f476f80198
commit
a7255dd3ba
|
@ -124,9 +124,21 @@ guint8 len;
|
||||||
%(DEFAULT_BODY)s
|
%(DEFAULT_BODY)s
|
||||||
|
|
||||||
if(next_tvb) {
|
if(next_tvb) {
|
||||||
if(tvb_length(next_tvb) !=0)
|
|
||||||
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,tvb_length(next_tvb));
|
|
||||||
len = tvb_length_remaining(next_tvb, 0);
|
len = tvb_length_remaining(next_tvb, 0);
|
||||||
|
if(len !=0){
|
||||||
|
/* 0 octets for the Unidirectional,
|
||||||
|
* 4 octets for Query, Response & Abort
|
||||||
|
* 8 octets for Conversation in the order Originating then Responding TID
|
||||||
|
*
|
||||||
|
* In order to match this it seems like we should only use the last 4 octets
|
||||||
|
* in the 8 octets case.
|
||||||
|
*/
|
||||||
|
if (len > 4){
|
||||||
|
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 4,len-4);
|
||||||
|
}else{
|
||||||
|
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,len);
|
||||||
|
}
|
||||||
|
}
|
||||||
switch(len) {
|
switch(len) {
|
||||||
case 1:
|
case 1:
|
||||||
gp_tcapsrt_info->src_tid=tvb_get_guint8(next_tvb, 0);
|
gp_tcapsrt_info->src_tid=tvb_get_guint8(next_tvb, 0);
|
||||||
|
|
|
@ -502,9 +502,21 @@ guint8 len;
|
||||||
|
|
||||||
|
|
||||||
if(next_tvb) {
|
if(next_tvb) {
|
||||||
if(tvb_length(next_tvb) !=0)
|
|
||||||
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,tvb_length(next_tvb));
|
|
||||||
len = tvb_length_remaining(next_tvb, 0);
|
len = tvb_length_remaining(next_tvb, 0);
|
||||||
|
if(len !=0){
|
||||||
|
/* 0 octets for the Unidirectional,
|
||||||
|
* 4 octets for Query, Response & Abort
|
||||||
|
* 8 octets for Conversation in the order Originating then Responding TID
|
||||||
|
*
|
||||||
|
* In order to match this it seems like we should only use the last 4 octets
|
||||||
|
* in the 8 octets case.
|
||||||
|
*/
|
||||||
|
if (len > 4){
|
||||||
|
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 4,len-4);
|
||||||
|
}else{
|
||||||
|
ansi_tcap_private.TransactionID_str = tvb_bytes_to_str(next_tvb, 0,len);
|
||||||
|
}
|
||||||
|
}
|
||||||
switch(len) {
|
switch(len) {
|
||||||
case 1:
|
case 1:
|
||||||
gp_tcapsrt_info->src_tid=tvb_get_guint8(next_tvb, 0);
|
gp_tcapsrt_info->src_tid=tvb_get_guint8(next_tvb, 0);
|
||||||
|
|
Loading…
Reference in New Issue