Enable R7 FP for UDP-based variants.

Correct interpretation of hs-dsch outhdr flag.









svn path=/trunk/; revision=25384
This commit is contained in:
Martin Mathieson 2008-05-27 10:58:15 +00:00
parent c6dc7911df
commit 9fbeaf2d28
1 changed files with 7 additions and 3 deletions

View File

@ -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)
{