CVS: 2 files have been modified in apps/bluetooth/sdp_server.

[Peter K. <pk...@us...>]

The following files were modified in apps/bluetooth/sdp_server:

Name            Old version     New version     Comment
----            -----------     -----------     -------
sdp_parser.c    1.12            1.13=20=20=20=20=20=20=20=20=20=20=20=20
sdp_parser.h    1.3             1.4=20=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Added definitions for the various SDP errors.


The diff of the modified file(s):

--- sdp_parser.c	2001/03/21 17:17:38	1.12
+++ sdp_parser.c	2001/03/23 16:06:18	1.13
@@ -176,7 +176,7 @@
   if (par_len > (len - SDP_HDR_SIZE - sizeof(data_struct)))
   {
     D_XMIT(FNC"Packetlength don't match recievd data length par_len%d, pkt=
_len %d\n", par_len, len);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
=20
@@ -187,17 +187,23 @@
   case SDP_ERROR_RSP:
     switch (CHAR2INT16(db_hdl->data[5], db_hdl->data[6]))
     {
-    case 0x0001: D_ERR(FNC"Got Invalid/unsupported SDP version\n");
+    case SDP_INVALID_SDP_VERSION:
+      D_ERR(FNC"Got Invalid/unsupported SDP version\n");
       break;
-    case 0x0002: D_ERR(FNC"Got Invalid Service Record Handle\n");
+    case SDP_INVALID_SERVICE_RECORD_HANDLE:
+      D_ERR(FNC"Got Invalid Service Record Handle\n");
       break;
-    case 0x0003: D_ERR(FNC"Got Invalid request syntax\n");
+    case SDP_INVALID_REQUEST_SYNTAX:
+      D_ERR(FNC"Got Invalid Request Syntax\n");
       break;
-    case 0x0004: D_ERR(FNC"Got Invalid PDU Size\n");
+    case SDP_INVALID_PDU_SIZE:
+      D_ERR(FNC"Got Invalid PDU Size\n");
       break;
-    case 0x0005: D_ERR(FNC"Got Invalid Continuation State\n");
+    case SDP_INVALID_CONTINUATION_STATE:
+      D_ERR(FNC"Got Invalid Continuation State\n");
       break;
-    case 0x0006: D_ERR(FNC"Got Insufficient Resources to satisfy Request\n=
");
+    case SDP_INSUFFICIENT_RESOURCES:
+      D_ERR(FNC"Got Insufficient Resources to satisfy Request\n");
       break;
     default:
       D_ERR(FNC" Error code 0x%04x is not specified\n",
@@ -241,9 +247,8 @@
=20=20=20=20=20
   default:
     D_REC(FNC"ERROR Invalid pdu type\n");
-    /* Send an error response with error code Invalid request
-       syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    /* Send an error response with error code Invalid request syntax */
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     break;
   }
 #undef FNC
@@ -268,7 +273,7 @@
   {
     D_REC(FNC"Incorrect packet: Data Element Sequence expected\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20
@@ -280,7 +285,7 @@
   {
     D_REC(FNC"Incorrect packet: Incorrect length field or whole packet was=
 not received\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20=09
@@ -293,7 +298,7 @@
       D_REC(FNC"More than 12 UUID in one request\n");
       /* Send an error msg with error code Invalid request
 	 syntax */
-      send_error_rsp(sdp_con_id, trans_id, 3);
+      send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
       break;
     }
=20=09=09
@@ -333,7 +338,7 @@
       D_REC(FNC"Unknown UUID size 0x%02x\n",data[cur_pos]);
       /* Send an error msg with error code Invalid request
 	 syntax */
-      send_error_rsp(sdp_con_id, trans_id, 3);
+      send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
       return;
     }
   }
@@ -350,13 +355,13 @@
   if (len < cur_pos)
   {
     D_ERR(__FUNCTION__", packet len shorter than actual packet lengthlen:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
   else if (len > cur_pos)
   {
     D_ERR(__FUNCTION__", packet len longer than actual packet length len:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
=20=20=20
@@ -429,7 +434,7 @@
   {
     D_REC(FNC"Incorrect packet: Data Element Sequence expected\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20
@@ -441,7 +446,7 @@
   {
     D_REC(FNC"Incorrect packet: Incorrect length field or whole packet was=
 not received\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20
@@ -485,13 +490,13 @@
   if (len < cur_pos)
   {
     D_ERR(__FUNCTION__", packet len shorter than actual packet lengthlen:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
   else if (len > cur_pos)
   {
     D_ERR(__FUNCTION__", packet len longer than actual packet length len:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
=20=20=20
@@ -551,7 +556,7 @@
   {
     D_REC(FNC"Incorrect packet: Data Element Sequence expected\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20
@@ -563,7 +568,7 @@
   {
     D_REC(FNC"Incorrect packet: Incorrect length field or whole packet was=
 not received\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20=20=20
@@ -609,7 +614,7 @@
     else
     {
       D_REC(FNC"Unknown UUID size 0x%02x\n",data[cur_pos]);
-      send_error_rsp(sdp_con_id, trans_id, 3);
+      send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
       return;
     }
   }
@@ -623,7 +628,7 @@
   {
     D_REC(FNC"Incorrect packet: Data Element Sequence expected\n");
     /* Send an error msg with error code Invalid request syntax */
-    send_error_rsp(sdp_con_id, trans_id, 3);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_REQUEST_SYNTAX);
     return;
   }
=20
@@ -674,13 +679,13 @@
   if (len < cur_pos)
   {
     D_ERR(__FUNCTION__", packet len shorter than actual packet lengthlen:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
   else if (len > cur_pos)
   {
     D_ERR(__FUNCTION__", packet len longer than actual packet length len:%=
d cur_pos:%d\n", len, cur_pos);
-    send_error_rsp(sdp_con_id, trans_id, 4);
+    send_error_rsp(sdp_con_id, trans_id, SDP_INVALID_PDU_SIZE);
     return;
   }
=20=20=20
--- sdp_parser.h	2001/03/04 15:46:08	1.3
+++ sdp_parser.h	2001/03/23 16:06:18	1.4
@@ -70,6 +70,13 @@
 				 ((unsigned int)((c1) & 0xff) << 8) + \
 				 (unsigned int)((c0) &0xff))
=20
+#define SDP_INVALID_SDP_VERSION           0x0001
+#define SDP_INVALID_SERVICE_RECORD_HANDLE 0x0002
+#define SDP_INVALID_REQUEST_SYNTAX        0x0003
+#define SDP_INVALID_PDU_SIZE              0x0004
+#define SDP_INVALID_CONTINUATION_STATE    0x0005
+#define SDP_INSUFFICIENT_RESOURCES        0x0006
+
 /****************** TYPE DEFINITION SECTION ******************************=
***/
=20
 typedef struct data_struct {