osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Fix calling of LTE dissectors for R9 DCT protocols. 

svn path=/trunk/; revision=36196
This commit is contained in:
Martin Mathieson 2011-03-15 17:30:00 +00:00
parent 23400cd7a3
commit 2e7a9893c3
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
epan/dissectors/packet-catapult-dct2000.c
View File

@ -1940,17 +1940,20 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/**************************************************************************/
/* These protocols have no encapsulation type, just look them up directly */
if (strcmp(protocol_name, "mac_r8_lte") == 0) {
if ((strcmp(protocol_name, "mac_r8_lte") == 0) ||
(strcmp(protocol_name, "mac_r9_lte") == 0)) {
protocol_handle = mac_lte_handle;
}
else
if (strcmp(protocol_name, "rlc_r8_lte") == 0) {
if ((strcmp(protocol_name, "rlc_r8_lte") == 0) ||
(strcmp(protocol_name, "rlc_r9_lte") == 0)) {
protocol_handle = rlc_lte_handle;
}
else
if (strcmp(protocol_name, "pdcp_r8_lte") == 0) {
if ((strcmp(protocol_name, "pdcp_r8_lte") == 0) ||
(strcmp(protocol_name, "pdcp_r9_lte") == 0)) {
/* Dissect proprietary header, then pass remainder to PDCP */
dissect_pdcp_lte(tvb, offset, pinfo, tree);
return;
@ -2016,15 +2019,13 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
else
if (
((strcmp(protocol_name, "ccpri_r8_lte") == 0))) {
if (((strcmp(protocol_name, "ccpri_r8_lte") == 0))) {
/* Dissect proprietary header, then pass remainder to lapb */
dissect_ccpri_lte(tvb, offset, pinfo, tree);
return;
}
/* Many DCT2000 protocols have at least one IPPrim variant. If the
protocol name can be matched to a dissector, try to find the
UDP/TCP data inside and dissect it.
@ -2308,6 +2309,17 @@ dissect_catapult_dct2000(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
}
#if 0
/* PART OF WORK IN PROGRESS */
if (protocol_handle == 0) {
/* TODO: only look inside preference? */
char dotted_protocol_name[64+128];
sprintf(dotted_protocol_name, "dct2000.%s", protocol_name);
protocol_handle = find_dissector(dotted_protocol_name);
}
#endif
break;
default: