mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-28 19:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow to pass list of network packet types to PAN SDP record create helpers

Browse Source
This commit is contained in:
Matthias Ringwald 2015-07-16 12:24:46 +02:00
parent 779e62ab89
commit 342bf200f4
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/pan.c
View File

@ -58,7 +58,7 @@ static const char default_nap_service_desc[] = "Personal Ad-hoc Network Service
static const char default_gn_service_name[] = "Group Ad-hoc Network Service";
static const char default_gn_service_desc[] = "Personal Group Ad-hoc Network Service";
void pan_create_service(uint32_t service_uuid, uint8_t *service, const char *name, const char *descriptor,
void pan_create_service(uint8_t *service, uint32_t service_uuid, uint16_t * network_packet_types, const char *name, const char *descriptor,
security_description_t security_desc, net_access_type_t net_access_type, uint32_t max_net_access_rate,
const char *IPv4Subnet, const char *IPv6Subnet){
@ -96,8 +96,11 @@ void pan_create_service(uint32_t service_uuid, uint8_t *service, const char *nam
uint8_t * net_packet_type_list = de_push_sequence(bnep);
{
// add Supported Network Packet Type List
// de_add_number(net_packet_type_list, DE_UINT, DE_SIZE_16, 0x0100); // version
if (network_packet_types){
while (*network_packet_types){
de_add_number(net_packet_type_list, DE_UINT, DE_SIZE_16, *network_packet_types++);
}
}
}
de_pop_sequence(bnep, net_packet_type_list);
}
@ -211,17 +214,17 @@ void pan_create_service(uint32_t service_uuid, uint8_t *service, const char *nam
}
void pan_create_nap_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc,
void pan_create_nap_service(uint8_t *service, uint16_t * network_packet_types, const char *name, const char *description, security_description_t security_desc,
net_access_type_t net_access_type, uint32_t max_net_access_rate, const char *IPv4Subnet, const char *IPv6Subnet){
pan_create_service(SDP_NAP, service, name, description, security_desc, net_access_type, max_net_access_rate, IPv4Subnet, IPv6Subnet);
pan_create_service(service, SDP_NAP, network_packet_types, name, description, security_desc, net_access_type, max_net_access_rate, IPv4Subnet, IPv6Subnet);
}
void pan_create_gn_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc,
void pan_create_gn_service(uint8_t *service, uint16_t * network_packet_types, const char *name, const char *description, security_description_t security_desc,
const char *IPv4Subnet, const char *IPv6Subnet){
pan_create_service(SDP_GN, service, name, description, security_desc, PAN_NET_ACCESS_TYPE_NONE, 0, IPv4Subnet, IPv6Subnet);
pan_create_service(service, SDP_GN, network_packet_types, name, description, security_desc, PAN_NET_ACCESS_TYPE_NONE, 0, IPv4Subnet, IPv6Subnet);
}
void pan_create_panu_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc){
pan_create_service(SDP_PANU, service, name, description, security_desc, PAN_NET_ACCESS_TYPE_NONE, 0, NULL, NULL);
void pan_create_panu_service(uint8_t *service, uint16_t * network_packet_types, const char *name, const char *description, security_description_t security_desc){
pan_create_service(service, SDP_PANU, network_packet_types, name, description, security_desc, PAN_NET_ACCESS_TYPE_NONE, 0, NULL, NULL);
}

17
src/pan.h
View File

@ -91,25 +91,29 @@ typedef enum {
* @note Make sure the buffer is big enough.
*
* @param service is an empty buffer to store service record
* @param network_packet_types array of types terminated by a 0x0000 entry
* @param name if NULL, the default service name will be assigned
* @param description if NULL, the default service description will be assigned
* @param security_desc
*/
void pan_create_panu_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc);
void pan_create_panu_service(uint8_t *service, uint16_t * network_packet_types, const char *name,
const char *description, security_description_t security_desc);
/**
* @brief Creates SDP record for GN BNEP service in provided empty buffer.
* @note Make sure the buffer is big enough.
*
* @param service is an empty buffer to store service record
* @param network_packet_types array of types terminated by a 0x0000 entry
* @param name if NULL, the default service name will be assigned
* @param description if NULL, the default service description will be assigned
* @param security_desc
* @param IPv4Subnet is optional subnet definition, e.g. "10.0.0.0/8"
* @param IPv6Subnet is optional subnet definition given in the standard IETF format with the absolute attribute IDs
*/
void pan_create_gn_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc,
const char *IPv4Subnet, const char *IPv6Subnet);
void pan_create_gn_service(uint8_t *service, uint16_t * network_packet_types, const char *name,
const char *description, security_description_t security_desc, const char *IPv4Subnet,
const char *IPv6Subnet);
/**
* @brief Creates SDP record for NAP BNEP service in provided empty buffer.
@ -117,6 +121,7 @@ void pan_create_gn_service(uint8_t *service, const char *name, const char *descr
*
* @param service is an empty buffer to store service record
* @param name if NULL, the default service name will be assigned
* @param network_packet_types array of types terminated by a 0x0000 entry
* @param description if NULL, the default service description will be assigned
* @param security_desc
* @param net_access_type type of available network access
@ -124,8 +129,10 @@ void pan_create_gn_service(uint8_t *service, const char *name, const char *descr
* @param IPv4Subnet is optional subnet definition, e.g. "10.0.0.0/8"
* @param IPv6Subnet is optional subnet definition given in the standard IETF format with the absolute attribute IDs
*/
void pan_create_nap_service(uint8_t *service, const char *name, const char *description, security_description_t security_desc,
net_access_type_t net_access_type, uint32_t max_net_access_rate, const char *IPv4Subnet, const char *IPv6Subnet);
void pan_create_nap_service(uint8_t *service, uint16_t * network_packet_types, const char *name,
const char *description, security_description_t security_desc, net_access_type_t net_access_type,
uint32_t max_net_access_rate, const char *IPv4Subnet, const char *IPv6Subnet);
/* API_END */
#if defined __cplusplus