diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2008-06-04 17:33:48 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2008-06-04 17:33:48 +0000 |
| commit | acd6d3fb35234dfc5f905a6c4b6e25b571d24e3b (patch) | |
| tree | d134319eba21e6f0d1746d4f5674af54eaccb408 /epan/dissectors/packet-k12.c | |
| parent | 5d522be77d2d92795122e596ef29ef5d9128ff81 (diff) | |
- Make FP radio division mode/speed explicit in struct for R7
- Various R7 fixes
svn path=/trunk/; revision=25425
Diffstat (limited to 'epan/dissectors/packet-k12.c')
| -rw-r--r-- | epan/dissectors/packet-k12.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-k12.c b/epan/dissectors/packet-k12.c index 3eb23652ff..08ff1b5c02 100644 --- a/epan/dissectors/packet-k12.c +++ b/epan/dissectors/packet-k12.c @@ -98,6 +98,9 @@ fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length) if (!p_fp_info || length < 22) return; + /* Store division type */ + p_fp_info->division = radio_mode; + /* Format used by K15, later fields are shifted by 8 bytes. */ if (pntohs(extra_info+2) == 5) adj = 8; @@ -165,9 +168,12 @@ fill_fp_info(fp_info *p_fp_info, guchar *extra_info, guint32 length) if (info_type == 0x30) { /* data frame */ p_fp_info->num_chans = extra_info[23 + adj]; + /* For each channel */ for (i = 0; i < (guint)p_fp_info->num_chans && (36+i*104+adj) <= length; ++i) { + /* Read TB size */ p_fp_info->chan_tf_size[i] = pntohl(extra_info+28+i*104+adj); if (p_fp_info->chan_tf_size[i]) + /* Work out number of TBs on this channel */ p_fp_info->chan_num_tbs[i] = pntohl(extra_info+32+i*104+adj) / p_fp_info->chan_tf_size[i]; } |