Changeset 374 for asp3_tinet_ecnl_rx/trunk/btstack/src/sdp_util.c
- Timestamp:
- Apr 5, 2019, 9:26:53 PM (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
asp3_tinet_ecnl_rx/trunk/btstack/src/sdp_util.c
r337 r374 98 98 break; 99 99 case DE_SIZE_VAR_16: 100 result = READ_NET_16(header,1);100 result = big_endian_read_16(header,1); 101 101 break; 102 102 case DE_SIZE_VAR_32: 103 result = READ_NET_32(header,1);103 result = big_endian_read_32(header,1); 104 104 break; 105 105 default: … … 122 122 int de_element_get_uint16(uint8_t * element, uint16_t * value){ 123 123 if (de_get_size_type(element) != DE_SIZE_16) return 0; 124 *value = READ_NET_16(element, de_get_header_size(element));124 *value = big_endian_read_16(element, de_get_header_size(element)); 125 125 return 1; 126 126 } … … 134 134 switch (uuidSize){ 135 135 case DE_SIZE_16: 136 shortUUID = READ_NET_16(element, 1);136 shortUUID = big_endian_read_16(element, 1); 137 137 break; 138 138 case DE_SIZE_32: 139 shortUUID = READ_NET_32(element, 1);139 shortUUID = big_endian_read_32(element, 1); 140 140 break; 141 141 case DE_SIZE_128: … … 157 157 hasBlueoothBaseUuid = sdp_has_blueooth_base_uuid(uuid128); 158 158 if (!hasBlueoothBaseUuid) return 0; 159 return READ_NET_32(uuid128, 0);159 return big_endian_read_32(uuid128, 0); 160 160 } 161 161 … … 199 199 void de_pop_sequence(uint8_t * parent, uint8_t * child){ 200 200 int child_len = de_get_len(child); 201 int data_size_parent = READ_NET_16(parent,1);201 int data_size_parent = big_endian_read_16(parent,1); 202 202 net_store_16(parent, 1, data_size_parent + child_len); 203 203 } … … 205 205 /* adds a single number value and 16+32 bit UUID to the sequence */ 206 206 void de_add_number(uint8_t *seq, de_type_t type, de_size_t size, uint32_t value){ 207 int data_size = READ_NET_16(seq,1);207 int data_size = big_endian_read_16(seq,1); 208 208 int element_size = 1; // e.g. for DE_TYPE_NIL 209 209 de_store_descriptor(seq+3+data_size, type, size); … … 231 231 /* add a single block of data, e.g. as DE_STRING, DE_URL */ 232 232 void de_add_data( uint8_t *seq, de_type_t type, uint16_t size, uint8_t *data){ 233 int data_size = READ_NET_16(seq,1);233 int data_size = big_endian_read_16(seq,1); 234 234 if (size > 0xff) { 235 235 // use 16-bit lengh information (3 byte header) … … 247 247 248 248 void de_add_uuid128(uint8_t * seq, uint8_t * uuid){ 249 int data_size = READ_NET_16(seq,1);249 int data_size = big_endian_read_16(seq,1); 250 250 de_store_descriptor(seq+3+data_size, DE_UUID, DE_SIZE_128); 251 251 memcpy( seq + 4 + data_size, uuid, 16); … … 326 326 uint8_t done; 327 327 if (idType != DE_UINT || idSize != DE_SIZE_16) break; // wrong type 328 attribute_id = READ_NET_16(element, pos + 1);328 attribute_id = big_endian_read_16(element, pos + 1); 329 329 pos += 3; 330 330 if (pos >= end_pos) break; // array out of bounds … … 349 349 switch (size) { 350 350 case DE_SIZE_16: 351 if ( READ_NET_16(element, 1) == context->attributeID) {351 if (big_endian_read_16(element, 1) == context->attributeID) { 352 352 context->result = 1; 353 353 return 1; … … 355 355 break; 356 356 case DE_SIZE_32: 357 if ( READ_NET_16(element, 1) <= context->attributeID358 && context->attributeID <= READ_NET_16(element, 3)) {357 if (big_endian_read_16(element, 1) <= context->attributeID 358 && context->attributeID <= big_endian_read_16(element, 3)) { 359 359 context->result = 1; 360 360 return 1; … … 388 388 if (sdp_attribute_list_constains_id(context->attributeIDList, attributeID)) { 389 389 // DES_HEADER(3) + DES_DATA + (UINT16(3) + attribute) 390 uint16_t data_size = READ_NET_16(context->buffer, 1);390 uint16_t data_size = big_endian_read_16(context->buffer, 1); 391 391 int attribute_len = de_get_len(attributeValue); 392 392 if (3 + data_size + (3 + attribute_len) <= context->maxBytes) { … … 662 662 break; 663 663 case DE_SIZE_VAR_16: 664 len = READ_NET_16(element, 1);664 len = big_endian_read_16(element, 1); 665 665 break; 666 666 default: … … 678 678 break; 679 679 case DE_SIZE_16: 680 value = READ_NET_16(element,pos);680 value = big_endian_read_16(element,pos); 681 681 break; 682 682 case DE_SIZE_32: 683 value = READ_NET_32(element,pos);683 value = big_endian_read_32(element,pos); 684 684 break; 685 685 default: … … 712 712 713 713 // 0x0001 "Service Class ID List" 714 de_add_number(service, DE_UINT, DE_SIZE_16, SDP_ServiceClassIDList);714 de_add_number(service, DE_UINT, DE_SIZE_16, BLUETOOTH_ATTRIBUTE_SERVICE_CLASS_ID_LIST); 715 715 attribute = de_push_sequence(service); 716 716 { … … 720 720 721 721 // 0x0004 "Protocol Descriptor List" 722 de_add_number(service, DE_UINT, DE_SIZE_16, SDP_ProtocolDescriptorList);722 de_add_number(service, DE_UINT, DE_SIZE_16, BLUETOOTH_ATTRIBUTE_PROTOCOL_DESCRIPTOR_LIST); 723 723 attribute = de_push_sequence(service); 724 724 {
Note:
See TracChangeset
for help on using the changeset viewer.