SDP client: conditional use of ServiceSearch and AttributeSearch queries

src/sdp_client.c

@@ -55,15 +55,17 @@ typedef enum {
 
 void sdp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
 
-static uint16_t setup_ServiceSearchRequest(uint8_t * data);
+static uint16_t setup_service_search_attribute_request(uint8_t * data);
-static uint16_t setup_ServiceAttributeRequest(uint8_t * data);
-static uint16_t setup_ServiceSearchAttributeRequest(uint8_t * data);
 
+#ifdef HAVE_SDP_EXTRA_QUERIES
+static uint16_t setup_service_search_request(uint8_t * data);
+static uint16_t setup_service_attribute_request(uint8_t * data);
+static uint32_t serviceRecordHandle;
+#endif
 
 // SDP Client Query
 static uint16_t  mtu;
 static uint16_t  sdp_cid = 0x40;
-static uint32_t serviceRecordHandle;
 static uint8_t * serviceSearchPattern;
 static uint8_t * attributeIDList;
 static uint16_t  transactionID = 0;
@@ -73,6 +75,8 @@ static uint8_t   continuationStateLen;
 static sdp_client_state_t sdp_client_state;
 static SDP_PDU_ID_t PDU_ID = SDP_Invalid;
 
+
+
 void sdp_client_handle_done(uint8_t status){
     if (status == 0){
         l2cap_disconnect_internal(sdp_cid, 0);
@@ -80,24 +84,11 @@ void sdp_client_handle_done(uint8_t status){
     sdp_parser_handle_done(status);
 }
 
-void parse_service_record_handle_list(uint8_t* packet, uint16_t total_count, uint16_t current_count){
-    sdp_parser_handle_service_search(packet, total_count, current_count);
-}
-
 // TODO: inline if not needed (des(des))
 void parse_attribute_lists(uint8_t* packet, uint16_t length){
     sdp_parser_handle_chunk(packet, length);
 }
 
-
-void hexdump2(void *data, int size){
-    int i;
-    for (i=0; i<size;i++){
-        printf("%02X ", ((uint8_t *)data)[i]);
-    }
-    printf("\n");
-}
-
 /* Queries the SDP service of the remote device given a service search pattern 
 and a list of attribute IDs. The remote data is handled by the SDP parser. The 
 SDP parser delivers attribute values and done event via a registered callback. */
@@ -112,28 +103,8 @@ void sdp_client_query(bd_addr_t remote, uint8_t * des_serviceSearchPattern, uint
     l2cap_create_channel_internal(NULL, sdp_packet_handler, remote, PSM_SDP, l2cap_max_mtu());
 }
 
-void sdp_client_service_attribute_search(bd_addr_t remote, uint32_t search_serviceRecordHandle, uint8_t * des_attributeIDList){
-    serviceRecordHandle = search_serviceRecordHandle;
-    attributeIDList = des_attributeIDList;
-    continuationStateLen = 0;
-    PDU_ID = SDP_ServiceAttributeResponse;
-
-    sdp_client_state = W4_CONNECT;
-    l2cap_create_channel_internal(NULL, sdp_packet_handler, remote, PSM_SDP, l2cap_max_mtu());
-}
-
-void sdp_client_service_search(bd_addr_t remote, uint8_t * des_serviceSearchPattern){
-    serviceSearchPattern = des_serviceSearchPattern;
-    continuationStateLen = 0;
-    PDU_ID = SDP_ServiceSearchResponse;
-
-    sdp_client_state = W4_CONNECT;
-    l2cap_create_channel_internal(NULL, sdp_packet_handler, remote, PSM_SDP, l2cap_max_mtu());
-}
-
 
 static void try_to_send(uint16_t channel){
-
     if (sdp_client_state != W2_SEND) return;
 
     if (!l2cap_can_send_packet_now(channel)) return;
@@ -142,22 +113,22 @@ static void try_to_send(uint16_t channel){
     uint16_t request_len = 0;
 
     switch (PDU_ID){
+#ifdef HAVE_SDP_EXTRA_QUERIES
         case SDP_ServiceSearchResponse:
-            request_len = setup_ServiceSearchRequest(data);
+            request_len = setup_service_search_request(data);
             break;
         case SDP_ServiceAttributeResponse:
-            request_len = setup_ServiceAttributeRequest(data);
+            request_len = setup_service_attribute_request(data);
             break;
+#endif
         case SDP_ServiceSearchAttributeResponse:
-            request_len = setup_ServiceSearchAttributeRequest(data);
+            request_len = setup_service_search_attribute_request(data);
             break;
         default:
             log_info("SDP Client try_to_send :: PDU ID invalid. %u", PDU_ID);
             return;
     }
 
-    // printf("try_to_send channel %x, size %u\n", channel, request_len);
-
     int err = l2cap_send_prepared(channel, request_len);
     switch (err){
         case 0:
@@ -175,6 +146,246 @@ static void try_to_send(uint16_t channel){
     }
 }
 
+
+static void parse_service_search_attribute_response(uint8_t* packet){
+    uint16_t offset = 3;
+    uint16_t parameterLength = READ_NET_16(packet,offset);
+    offset+=2;
+    // AttributeListByteCount <= mtu
+    uint16_t attributeListByteCount = READ_NET_16(packet,offset);
+    offset+=2;
+
+    if (attributeListByteCount > mtu){
+        log_error("Error parsing ServiceSearchAttributeResponse: Number of bytes in found attribute list is larger then the MaximumAttributeByteCount.\n");
+        return;
+    }
+
+    // AttributeLists
+    parse_attribute_lists(packet+offset, attributeListByteCount);
+    offset+=attributeListByteCount;
+
+    continuationStateLen = packet[offset];
+    offset++;
+
+    if (continuationStateLen > 16){
+        log_error("Error parsing ServiceSearchAttributeResponse: Number of bytes in continuation state exceedes 16.\n");
+        return;
+    }
+    memcpy(continuationState, packet+offset, continuationStateLen);
+    offset+=continuationStateLen;
+
+    if (parameterLength != offset - 5){
+        log_error("Error parsing ServiceSearchAttributeResponse: wrong size of parameters, number of expected bytes%u, actual number %u.\n", parameterLength, offset);
+    }
+}
+
+void sdp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
+    uint16_t handle;
+
+    if (packet_type == L2CAP_DATA_PACKET){
+
+        uint16_t responseTransactionID = READ_NET_16(packet,1);
+        if ( responseTransactionID != transactionID){
+            log_error("Missmatching transaction ID, expected %u, found %u.\n", transactionID, responseTransactionID);
+            return;
+        } 
+        
+        if (packet[0] != SDP_ServiceSearchAttributeResponse 
+            && packet[0] != SDP_ServiceSearchResponse
+            && packet[0] != SDP_ServiceAttributeResponse){
+            log_error("Not a valid PDU ID, expected %u, %u or %u, found %u.\n", SDP_ServiceSearchResponse, 
+                                    SDP_ServiceAttributeResponse, SDP_ServiceSearchAttributeResponse, packet[0]);
+            return;
+        }
+
+        PDU_ID = packet[0];
+        log_info("SDP Client :: PDU ID. %u ,%u", PDU_ID, packet[0]);
+        switch (PDU_ID){
+#ifdef HAVE_SDP_EXTRA_QUERIES
+            case SDP_ServiceSearchResponse:
+                parse_service_search_response(packet);
+                break;
+            case SDP_ServiceAttributeResponse:
+                parse_service_attribute_response(packet);
+                break;
+#endif
+            case SDP_ServiceSearchAttributeResponse:
+                parse_service_search_attribute_response(packet);
+                break;
+            default:
+                log_error("SDP Client :: PDU ID invalid. %u ,%u", PDU_ID, packet[0]);
+                return;
+        }
+
+        // continuation set or DONE?
+        if (continuationStateLen == 0){
+            // printf("DONE! All clients already notified.\n");
+            sdp_client_handle_done(0);
+            sdp_client_state = INIT;
+            return;
+        }
+        // prepare next request and send
+        sdp_client_state = W2_SEND;
+        try_to_send(sdp_cid);
+    
+        return;
+    }
+    
+    if (packet_type != HCI_EVENT_PACKET) return;
+    
+    switch(packet[0]){
+
+        case L2CAP_EVENT_CHANNEL_OPENED: 
+            if (sdp_client_state != W4_CONNECT) break;
+
+            // data: event (8), len(8), status (8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16), local_mtu(16), remote_mtu(16) 
+            if (packet[2]) {
+                log_error("Connection failed.\n\r");
+                sdp_client_handle_done(packet[2]);
+                break;
+            }
+            sdp_cid = channel;
+            mtu = READ_BT_16(packet, 17);
+            handle = READ_BT_16(packet, 9);
+            log_info("Connected, cid %x, mtu %u.\n\r", sdp_cid, mtu);
+
+            sdp_client_state = W2_SEND;
+            try_to_send(sdp_cid);
+            break;
+        case L2CAP_EVENT_CREDITS:
+        case DAEMON_EVENT_HCI_PACKET_SENT:
+            try_to_send(sdp_cid);
+            break;
+        case L2CAP_EVENT_CHANNEL_CLOSED:
+            log_info("Channel closed.\n\r");
+            if (sdp_client_state == INIT) break;
+            sdp_client_handle_done(SDP_QUERY_INCOMPLETE);
+            break;
+        default:
+            break;
+    }
+}
+
+
+static uint16_t setup_service_search_attribute_request(uint8_t * data){
+
+    uint16_t offset = 0;
+    transactionID++;
+    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
+    data[offset++] = SDP_ServiceSearchAttributeRequest;
+    // uint16_t transactionID
+    net_store_16(data, offset, transactionID);
+    offset += 2;
+
+    // param legnth
+    offset += 2;
+
+    // parameters: 
+    //     ServiceSearchPattern - DES (min 1 UUID, max 12)
+    uint16_t serviceSearchPatternLen = de_get_len(serviceSearchPattern);
+    memcpy(data + offset, serviceSearchPattern, serviceSearchPatternLen);
+    offset += serviceSearchPatternLen;
+
+    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
+    net_store_16(data, offset, mtu);
+    offset += 2;
+
+    //     AttibuteIDList  
+    uint16_t attributeIDListLen = de_get_len(attributeIDList);
+    memcpy(data + offset, attributeIDList, attributeIDListLen);
+    offset += attributeIDListLen;
+
+    //     ContinuationState - uint8_t number of cont. bytes N<=16 
+    data[offset++] = continuationStateLen;
+    //                       - N-bytes previous response from server
+    memcpy(data + offset, continuationState, continuationStateLen);
+    offset += continuationStateLen;
+
+    // uint16_t paramLength 
+    net_store_16(data, 3, offset - 5);
+
+    return offset;
+}
+
+#ifdef HAVE_SDP_EXTRA_QUERIES
+void parse_service_record_handle_list(uint8_t* packet, uint16_t total_count, uint16_t current_count){
+    sdp_parser_handle_service_search(packet, total_count, current_count);
+}
+
+static uint16_t setup_service_search_request(uint8_t * data){
+    uint16_t offset = 0;
+    transactionID++;
+    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
+    data[offset++] = SDP_ServiceSearchRequest;
+    // uint16_t transactionID
+    net_store_16(data, offset, transactionID);
+    offset += 2;
+
+    // param legnth
+    offset += 2;
+
+    // parameters: 
+    //     ServiceSearchPattern - DES (min 1 UUID, max 12)
+    uint16_t serviceSearchPatternLen = de_get_len(serviceSearchPattern);
+    memcpy(data + offset, serviceSearchPattern, serviceSearchPatternLen);
+    offset += serviceSearchPatternLen;
+
+    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
+    net_store_16(data, offset, mtu);
+    offset += 2;
+
+    //     ContinuationState - uint8_t number of cont. bytes N<=16 
+    data[offset++] = continuationStateLen;
+    //                       - N-bytes previous response from server
+    memcpy(data + offset, continuationState, continuationStateLen);
+    offset += continuationStateLen;
+
+    // uint16_t paramLength 
+    net_store_16(data, 3, offset - 5);
+
+    return offset;
+}
+
+
+static uint16_t setup_service_attribute_request(uint8_t * data){
+
+    uint16_t offset = 0;
+    transactionID++;
+    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
+    data[offset++] = SDP_ServiceAttributeRequest;
+    // uint16_t transactionID
+    net_store_16(data, offset, transactionID);
+    offset += 2;
+
+    // param legnth
+    offset += 2;
+
+    // parameters: 
+    //     ServiceRecordHandle
+    net_store_32(data, offset, serviceRecordHandle);
+    offset += 4;
+
+    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
+    net_store_16(data, offset, mtu);
+    offset += 2;
+
+    //     AttibuteIDList  
+    uint16_t attributeIDListLen = de_get_len(attributeIDList);
+    memcpy(data + offset, attributeIDList, attributeIDListLen);
+    offset += attributeIDListLen;
+
+    //     ContinuationState - uint8_t number of cont. bytes N<=16 
+    data[offset++] = continuationStateLen;
+    //                       - N-bytes previous response from server
+    memcpy(data + offset, continuationState, continuationStateLen);
+    offset += continuationStateLen;
+
+    // uint16_t paramLength 
+    net_store_16(data, 3, offset - 5);
+
+    return offset;
+}
+
 static void parse_service_search_response(uint8_t* packet){
     uint16_t offset = 3;
     uint16_t parameterLength = READ_NET_16(packet,offset);
@@ -243,237 +454,23 @@ static void parse_service_attribute_response(uint8_t* packet){
     }
 }
 
+void sdp_client_service_attribute_search(bd_addr_t remote, uint32_t search_serviceRecordHandle, uint8_t * des_attributeIDList){
+    serviceRecordHandle = search_serviceRecordHandle;
+    attributeIDList = des_attributeIDList;
+    continuationStateLen = 0;
+    PDU_ID = SDP_ServiceAttributeResponse;
 
-static void parse_service_search_attribute_response(uint8_t* packet){
+    sdp_client_state = W4_CONNECT;
-    uint16_t offset = 3;
+    l2cap_create_channel_internal(NULL, sdp_packet_handler, remote, PSM_SDP, l2cap_max_mtu());
-    uint16_t parameterLength = READ_NET_16(packet,offset);
-    offset+=2;
-    // AttributeListByteCount <= mtu
-    uint16_t attributeListByteCount = READ_NET_16(packet,offset);
-    offset+=2;
-
-    if (attributeListByteCount > mtu){
-        log_error("Error parsing ServiceSearchAttributeResponse: Number of bytes in found attribute list is larger then the MaximumAttributeByteCount.\n");
-        return;
-    }
-
-    // AttributeLists
-    parse_attribute_lists(packet+offset, attributeListByteCount);
-    offset+=attributeListByteCount;
-
-    continuationStateLen = packet[offset];
-    offset++;
-
-    if (continuationStateLen > 16){
-        log_error("Error parsing ServiceSearchAttributeResponse: Number of bytes in continuation state exceedes 16.\n");
-        return;
-    }
-    memcpy(continuationState, packet+offset, continuationStateLen);
-    offset+=continuationStateLen;
-
-    if (parameterLength != offset - 5){
-        log_error("Error parsing ServiceSearchAttributeResponse: wrong size of parameters, number of expected bytes%u, actual number %u.\n", parameterLength, offset);
-    }
 }
 
-void sdp_packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
+void sdp_client_service_search(bd_addr_t remote, uint8_t * des_serviceSearchPattern){
-    uint16_t handle;
+    serviceSearchPattern = des_serviceSearchPattern;
+    continuationStateLen = 0;
+    PDU_ID = SDP_ServiceSearchResponse;
 
-    if (packet_type == L2CAP_DATA_PACKET){
+    sdp_client_state = W4_CONNECT;
-
+    l2cap_create_channel_internal(NULL, sdp_packet_handler, remote, PSM_SDP, l2cap_max_mtu());
-        uint16_t responseTransactionID = READ_NET_16(packet,1);
-        if ( responseTransactionID != transactionID){
-            log_error("Missmatching transaction ID, expected %u, found %u.\n", transactionID, responseTransactionID);
-            return;
-        } 
-        
-        if (packet[0] != SDP_ServiceSearchAttributeResponse 
-            && packet[0] != SDP_ServiceSearchResponse
-            && packet[0] != SDP_ServiceAttributeResponse){
-            log_error("Not a valid PDU ID, expected %u, %u or %u, found %u.\n", SDP_ServiceSearchResponse, 
-                                    SDP_ServiceAttributeResponse, SDP_ServiceSearchAttributeResponse, packet[0]);
-            return;
-        }
-
-        PDU_ID = packet[0];
-        log_info("SDP Client :: PDU ID. %u ,%u", PDU_ID, packet[0]);
-        switch (PDU_ID){
-            case SDP_ServiceSearchResponse:
-                parse_service_search_response(packet);
-                break;
-            case SDP_ServiceAttributeResponse:
-                parse_service_attribute_response(packet);
-                break;
-            case SDP_ServiceSearchAttributeResponse:
-                parse_service_search_attribute_response(packet);
-                break;
-            default:
-                log_error("SDP Client :: PDU ID invalid. %u ,%u", PDU_ID, packet[0]);
-                return;
-        }
-
-        // continuation set or DONE?
-        if (continuationStateLen == 0){
-            // printf("DONE! All clients already notified.\n");
-            sdp_client_handle_done(0);
-            sdp_client_state = INIT;
-            return;
-        }
-        // prepare next request and send
-        sdp_client_state = W2_SEND;
-        try_to_send(sdp_cid);
-    
-        return;
-    }
-    
-    if (packet_type != HCI_EVENT_PACKET) return;
-    
-    switch(packet[0]){
-
-        case L2CAP_EVENT_CHANNEL_OPENED: 
-            if (sdp_client_state != W4_CONNECT) break;
-
-            // data: event (8), len(8), status (8), address(48), handle (16), psm (16), local_cid(16), remote_cid (16), local_mtu(16), remote_mtu(16) 
-            if (packet[2]) {
-                log_error("Connection failed.\n\r");
-                sdp_client_handle_done(packet[2]);
-                break;
-            }
-            sdp_cid = channel;
-            mtu = READ_BT_16(packet, 17);
-            handle = READ_BT_16(packet, 9);
-            log_info("Connected, cid %x, mtu %u.\n\r", sdp_cid, mtu);
-
-            sdp_client_state = W2_SEND;
-            try_to_send(sdp_cid);
-            break;
-        case L2CAP_EVENT_CREDITS:
-        case DAEMON_EVENT_HCI_PACKET_SENT:
-            try_to_send(sdp_cid);
-            break;
-        case L2CAP_EVENT_CHANNEL_CLOSED:
-            log_info("Channel closed.\n\r");
-            if (sdp_client_state == INIT) break;
-            sdp_client_handle_done(SDP_QUERY_INCOMPLETE);
-            break;
-        default:
-            break;
-    }
 }
-
+#endif
-static uint16_t setup_ServiceSearchRequest(uint8_t * data){
-
-    uint16_t offset = 0;
-    transactionID++;
-    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
-    data[offset++] = SDP_ServiceSearchRequest;
-    // uint16_t transactionID
-    net_store_16(data, offset, transactionID);
-    offset += 2;
-
-    // param legnth
-    offset += 2;
-
-    // parameters: 
-    //     ServiceSearchPattern - DES (min 1 UUID, max 12)
-    uint16_t serviceSearchPatternLen = de_get_len(serviceSearchPattern);
-    memcpy(data + offset, serviceSearchPattern, serviceSearchPatternLen);
-    offset += serviceSearchPatternLen;
-
-    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
-    net_store_16(data, offset, mtu);
-    offset += 2;
-
-    //     ContinuationState - uint8_t number of cont. bytes N<=16 
-    data[offset++] = continuationStateLen;
-    //                       - N-bytes previous response from server
-    memcpy(data + offset, continuationState, continuationStateLen);
-    offset += continuationStateLen;
-
-    // uint16_t paramLength 
-    net_store_16(data, 3, offset - 5);
-
-    return offset;
-}
-
-
-static uint16_t setup_ServiceAttributeRequest(uint8_t * data){
-
-    uint16_t offset = 0;
-    transactionID++;
-    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
-    data[offset++] = SDP_ServiceAttributeRequest;
-    // uint16_t transactionID
-    net_store_16(data, offset, transactionID);
-    offset += 2;
-
-    // param legnth
-    offset += 2;
-
-    // parameters: 
-    //     ServiceRecordHandle
-    net_store_32(data, offset, serviceRecordHandle);
-    offset += 4;
-
-    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
-    net_store_16(data, offset, mtu);
-    offset += 2;
-
-    //     AttibuteIDList  
-    uint16_t attributeIDListLen = de_get_len(attributeIDList);
-    memcpy(data + offset, attributeIDList, attributeIDListLen);
-    offset += attributeIDListLen;
-
-    //     ContinuationState - uint8_t number of cont. bytes N<=16 
-    data[offset++] = continuationStateLen;
-    //                       - N-bytes previous response from server
-    memcpy(data + offset, continuationState, continuationStateLen);
-    offset += continuationStateLen;
-
-    // uint16_t paramLength 
-    net_store_16(data, 3, offset - 5);
-
-    return offset;
-}
-
-static uint16_t setup_ServiceSearchAttributeRequest(uint8_t * data){
-
-    uint16_t offset = 0;
-    transactionID++;
-    // uint8_t SDP_PDU_ID_t.SDP_ServiceSearchRequest;
-    data[offset++] = SDP_ServiceSearchAttributeRequest;
-    // uint16_t transactionID
-    net_store_16(data, offset, transactionID);
-    offset += 2;
-
-    // param legnth
-    offset += 2;
-
-    // parameters: 
-    //     ServiceSearchPattern - DES (min 1 UUID, max 12)
-    uint16_t serviceSearchPatternLen = de_get_len(serviceSearchPattern);
-    memcpy(data + offset, serviceSearchPattern, serviceSearchPatternLen);
-    offset += serviceSearchPatternLen;
-
-    //     MaximumAttributeByteCount - uint16_t  0x0007 - 0xffff -> mtu
-    net_store_16(data, offset, mtu);
-    offset += 2;
-
-    //     AttibuteIDList  
-    uint16_t attributeIDListLen = de_get_len(attributeIDList);
-    memcpy(data + offset, attributeIDList, attributeIDListLen);
-    offset += attributeIDListLen;
-
-    //     ContinuationState - uint8_t number of cont. bytes N<=16 
-    data[offset++] = continuationStateLen;
-    //                       - N-bytes previous response from server
-    memcpy(data + offset, continuationState, continuationStateLen);
-    offset += continuationStateLen;
-
-    // uint16_t paramLength 
-    net_store_16(data, 3, offset - 5);
-
-    return offset;
-}
-
 

src/sdp_client.h

@@ -40,6 +40,8 @@
 
 #pragma once
 
+#include "config.h"
+
 #include <btstack/utils.h>
 
 #if defined __cplusplus
@@ -53,8 +55,11 @@ and a list of attribute IDs. The remote data is handled by the SDP parser. The
 SDP parser delivers attribute values and done event via a registered callback. */
 
 void sdp_client_query(bd_addr_t remote, uint8_t * des_serviceSearchPattern, uint8_t * des_attributeIDList);
+
+#ifdef HAVE_SDP_EXTRA_QUERIES
 void sdp_client_service_attribute_search(bd_addr_t remote, uint32_t search_serviceRecordHandle, uint8_t * des_attributeIDList);
 void sdp_client_service_search(bd_addr_t remote, uint8_t * des_serviceSearchPattern);
+#endif
 
 #if defined __cplusplus
 }

src/sdp_parser.c

@@ -59,9 +59,12 @@ static uint16_t list_size;
 static uint16_t record_offset = 0;
 static uint16_t record_size;
 static uint16_t attribute_value_size;
-static uint32_t record_handle;
 static int record_counter = 0;
 
+#ifdef HAVE_SDP_EXTRA_QUERIES
+static uint32_t record_handle;
+#endif
+
 static void (*sdp_query_callback)(sdp_query_event_t * event);
 
 // Low level parser
@@ -230,6 +233,14 @@ void sdp_parser_init(void){
     record_counter = 0;
 }
 
+void sdp_parser_handle_chunk(uint8_t * data, uint16_t size){
+    int i;
+    for (i=0;i<size;i++){
+        parse(data[i]);
+    }
+}
+
+#ifdef HAVE_SDP_EXTRA_QUERIES
 void sdp_parser_init_service_attribute_search(void){
     // init
     de_state_init(&de_header_state);
@@ -239,13 +250,6 @@ void sdp_parser_init_service_attribute_search(void){
     record_counter = 0;
 }
 
-void sdp_parser_handle_chunk(uint8_t * data, uint16_t size){
-    int i;
-    for (i=0;i<size;i++){
-        parse(data[i]);
-    }
-}
-
 void sdp_parser_init_service_search(void){
     record_offset = 0;
 }
@@ -264,7 +268,7 @@ void sdp_parser_handle_service_search(uint8_t * data, uint16_t total_count, uint
         (*sdp_query_callback)((sdp_query_event_t*)&service_record_handle_event);       
     }        
 }
-
+#endif
 
 void sdp_parser_handle_done(uint8_t status){
     sdp_query_complete_event_t complete_event = {

src/sdp_parser.h

@@ -40,6 +40,8 @@
 
 #pragma once
 
+#include "config.h"
+ 
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -87,20 +89,23 @@ typedef struct sdp_query_attribute_value_event {
 } sdp_query_attribute_value_event_t;
 
 
+#ifdef HAVE_SDP_EXTRA_QUERIES
 typedef struct sdp_query_service_record_handle_event {
     uint8_t type;
     uint16_t total_count;
     uint16_t current_count;
     uint32_t record_handle;
 } sdp_query_service_record_handle_event_t;
-
+#endif
 
 void sdp_parser_init(void);
-void sdp_parser_init_service_attribute_search(void);
 void sdp_parser_handle_chunk(uint8_t * data, uint16_t size);
 
+#ifdef HAVE_SDP_EXTRA_QUERIES
+void sdp_parser_init_service_attribute_search(void);
 void sdp_parser_init_service_search(void);
 void sdp_parser_handle_service_search(uint8_t * data, uint16_t total_count, uint16_t record_handle_count);
+#endif
 
 void sdp_parser_handle_done(uint8_t status);
 

test/sdp_client/config.h

@@ -9,5 +9,6 @@
 #define HAVE_BZERO
 #define ENABLE_LOG_INFO 
 #define ENABLE_LOG_ERROR
+#define HAVE_SDP_EXTRA_QUERIES
 #define HCI_ACL_PAYLOAD_SIZE 1021
 // #define HCI_ACL_PAYLOAD_SIZE 52