OSDN Git Service
(root)
/
android-x86
/
external-bluetooth-bluez.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
49199f7
)
Use the helper function to convert a string to a binary buffer
author
Vinicius Costa Gomes
<vinicius.gomes@openbossa.org>
Wed, 18 Jan 2012 23:13:30 +0000
(20:13 -0300)
committer
Johan Hedberg
<johan.hedberg@intel.com>
Mon, 23 Jan 2012 11:02:51 +0000
(13:02 +0200)
When loading Link Keys from storage we are able to re-use the function
that was introduced earlier for the LTK case.
src/adapter.c
patch
|
blob
|
history
diff --git
a/src/adapter.c
b/src/adapter.c
index
6e8552b
..
d5075db
100644
(file)
--- a/
src/adapter.c
+++ b/
src/adapter.c
@@
-1819,7
+1819,6
@@
static struct link_key_info *get_key_info(const char *addr, const char *value)
struct link_key_info *info;
char tmp[3];
long int l;
- int i;
if (strlen(value) < 36) {
error("Unexpectedly short (%zu) link key line", strlen(value));
@@
-1830,12
+1829,7
@@
static struct link_key_info *get_key_info(const char *addr, const char *value)
str2ba(addr, &info->bdaddr);
- memset(tmp, 0, sizeof(tmp));
-
- for (i = 0; i < 16; i++) {
- memcpy(tmp, value + (i * 2), 2);
- info->key[i] = (uint8_t) strtol(tmp, NULL, 16);
- }
+ str2buf(value, info->key, sizeof(info->key));
memcpy(tmp, value + 33, 2);
info->type = (uint8_t) strtol(tmp, NULL, 10);