Diff between d3b7b50e650c1a349d627bb4d365683b019fd974 and f4655cc3892fbe903b4a2a7f9a1d1e7681b38cd0

Changed Files

File Additions Deletions Status
tools/parser/l2cap.c +8 -8 modified
tools/parser/sdp.c +6 -6 modified

Full Patch

diff --git a/tools/parser/l2cap.c b/tools/parser/l2cap.c
index bcf0e2f..a35a6c3 100644
--- a/tools/parser/l2cap.c
+++ b/tools/parser/l2cap.c
@@ -397,17 +397,17 @@ static void l2cap_parse(int level, struct frame *frm)
 
 		switch (psm) {
 		case 0x01:
-			if (p_filter(FILT_SDP))
-				break;
-	
-			sdp_dump(level+1, frm);
+			if (!p_filter(FILT_SDP))
+				sdp_dump(level+1, frm);
+			else
+				raw_dump(level+1, frm);
 			break;
 
 		case 0x03:
-			if (p_filter(FILT_RFCOMM))
-				break;
-	
-			rfcomm_dump(level, frm);
+			if (!p_filter(FILT_RFCOMM))
+				rfcomm_dump(level, frm);
+			else
+				raw_dump(level+1, frm);
 			break;
 
 		default:
diff --git a/tools/parser/sdp.c b/tools/parser/sdp.c
index 037eb3e..0a7c6c5 100644
--- a/tools/parser/sdp.c
+++ b/tools/parser/sdp.c
@@ -337,13 +337,13 @@ static inline void print_srv_srch_pat(int level, struct frame *frm)
 			if (parse_de_hdr(frm,&n2) == SDP_DE_UUID) {
 				print_uuid(n2, frm);
 			} else {
-				printf("\nERROR: Unexpected syntax\n");
+				printf("\nERROR: Unexpected syntax (UUID)\n");
 				raw_dump(level, frm);
 			}
 		}
 		printf("\n");
 	} else {
-		printf("\nERROR: Unexpected syntax\n");
+		printf("\nERROR: Unexpected syntax (SEQ)\n");
 		raw_dump(level, frm);
 	}
 }
@@ -446,7 +446,7 @@ static inline void err_rsp(int level, __u16 tid, __u16 len, struct frame *frm)
 	printf("SDP Error Rsp: tid 0x%x len 0x%x\n", tid, len);
 
 	p_indent(++level, 0);
-   printf("ec 0x%x info ", get_u16(frm));
+	printf("ec 0x%x info ", get_u16(frm));
 	if (frm->len > 0) {
 		raw_dump(0, frm);
 	} else {
@@ -525,7 +525,7 @@ static inline void ssa_req(int level, __u16 tid, __u16 len, struct frame *frm)
 
 	/* Parse MaximumAttributeByteCount */
 	p_indent(level, 0);
-   printf("max 0x%x\n", get_u16(frm));
+	printf("max 0x%x\n", get_u16(frm));
 
 	/* Parse AttributeList */
 	print_attr_id_list(level, frm);
@@ -552,9 +552,9 @@ void sdp_dump(int level, struct frame *frm)
 	frm->ptr += SDP_PDU_HDR_SIZE;
 	frm->len -= SDP_PDU_HDR_SIZE;
 
-	p_indent(++level, frm->in);
+	p_indent(level, frm->in);
 
-	switch(hdr->pid) {
+	switch (hdr->pid) {
 	case SDP_ERROR_RSP:
 		err_rsp(level, tid, len, frm);
 		break;