diff options
| author | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-27 10:58:15 +0000 |
|---|---|---|
| committer | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2008-05-27 10:58:15 +0000 |
| commit | 759f010c8a24dda8874657909a3b0e94392ec047 (patch) | |
| tree | e5c1eb886f8ed94d723f9482a104a9dc47afbad8 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | b8d06febdc6cd435937e7f0c3a9cbc689fe5d473 (diff) | |
Enable R7 FP for UDP-based variants.
Correct interpretation of hs-dsch outhdr flag.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25384 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index 20b7020e86..0cdbc08bbd 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -582,6 +582,7 @@ dissector_handle_t look_for_dissector(char *protocol_name) (strcmp(protocol_name, "fp_r4") == 0) || (strcmp(protocol_name, "fp_r5") == 0) || (strcmp(protocol_name, "fp_r6") == 0) || + (strcmp(protocol_name, "fp_r7") == 0) || (strcmp(protocol_name, "fpiur_r5") == 0)) { return find_dissector("fp"); @@ -775,7 +776,10 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_ { if (p_fp_info->release == 7) { - p_fp_info->hsdsch_entity = outhdr_values[i++]; + if (outhdr_values[i++]) + { + p_fp_info->hsdsch_entity = ehs; + } } else { @@ -783,8 +787,8 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_ p_fp_info->hsdsch_entity = hs; } } - - + + /* IUR only uses the above... */ if (strcmp(protocol_name, "fpiur_r5") == 0) { |