Diff between 64079baf3c7ea77ba4151ecd3d9a0fe541c96fa7 and 72e9f247eb2ec452568f89076699ae8f6c0c078f

Changed Files

File Additions Deletions Status
tools/parser/sdp.c +24 -4 modified
tools/parser/sdp.h +21 -0 modified

Full Patch

diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c
index 0a1258e..3f0d120 100644
--- a/tools/parser/sdp.c
+++ b/tools/parser/sdp.c
@@ -102,8 +102,10 @@ static sdp_uuid_nam_lookup_table_t sdp_uuid_nam_lookup_table[] = {
 	{ SDP_UUID_L2CAP,                    "L2CAP"        },
 	{ SDP_UUID_BNEP,                     "BNEP"         }, /* PAN */
 	{ SDP_UUID_HIDP,                     "HIDP"         }, /* HID */
+	{ SDP_UUID_AVCTP,                    "AVCTP"        }, /* AVCTP */
 	{ SDP_UUID_AVDTP,                    "AVDTP"        }, /* AVDTP */
 	{ SDP_UUID_CMTP,                     "CMTP"         }, /* CIP */
+	{ SDP_UUID_UDI_C_PLANE,              "UDI_C-Plane"  }, /* UDI */
 	{ SDP_UUID_SERVICE_DISCOVERY_SERVER, "SDServer"     },
 	{ SDP_UUID_BROWSE_GROUP_DESCRIPTOR,  "BrwsGrpDesc"  },
 	{ SDP_UUID_PUBLIC_BROWSE_GROUP,      "PubBrwsGrp"   },
@@ -118,7 +120,10 @@ static sdp_uuid_nam_lookup_table_t sdp_uuid_nam_lookup_table[] = {
 	{ SDP_UUID_CORDLESS_TELEPHONY,       "CordlessTel"  },
 	{ SDP_UUID_AUDIO_SOURCE,             "AudioSource"  }, /* A2DP */
 	{ SDP_UUID_AUDIO_SINK,               "AudioSink"    }, /* A2DP */
+	{ SDP_UUID_AV_REMOTE_TARGET,         "AVRemTarget"  }, /* AVRCP */
 	{ SDP_UUID_ADVANCED_AUDIO,           "AdvAudio"     }, /* A2DP */
+	{ SDP_UUID_AV_REMOTE,                "AVRemote"     }, /* AVRCP */
+	{ SDP_UUID_VIDEO_CONFERENCING,       "VideoConf"    }, /* VCP */
 	{ SDP_UUID_INTERCOM,                 "Intercom"     },
 	{ SDP_UUID_FAX,                      "Fax"          },
 	{ SDP_UUID_HEADSET_AUDIO_GATEWAY,    "Headset AG"   },
@@ -127,15 +132,25 @@ static sdp_uuid_nam_lookup_table_t sdp_uuid_nam_lookup_table[] = {
 	{ SDP_UUID_PANU,                     "PANU"         }, /* PAN */
 	{ SDP_UUID_NAP,                      "NAP"          }, /* PAN */
 	{ SDP_UUID_GN,                       "GN"           }, /* PAN */
+	{ SDP_UUID_DIRECT_PRINTING,          "DirectPrint"  }, /* BPP */
+	{ SDP_UUID_REFERENCE_PRINTING,       "RefPrint"     }, /* BPP */
 	{ SDP_UUID_IMAGING,                  "Imaging"      }, /* BIP */
 	{ SDP_UUID_IMAGING_RESPONDER,        "ImagingResp"  }, /* BIP */
 	{ SDP_UUID_HANDSFREE,                "Handsfree"    },
 	{ SDP_UUID_HANDSFREE_AUDIO_GATEWAY,  "Handsfree AG" },
+	{ SDP_UUID_DIRECT_PRINTING_REF_OBJS, "RefObjsPrint" }, /* BPP */
+	{ SDP_UUID_REFLECTED_UI,             "ReflectedUI"  }, /* BPP */
+	{ SDP_UUID_BASIC_PRINTING,           "BasicPrint"   }, /* BPP */
+	{ SDP_UUID_PRINTING_STATUS,          "PrintStatus"  }, /* BPP */
 	{ SDP_UUID_HUMAN_INTERFACE_DEVICE,   "HID"          }, /* HID */
-	{ SDP_UUID_HARDCOPY_CABLE_REPLACE,   "HCRP",        }, /* HCRP */
-	{ SDP_UUID_HCR_PRINT,                "HCRPrint",    }, /* HCRP */
-	{ SDP_UUID_HCR_SCAN,                 "HCRScan",     }, /* HCRP */
+	{ SDP_UUID_HARDCOPY_CABLE_REPLACE,   "HCRP"         }, /* HCRP */
+	{ SDP_UUID_HCR_PRINT,                "HCRPrint"     }, /* HCRP */
+	{ SDP_UUID_HCR_SCAN,                 "HCRScan"      }, /* HCRP */
 	{ SDP_UUID_COMMON_ISDN_ACCESS,       "CIP"          }, /* CIP */
+	{ SDP_UUID_VIDEO_CONFERENCING_GW,    "VideoConf GW" }, /* VCP */
+	{ SDP_UUID_UDI_MT,                   "UDI MT"       }, /* UDI */
+	{ SDP_UUID_UDI_TA,                   "UDI TA"       }, /* UDI */
+	{ SDP_UUID_AUDIO_VIDEO,              "AudioVideo"   }, /* VCP */
 	{ SDP_UUID_SIM_ACCESS,               "SAP"          }, /* SAP */
 	{ SDP_UUID_PHONEBOOK_ACCESS_PCE,     "PBAP PCE"     }, /* PBAP */
 	{ SDP_UUID_PHONEBOOK_ACCESS_PSE,     "PBAP PSE"     }, /* PBAP */
@@ -144,6 +159,11 @@ static sdp_uuid_nam_lookup_table_t sdp_uuid_nam_lookup_table[] = {
 	{ SDP_UUID_GENERIC_FILE_TRANSFER,    "FileTrnsf"    },
 	{ SDP_UUID_GENERIC_AUDIO,            "Audio"        },
 	{ SDP_UUID_GENERIC_TELEPHONY,        "Telephony"    },
+	{ SDP_UUID_UPNP_SERVICE,             "UPNP"         }, /* ESDP */
+	{ SDP_UUID_UPNP_IP_SERVICE,          "UPNP IP"      }, /* ESDP */
+	{ SDP_UUID_ESDP_UPNP_IP_PAN,         "UPNP PAN"     }, /* ESDP */
+	{ SDP_UUID_ESDP_UPNP_IP_LAP,         "UPNP LAP"     }, /* ESDP */
+	{ SDP_UUID_ESDP_UPNP_L2CAP,          "UPNP L2CAP"   }, /* ESDP */
 	{ SDP_UUID_VIDEO_SOURCE,             "VideoSource"  }, /* VDP */
 	{ SDP_UUID_VIDEO_SINK,               "VideoSink"    }, /* VDP */
 	{ SDP_UUID_VIDEO_DISTRIBUTION,       "VideoDist"    }, /* VDP */
@@ -416,7 +436,7 @@ static inline void print_srv_srch_pat(int level, struct frame *frm)
 	if (parse_de_hdr(frm, &n1) == SDP_DE_SEQ) {
 		len = frm->len;
 		while (len - frm->len < n1 && frm->len > 0) {
-			if (parse_de_hdr(frm,&n2) == SDP_DE_UUID) {
+			if (parse_de_hdr(frm, &n2) == SDP_DE_UUID) {
 				print_uuid(n2, frm, NULL, NULL);
 			} else {
 				printf("\nERROR: Unexpected syntax (UUID)\n");
diff --git a/tools/parser/sdp.h b/tools/parser/sdp.h
index ea605c1..0a1635f 100644
--- a/tools/parser/sdp.h
+++ b/tools/parser/sdp.h
@@ -42,8 +42,10 @@
 #define SDP_UUID_HARDCOPY_CONTROL_CHANNEL              0x0012 /* HCRP */
 #define SDP_UUID_HARDCOPY_DATA_CHANNEL                 0x0014 /* HCRP */
 #define SDP_UUID_HARDCOPY_NOTIFICATION                 0x0016 /* HCRP */
+#define SDP_UUID_AVCTP                                 0x0017 /* AVCTP */
 #define SDP_UUID_AVDTP                                 0x0019 /* AVDTP */
 #define SDP_UUID_CMTP                                  0x001B /* CIP */
+#define SDP_UUID_UDI_C_PLANE                           0x001D /* UDI */
 #define SDP_UUID_L2CAP                                 0x0100
 
 /* Bluetooth assigned UUIDs for Service Classes */
@@ -61,7 +63,10 @@
 #define SDP_UUID_CORDLESS_TELEPHONY                    0x1109
 #define SDP_UUID_AUDIO_SOURCE                          0x110a /* A2DP */
 #define SDP_UUID_AUDIO_SINK                            0x110b /* A2DP */
+#define SDP_UUID_AV_REMOTE_TARGET                      0x110c /* AVRCP */
 #define SDP_UUID_ADVANCED_AUDIO                        0x110d /* A2DP */
+#define SDP_UUID_AV_REMOTE                             0x110e /* AVRCP */
+#define SDP_UUID_VIDEO_CONFERENCING                    0x110f /* VCP */
 #define SDP_UUID_INTERCOM                              0x1110
 #define SDP_UUID_FAX                                   0x1111
 #define SDP_UUID_HEADSET_AUDIO_GATEWAY                 0x1112
@@ -70,17 +75,28 @@
 #define SDP_UUID_PANU                                  0x1115 /* PAN */
 #define SDP_UUID_NAP                                   0x1116 /* PAN */
 #define SDP_UUID_GN                                    0x1117 /* PAN */
+#define SDP_UUID_DIRECT_PRINTING                       0x1118 /* BPP */
+#define SDP_UUID_REFERENCE_PRINTING                    0x1119 /* BPP */
 #define SDP_UUID_IMAGING                               0x111a /* BIP */
 #define SDP_UUID_IMAGING_RESPONDER                     0x111b /* BIP */
 #define SDP_UUID_IMAGING_AUTOMATIC_ARCHIVE             0x111c /* BIP */
 #define SDP_UUID_IMAGING_REFERENCED_OBJECTS            0x111d /* BIP */
 #define SDP_UUID_HANDSFREE                             0x111e
 #define SDP_UUID_HANDSFREE_AUDIO_GATEWAY               0x111f
+#define SDP_UUID_DIRECT_PRINTING_REF_OBJS              0x1120 /* BPP */
+#define SDP_UUID_DIRECT_PRINTING_REFERENCE_OBJECTS     0x1120 /* BPP */
+#define SDP_UUID_REFLECTED_UI                          0x1121 /* BPP */
+#define SDP_UUID_BASIC_PRINTING                        0x1122 /* BPP */
+#define SDP_UUID_PRINTING_STATUS                       0x1123 /* BPP */
 #define SDP_UUID_HUMAN_INTERFACE_DEVICE                0x1124 /* HID */
 #define SDP_UUID_HARDCOPY_CABLE_REPLACE                0x1125 /* HCRP */
 #define SDP_UUID_HCR_PRINT                             0x1126 /* HCRP */
 #define SDP_UUID_HCR_SCAN                              0x1127 /* HCRP */
 #define SDP_UUID_COMMON_ISDN_ACCESS                    0x1128 /* CIP */
+#define SDP_UUID_VIDEO_CONFERENCING_GW                 0x1129 /* VCP */
+#define SDP_UUID_UDI_MT                                0x112a /* UDI */
+#define SDP_UUID_UDI_TA                                0x112b /* UDI */
+#define SDP_UUID_AUDIO_VIDEO                           0x112c /* VCP */
 #define SDP_UUID_SIM_ACCESS                            0x112d /* SAP */
 #define SDP_UUID_PHONEBOOK_ACCESS_PCE                  0x112e /* PBAP */
 #define SDP_UUID_PHONEBOOK_ACCESS_PSE                  0x112f /* PBAP */
@@ -89,6 +105,11 @@
 #define SDP_UUID_GENERIC_FILE_TRANSFER                 0x1202
 #define SDP_UUID_GENERIC_AUDIO                         0x1203
 #define SDP_UUID_GENERIC_TELEPHONY                     0x1204
+#define SDP_UUID_UPNP_SERVICE                          0x1205 /* ESDP */
+#define SDP_UUID_UPNP_IP_SERVICE                       0x1206 /* ESDP */
+#define SDP_UUID_ESDP_UPNP_IP_PAN                      0x1300 /* ESDP */
+#define SDP_UUID_ESDP_UPNP_IP_LAP                      0x1301 /* ESDP */
+#define SDP_UUID_ESDP_UPNP_L2CAP                       0x1302 /* ESDP */
 #define SDP_UUID_VIDEO_SOURCE                          0x1303 /* VDP */
 #define SDP_UUID_VIDEO_SINK                            0x1304 /* VDP */
 #define SDP_UUID_VIDEO_DISTRIBUTION                    0x1305 /* VDP */