diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-02-02 20:09:00 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-02-02 20:09:00 +0000 |
| commit | d86f7e48c498307f16a5e8d7c1f1c24f51b98938 (patch) | |
| tree | 384a67db393f4f8d523db08bd39f9f4c8414d585 /plugins/irda | |
| parent | 8f749c91ccd9b84f3be164655bd101b6603d5281 (diff) | |
From Jon Ringle:
1) Added a setup_frame parameter to conversation_t
2) Used the conversation_t next to maintain a list of conversations with the
same src/dest tuple but different setup_frame number.
3) Changed the signature of find_conversation() and conversation_new() to pass
in the frame number.
4) Adjusted packet-sdp to select RTP conversation if both m=audio and m=image
are present, and T.38 conversation if only m=image is present. I expect that
RTP/T.38 dissecting to be better, but I don't have a way to generate T.38
packets.
svn path=/trunk/; revision=13245
Diffstat (limited to 'plugins/irda')
| -rw-r--r-- | plugins/irda/packet-irda.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c index 34a41728fd..28545d72cf 100644 --- a/plugins/irda/packet-irda.c +++ b/plugins/irda/packet-irda.c @@ -565,7 +565,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r destaddr.len = 1; destaddr.data = (char*)&pinfo->circuit_id; - conv = find_conversation(&srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { iap_conv = (iap_conversation_t*)conversation_get_proto_data(conv, PT_NONE); @@ -587,7 +587,7 @@ static void dissect_iap_request(tvbuff_t* tvb, packet_info* pinfo, proto_tree* r } else { - conv = conversation_new(&srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = conversation_new(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); iap_conv = g_mem_chunk_alloc(iap_conv_chunk); conversation_add_proto_data(conv, PT_NONE, (void*)iap_conv); } @@ -726,7 +726,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro destaddr.data = (char*)&pinfo->circuit_id; /* Find result value dissector */ - conv = find_conversation(&srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { num = pinfo->fd->num; @@ -1015,7 +1015,7 @@ static void dissect_appl_proto(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro destaddr.data = (char*)&pinfo->circuit_id; /* Find result value dissector */ - conv = find_conversation(&srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); + conv = find_conversation(pinfo->fd->num, &srcaddr, &destaddr, PT_NONE, pinfo->srcport, pinfo->destport, 0); if (conv) { num = pinfo->fd->num; @@ -1255,7 +1255,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec destaddr.len = 1; destaddr.data = (char*)&dest; - conv = find_conversation(&destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); + conv = find_conversation(pinfo->fd->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); if (conv) { lmp_conv = (lmp_conversation_t*)conversation_get_proto_data(conv, PT_NONE); @@ -1276,7 +1276,7 @@ void add_lmp_conversation(packet_info* pinfo, guint8 dlsap, gboolean ttp, dissec } else { - conv = conversation_new(&destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); + conv = conversation_new(pinfo->fd->num, &destaddr, &srcaddr, PT_NONE, dlsap, 0, NO_PORT_B); lmp_conv = g_mem_chunk_alloc(lmp_conv_chunk); conversation_add_proto_data(conv, PT_NONE, (void*)lmp_conv); } |