RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

ng_netif: non-destructive ng_netif_addr_from_str

Browse Source
This commit is contained in:
René Kijewski 2015-04-29 18:13:32 +02:00
parent 64e0b8d8fb
commit 5eed801072
2 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/include/net/ng_netif.h
View File

@ -116,8 +116,6 @@ char *ng_netif_addr_to_str(char *out, size_t out_len, uint8_t *addr,
*
* @details The input format must be like `xx:xx:xx:xx` where `xx` will be the
* bytes of @p addr in hexadecimal representation.
* Changes @p str for simple parsing purposes. Make a copy if you
* need it later.
*
* @param[out] out The resulting hardware address.
* @param[out] out_len Length of @p out.
@ -126,7 +124,7 @@ char *ng_netif_addr_to_str(char *out, size_t out_len, uint8_t *addr,
* @return Actual length of @p out on success.
* @return 0, on failure.
*/
size_t ng_netif_addr_from_str(uint8_t *out, size_t out_len, char *str);
size_t ng_netif_addr_from_str(uint8_t *out, size_t out_len, const char *str);
#ifdef __cplusplus
}

63
sys/net/crosslayer/ng_netif/ng_netif_addr_from_str.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (C) 2015 Martine Lenders <mlenders@inf.fu-berlin.de>
* Copyright (C) 2015 René Kijewski <rene.kijewski@fu-berlin.de>
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
@ -14,47 +15,47 @@
#include "net/ng_netif.h"
static uint8_t _parse_byte(char *str)
static int _dehex(char c)
{
uint8_t res = 0;
for (int i = 0; i < 2; i++) { /* iterate over half-bytes */
if ((str[i] >= '0') && (str[i] <= '9')) { /* if '0'-'9' */
res |= (str[i] - '0') << (4 * (1 - i)); /* set half-byte to 0-9 */
}
else if ((str[i] >= 'a') && (str[i] <= 'f')) { /* if 'a'-'f' */
res |= (str[i] - 'a' + 10) << (4 * (1 - i));/* set half-byte to 10-15 */
}
/* interpret any other character as 0 */
}
return res;
return ('0' <= c && c <= '9') ? c - '0'
: ('A' <= c && c <= 'F') ? c - 'A' + 10
: ('a' <= c && c <= 'f') ? c - 'a' + 10
: -1;
}
size_t ng_netif_addr_from_str(uint8_t *out, size_t out_len, char *str)
size_t ng_netif_addr_from_str(uint8_t *out, size_t out_len, const char *str)
{
size_t res = 0;
char *byte_str = str;
int end = 0;
while (end == 0) {
str++;
if ((res >= out_len) || ((str - byte_str) > 2)) {
/* no space left or byte_str has become > 2 chars */
size_t len = 0;
while (1) {
++len;
if (len > out_len) {
return 0;
}
if ((*str == ':') || (*str == '\0')) {
end = (*str == '\0');
*str = '\0';
out[res++] = _parse_byte(byte_str);
byte_str = ++str;
int a = _dehex(*str++);
if (a < 0) {
return 0;
}
int b = _dehex(*str++);
if (b < 0) {
return 0;
}
*out++ = (a << 4) | b;
if (*str == ':') {
++str;
}
else if (*str == '\0') {
break;
}
else {
return 0;
}
}
return res;
return len;
}
/** @} */