diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-07-02 20:10:05 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-07-02 20:10:05 +0000 |
| commit | 9de2d18463872d41530860254c2e21826c23cda7 (patch) | |
| tree | f98ec07cf4fdc2790e8cbdc384cb42d12dd3f898 /wiretap/btsnoop.c | |
| parent | be7b89aa49637a74811c688b437be4ab3be688bc (diff) | |
Don't dump out the raw link-layer type when noting that
KHciLoggerDatalinkTypeBCSP and KHciLoggerDatalinkTypeH5 aren't supported
- just explicitly say "BSCP" or "H5".
For unknown link-layer types, say "unknown or unsupported", as other
Wiretap modules do.
svn path=/trunk/; revision=28925
Diffstat (limited to 'wiretap/btsnoop.c')
| -rw-r--r-- | wiretap/btsnoop.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c index 1463c28076..f1efe8ab1d 100644 --- a/wiretap/btsnoop.c +++ b/wiretap/btsnoop.c @@ -130,16 +130,19 @@ int btsnoop_open(wtap *wth, int *err, gchar **err_info _U_) file_encap=WTAP_ENCAP_BLUETOOTH_HCI; break; case KHciLoggerDatalinkTypeBCSP: + *err = WTAP_ERR_UNSUPPORTED; + *err_info = g_strdup_printf("btsnoop: BCSP capture logs unsupported"); + return -1; case KHciLoggerDatalinkTypeH5: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: BCSP/H5 capture logs %u unsupported", hdr.datalink); + *err_info = g_strdup_printf("btsnoop: H5 capture logs unsupported"); return -1; case KHciLoggerDatalinkTypeH4: file_encap=WTAP_ENCAP_BLUETOOTH_H4; break; default: *err = WTAP_ERR_UNSUPPORTED; - *err_info = g_strdup_printf("btsnoop: datalink %u unsupported", hdr.datalink); + *err_info = g_strdup_printf("btsnoop: datalink type %u unknown or unsupported", hdr.datalink); return -1; } |