Cleanup & minor bug fixes:
- Don't put a value_string array in a .h file (included in several .c files);
- 'if ((a!=NULL) && !b) {fail}' should be 'if ((a==NULL) || !b) {fail}' in a few cases;
- Use value_string_ext as appropriate;
- Use val_to_str_const() in place of val_to_str() as appropriate;
- Use tvb_new_subset_remaining(...) instead of tvb_new_subset(..., -1, -1);
- Use tvb_reported_length_remaining() in place of tvb_length_remaining() in some cases;
- tvb_reported_length_remaining() can return -1;
- Use of TFS(&true_false) not req'd since "True"/"False" is the default if no TFS provided;
- Reformat various (long lines, etc);
- Use consistent indentation.
svn path=/trunk/; revision=41502
This commit is contained in:
Bill Meier
parent
3394b453af
commit
ba2cda4ef0
File diff suppressed because it is too large
Load Diff
|
|
@ -24,31 +24,31 @@
|
|||
#ifndef __PACKET_BTL2CAP_H__
|
||||
#define __PACKET_BTL2CAP_H__
|
||||
|
||||
#define BTL2CAP_PSM_SDP 0x0001
|
||||
#define BTL2CAP_PSM_RFCOMM 0x0003
|
||||
#define BTL2CAP_PSM_BNEP 0x000f
|
||||
#define BTL2CAP_PSM_HID_CTRL 0x0011
|
||||
#define BTL2CAP_PSM_HID_INTR 0x0013
|
||||
#define BTL2CAP_PSM_AVCTP_CTRL 0x0017
|
||||
#define BTL2CAP_PSM_AVDTP 0x0019
|
||||
#define BTL2CAP_PSM_AVCTP_BRWS 0x001b
|
||||
#define BTL2CAP_PSM_SDP 0x0001
|
||||
#define BTL2CAP_PSM_RFCOMM 0x0003
|
||||
#define BTL2CAP_PSM_BNEP 0x000f
|
||||
#define BTL2CAP_PSM_HID_CTRL 0x0011
|
||||
#define BTL2CAP_PSM_HID_INTR 0x0013
|
||||
#define BTL2CAP_PSM_AVCTP_CTRL 0x0017
|
||||
#define BTL2CAP_PSM_AVDTP 0x0019
|
||||
#define BTL2CAP_PSM_AVCTP_BRWS 0x001b
|
||||
|
||||
#define BTL2CAP_DYNAMIC_PSM_START 0x1000
|
||||
|
||||
#define BTL2CAP_FIXED_CID_NULL 0x0000
|
||||
#define BTL2CAP_FIXED_CID_SIGNAL 0x0001
|
||||
#define BTL2CAP_FIXED_CID_CONNLESS 0x0002
|
||||
#define BTL2CAP_FIXED_CID_AMP_MAN 0x0003
|
||||
#define BTL2CAP_FIXED_CID_AMP_TEST 0x003F
|
||||
#define BTL2CAP_FIXED_CID_MAX 0x0040
|
||||
#define BTL2CAP_FIXED_CID_NULL 0x0000
|
||||
#define BTL2CAP_FIXED_CID_SIGNAL 0x0001
|
||||
#define BTL2CAP_FIXED_CID_CONNLESS 0x0002
|
||||
#define BTL2CAP_FIXED_CID_AMP_MAN 0x0003
|
||||
#define BTL2CAP_FIXED_CID_AMP_TEST 0x003F
|
||||
#define BTL2CAP_FIXED_CID_MAX 0x0040
|
||||
|
||||
/* This structure is passed to higher layer protocols through
|
||||
* pinfo->private_data so that they can track "conversations" based on
|
||||
* chandle, cid and direction
|
||||
*/
|
||||
typedef struct _btl2cap_data_t {
|
||||
guint16 chandle; /* only low 12 bits used */
|
||||
guint16 cid;
|
||||
guint16 chandle; /* only low 12 bits used */
|
||||
guint16 cid;
|
||||
} btl2cap_data_t;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -29,9 +29,9 @@
|
|||
* chandle, cid, dlci and direction
|
||||
*/
|
||||
typedef struct _btrfcomm_data_t {
|
||||
guint16 chandle; /* only low 12 bits used */
|
||||
guint16 cid;
|
||||
guint8 dlci;
|
||||
guint16 chandle; /* only low 12 bits used */
|
||||
guint16 cid;
|
||||
guint8 dlci;
|
||||
} btrfcomm_data_t;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -75,104 +75,6 @@ typedef struct _btsdp_data_t {
|
|||
(peer device) and/or a secondary PSM */
|
||||
} btsdp_data_t;
|
||||
|
||||
/* service UUIDs */
|
||||
static const value_string vs_service_classes[] = {
|
||||
{0x0001, "SDP"},
|
||||
{0x0002, "UDP"},
|
||||
{0x0003, "RFCOMM"},
|
||||
{0x0004, "TCP"},
|
||||
{0x0005, "TCS-BIN"},
|
||||
{0x0006, "TCS-AT"},
|
||||
{0x0008, "OBEX"},
|
||||
{0x0009, "IP"},
|
||||
{0x000A, "FTP"},
|
||||
{0x000C, "HTTP"},
|
||||
{0x000E, "WSP"},
|
||||
{0x000F, "BNEP"},
|
||||
{0x0010, "UPNP"},
|
||||
{0x0011, "HIDP"},
|
||||
{0x0012, "Hardcopy Control Channel"},
|
||||
{0x0014, "Hardcopy Data Channel"},
|
||||
{0x0016, "Hardcopy Notification"},
|
||||
{0x0017, "AVCTP"},
|
||||
{0x0019, "AVDTP"},
|
||||
{0x001B, "CMPT"},
|
||||
{0x001D, "UDI C-Plane"},
|
||||
{0x001E, "MCAP Control Channel"},
|
||||
{0x001F, "MCAP Data Channel"},
|
||||
{0x0100, "L2CAP"},
|
||||
{0x1000, "Service Discovery Server Service Class ID"},
|
||||
{0x1001, "Browse Group Descriptor Service Class ID"},
|
||||
{0x1002, "Public Browse Group"},
|
||||
{0x1101, "Serial Port"},
|
||||
{0x1102, "LAN Access Using PPP"},
|
||||
{0x1103, "Dialup Networking"},
|
||||
{0x1104, "IrMC Sync"},
|
||||
{0x1105, "OBEX Object Push"},
|
||||
{0x1106, "OBEX File Transfer"},
|
||||
{0x1107, "IrMC Sync Command"},
|
||||
{0x1108, "Headset"},
|
||||
{0x1109, "Cordless Telephony"},
|
||||
{0x110A, "Audio Source"},
|
||||
{0x110B, "Audio Sink"},
|
||||
{0x110C, "A/V Remote Control Target"},
|
||||
{0x110D, "Advanced Audio Distribution"},
|
||||
{0x110E, "A/V Remote Control"},
|
||||
{0x110F, "Video Conferencing"},
|
||||
{0x1110, "Intercom"},
|
||||
{0x1111, "Fax"},
|
||||
{0x1112, "Headset Audio Gateway"},
|
||||
{0x1113, "WAP"},
|
||||
{0x1114, "WAP client"},
|
||||
{0x1115, "PANU"},
|
||||
{0x1116, "NAP"},
|
||||
{0x1117, "GN"},
|
||||
{0x1118, "Direct Printing"},
|
||||
{0x1119, "Reference Printing"},
|
||||
{0x111A, "Imaging"},
|
||||
{0x111B, "Imaging Responder"},
|
||||
{0x111C, "Imaging Automatic Archive"},
|
||||
{0x111D, "Imaging Referenced Objects"},
|
||||
{0x111E, "Handsfree"},
|
||||
{0x111F, "Handsfree Audio Gateway"},
|
||||
{0x1120, "Direct Printing Reference Objects Service"},
|
||||
{0x1121, "Reflected UI"},
|
||||
{0x1122, "Basic Printing"},
|
||||
{0x1123, "Printing Status"},
|
||||
{0x1124, "Human Interface Device Service"},
|
||||
{0x1125, "Hardcopy Cable Replacement"},
|
||||
{0x1126, "HCR Print"},
|
||||
{0x1127, "HCR Scan"},
|
||||
{0x1128, "Common ISDN Access"},
|
||||
{0x1129, "Video Conferencing GW"},
|
||||
{0x112A, "UDI MT"},
|
||||
{0x112B, "UDI TA"},
|
||||
{0x112C, "Audio/Video"},
|
||||
{0x112D, "SIM Access"},
|
||||
{0x112E, "Phonebook Access client"},
|
||||
{0x112F, "Phonebook Access server"},
|
||||
{0x1130, "Phonebook Access Profile"},
|
||||
{0x1131, "Headset - HS"},
|
||||
{0x1132, "Message Access Server"},
|
||||
{0x1133, "Message Notification Server"},
|
||||
{0x1134, "Message Access Profile"},
|
||||
{0x1200, "PnP Information"},
|
||||
{0x1201, "Generic Networking"},
|
||||
{0x1202, "Generic File Transfer"},
|
||||
{0x1203, "Generic Audio"},
|
||||
{0x1204, "Generic Telephony"},
|
||||
{0x1205, "UPNP_Service"},
|
||||
{0x1206, "UPNP_IP_Service"},
|
||||
{0x1300, "ESDP_UPNP_IP_PAN"},
|
||||
{0x1301, "ESDP_UPNP_IP_LAP"},
|
||||
{0x1302, "ESDP_UPNP_L2CAP"},
|
||||
{0x1303, "Video Source"},
|
||||
{0x1304, "Video Sink"},
|
||||
{0x1305, "Video Distribution"},
|
||||
{0x1400, "Health Device Profile"},
|
||||
{0x1401, "Health Device Source"},
|
||||
{0x1402, "Health Device Sink"},
|
||||
{0, NULL}
|
||||
};
|
||||
extern value_string_ext vs_service_classes_ext;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue