diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-02-12 19:59:41 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-02-12 19:59:41 +0000 |
| commit | a595f69ce4ed6114beefc5d9e753c11ff7be1918 (patch) | |
| tree | 8f369db2ef33d817abf53f91afd6e9ce962db7b1 /wiretap/hcidump.c | |
| parent | b83634d5a93cfda6f94ea2defe1940fd50f05c61 (diff) | |
The lack of _WITH_PHDR in WTAP_ENCAP_BLUETOOTH_H4 means there's no
pseudo-header, and hence there's no direction indication. Don't set
pinfo->p2p_dir for it. Use WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR, not
WTAP_ENCAP_BLUETOOTH_H4, for capture files where we have the direction.
Don't assume pinfo->p2p_dir is either P2P_DIR_SENT or P2P_DIR_RECV when
setting the info column in various Bluetooth dissectors; it might be
unknown.
In the HCI H4 dissector, put the direction into the info column
regardless of whether we have a type match or not; the dissectors for
HCI packet types appear to assume it's been set (as they put a blank at
the beginning of the stuff they append to the direction).
svn path=/trunk/; revision=35933
Diffstat (limited to 'wiretap/hcidump.c')
| -rw-r--r-- | wiretap/hcidump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/hcidump.c b/wiretap/hcidump.c index c67b206efd..b4ccf08565 100644 --- a/wiretap/hcidump.c +++ b/wiretap/hcidump.c @@ -150,7 +150,7 @@ int hcidump_open(wtap *wth, int *err, gchar **err_info _U_) return -1; wth->file_type = WTAP_FILE_HCIDUMP; - wth->file_encap = WTAP_ENCAP_BLUETOOTH_H4; + wth->file_encap = WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR; wth->snapshot_length = 0; wth->subtype_read = hcidump_read; |