From 3d60a8ae38d1bcaff86fb2ef1b8f7e20b2abe285 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Tue, 20 Aug 2019 15:51:54 +0200
Subject: [PATCH] ble: card10 srv - without encrypt and auth
---
epicardium/ble/card10.c | 206 +++++++++++++++++-----------------
epicardium/ble/filetransfer.c | 7 +-
2 files changed, 105 insertions(+), 108 deletions(-)
diff --git a/epicardium/ble/card10.c b/epicardium/ble/card10.c
index 2105ac02..2f78bc13 100644
--- a/epicardium/ble/card10.c
+++ b/epicardium/ble/card10.c
@@ -269,15 +269,14 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_time),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_time,
- .pValue = timeValue,
- .pLen = &timeLen,
- .maxLen = sizeof(uint64_t),
- .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
- ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = UUID_attChar_time,
+ .pValue = timeValue,
+ .pLen = &timeLen,
+ .maxLen = sizeof(uint64_t),
+ .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_READ,
+ },
// VIBRA
@@ -286,13 +285,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_vibra),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_vibra,
- .pValue = NULL,
- .maxLen = sizeof(uint16_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_vibra,
+ .pValue = NULL,
+ .maxLen = sizeof(uint16_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// ROCKETS
@@ -301,13 +300,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_rockets),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_rockets,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_rockets,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// BG LED Bottom left
@@ -316,13 +315,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_led_bg_bottom_left),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_bottom_left,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_led_bg_bottom_left,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// BG LED Bottom right
@@ -331,13 +330,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_led_bg_bottom_right),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_bottom_right,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_led_bg_bottom_right,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// BG LED top right
@@ -347,13 +346,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.maxLen = sizeof(UUID_char_led_bg_top_right),
.settings = 0,
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_top_right,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_led_bg_top_right,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// BG LED top left
@@ -362,13 +361,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_led_bg_top_left),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_bg_top_left,
- .pValue = NULL,
- .maxLen = 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_led_bg_top_left,
+ .pValue = NULL,
+ .maxLen = 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// Dim bottom module
@@ -377,14 +376,14 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_leds_bottom_dim),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_bottom_dim,
- .pValue = NULL,
- .pLen = 0,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_leds_bottom_dim,
+ .pValue = NULL,
+ .pLen = 0,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// Dim top module
@@ -393,13 +392,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_leds_top_dim),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_top_dim,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_leds_top_dim,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// led powersafe
@@ -408,13 +407,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_led_powersafe),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_led_powersafe,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_led_powersafe,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// flashlight
@@ -423,13 +422,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_flashlight),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_flashlight,
- .pValue = NULL,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_flashlight,
+ .pValue = NULL,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// personal state
@@ -438,15 +437,14 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_personal_state),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_personal_state,
- .pValue = &personalStateValue,
- .pLen = &personalStateLen,
- .maxLen = sizeof(uint16_t),
- .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH | ATTS_PERMIT_READ |
- ATTS_PERMIT_READ_ENC | ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = UUID_attChar_personal_state,
+ .pValue = &personalStateValue,
+ .pLen = &personalStateLen,
+ .maxLen = sizeof(uint16_t),
+ .settings = (ATTS_SET_WRITE_CBACK | ATTS_SET_READ_CBACK),
+ .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_READ,
+ },
// ABOVE LEDS
@@ -455,13 +453,13 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_leds_above),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_leds_above,
- .pValue = NULL,
- .maxLen = 11 * 3 * sizeof(uint8_t),
- .settings = ATTS_SET_WRITE_CBACK,
- .permissions =
- (ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_ENC |
- ATTS_PERMIT_WRITE_AUTH) },
+ {
+ .pUuid = UUID_attChar_leds_above,
+ .pValue = NULL,
+ .maxLen = 11 * 3 * sizeof(uint8_t),
+ .settings = ATTS_SET_WRITE_CBACK,
+ .permissions = ATTS_PERMIT_WRITE,
+ },
// Light sensor
@@ -470,14 +468,14 @@ static const attsAttr_t card10SvcAttrList[] = {
.pLen = (uint16_t *)&UUID_char_len,
.maxLen = sizeof(UUID_char_light_sensor),
.permissions = ATTS_PERMIT_READ },
- { .pUuid = UUID_attChar_light_sensor,
- .pValue = initLightSensorValue,
- .pLen = &initLightSensorLen,
- .maxLen = sizeof(uint8_t),
- .settings = ATTS_SET_READ_CBACK,
- .permissions =
- (ATTS_PERMIT_READ | ATTS_PERMIT_READ_ENC |
- ATTS_PERMIT_READ_AUTH) },
+ {
+ .pUuid = UUID_attChar_light_sensor,
+ .pValue = initLightSensorValue,
+ .pLen = &initLightSensorLen,
+ .maxLen = sizeof(uint8_t),
+ .settings = ATTS_SET_READ_CBACK,
+ .permissions = ATTS_PERMIT_READ,
+ },
};
// validating, that the service really get all charateristics
diff --git a/epicardium/ble/filetransfer.c b/epicardium/ble/filetransfer.c
index fa2cff4d..01a74ada 100644
--- a/epicardium/ble/filetransfer.c
+++ b/epicardium/ble/filetransfer.c
@@ -143,7 +143,7 @@ static const attsAttr_t fileTransCfgList[] = {
.pLen = NULL,
.maxLen = 128,
.settings = ATTS_SET_WRITE_CBACK | ATTS_SET_VARIABLE_LEN,
- .permissions = ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_AUTH,
+ .permissions = ATTS_PERMIT_WRITE,
},
/* File transfer Central RX characteristic */
{
@@ -161,7 +161,7 @@ static const attsAttr_t fileTransCfgList[] = {
.pLen = &attRxChConfigValue_len,
.maxLen = sizeof(attRxChConfigValue),
.settings = ATTS_SET_VARIABLE_LEN,
- .permissions = ATTS_PERMIT_READ | ATTS_PERMIT_READ_AUTH,
+ .permissions = ATTS_PERMIT_READ,
},
/* File transfer Central RX notification channel */
{
@@ -170,8 +170,7 @@ static const attsAttr_t fileTransCfgList[] = {
.pLen = &attRxChConfigValue_len,
.maxLen = sizeof(attRxChConfigValue),
.settings = ATTS_SET_CCC,
- .permissions = ATTS_PERMIT_READ | ATTS_PERMIT_READ_AUTH |
- ATTS_PERMIT_WRITE | ATTS_PERMIT_WRITE_AUTH,
+ .permissions = ATTS_PERMIT_READ | ATTS_PERMIT_WRITE,
},
};
--
GitLab