kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 18:13:49 +01:00
Code Releases Activity

gnrc/lorawan: uncrustify files

Browse Source
This commit is contained in:
Ollrogge 2022-08-23 15:39:42 +02:00
parent 5053e3ecae
commit 32cef708a7
7 changed files with 217 additions and 201 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/lorawan/main.c
View File

@ -72,7 +72,7 @@ static uint8_t appskey[LORAMAC_APPSKEY_LEN];
static void _alarm_cb(void *arg) static void _alarm_cb(void *arg)
{ {
(void) arg; (void)arg;
msg_t msg; msg_t msg;
msg_send(&msg, sender_pid); msg_send(&msg, sender_pid);
} }
@ -98,7 +98,7 @@ static void _send_message(void)
/* Try to send the message */ /* Try to send the message */
uint8_t ret = semtech_loramac_send(&loramac, uint8_t ret = semtech_loramac_send(&loramac,
(uint8_t *)message, strlen(message)); (uint8_t *)message, strlen(message));
if (ret != SEMTECH_LORAMAC_TX_DONE) { if (ret != SEMTECH_LORAMAC_TX_DONE) {
printf("Cannot send message '%s', ret code: %d\n", message, ret); printf("Cannot send message '%s', ret code: %d\n", message, ret);
return; return;
} }

22
sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mcps.c
View File

@ -167,7 +167,7 @@ void gnrc_lorawan_mcps_process_downlink(gnrc_lorawan_t *mac, uint8_t *psdu,
/* NOTE: MIC is in pkt */ /* NOTE: MIC is in pkt */
if (!gnrc_lorawan_mic_is_valid(psdu, size, mac->ctx.snwksintkey, if (!gnrc_lorawan_mic_is_valid(psdu, size, mac->ctx.snwksintkey,
mac->mcps.fcnt, gnrc_lorawan_optneg_is_set(mac))) { mac->mcps.fcnt, gnrc_lorawan_optneg_is_set(mac))) {
DEBUG("gnrc_lorawan: invalid MIC\n"); DEBUG("gnrc_lorawan: invalid MIC\n");
gnrc_lorawan_event_no_rx(mac); gnrc_lorawan_event_no_rx(mac);
return; return;
@ -226,17 +226,17 @@ void gnrc_lorawan_mcps_process_downlink(gnrc_lorawan_t *mac, uint8_t *psdu,
if (IS_USED(MODULE_GNRC_LORAWAN_1_1) && gnrc_lorawan_optneg_is_set(mac)) { if (IS_USED(MODULE_GNRC_LORAWAN_1_1) && gnrc_lorawan_optneg_is_set(mac)) {
if (_pkt.port) { if (_pkt.port) {
gnrc_lorawan_encrypt_fopts(fopts->iol_base, fopts->iol_len, gnrc_lorawan_encrypt_fopts(fopts->iol_base, fopts->iol_len,
&mac->dev_addr, &mac->dev_addr,
gnrc_lorawan_get_afcnt_down(mac), true, gnrc_lorawan_get_afcnt_down(mac), true,
GNRC_LORAWAN_DIR_DOWNLINK, GNRC_LORAWAN_DIR_DOWNLINK,
mac->ctx.nwksenckey); mac->ctx.nwksenckey);
} }
else { else {
gnrc_lorawan_encrypt_fopts(fopts->iol_base, fopts->iol_len, gnrc_lorawan_encrypt_fopts(fopts->iol_base, fopts->iol_len,
&mac->dev_addr, &mac->dev_addr,
mac->mcps.fcnt_down, false, mac->mcps.fcnt_down, false,
GNRC_LORAWAN_DIR_DOWNLINK, GNRC_LORAWAN_DIR_DOWNLINK,
mac->ctx.nwksenckey); mac->ctx.nwksenckey);
} }
} }
DEBUG("gnrc_lorawan: processing fopts\n"); DEBUG("gnrc_lorawan: processing fopts\n");
@ -331,8 +331,8 @@ size_t gnrc_lorawan_build_uplink(gnrc_lorawan_t *mac, iolist_t *payload,
key = mac->ctx.nwksenckey; key = mac->ctx.nwksenckey;
gnrc_lorawan_encrypt_fopts(&buf.data[sizeof(lorawan_hdr_t)], fopts_length, gnrc_lorawan_encrypt_fopts(&buf.data[sizeof(lorawan_hdr_t)], fopts_length,
&mac->dev_addr, mac->mcps.fcnt, false, &mac->dev_addr, mac->mcps.fcnt, false,
GNRC_LORAWAN_DIR_UPLINK, key); GNRC_LORAWAN_DIR_UPLINK, key);
} }
return buf.index; return buf.index;

3
sys/net/gnrc/link_layer/lorawan/gnrc_lorawan_mlme.c
View File

@ -340,7 +340,7 @@ static int _fopts_mlme_link_rekey_ind(lorawan_buffer_t *buf)
{ {
if (buf) { if (buf) {
assert(buf->index + GNRC_LORAWAN_CID_SIZE + assert(buf->index + GNRC_LORAWAN_CID_SIZE +
GNCR_LORAWAN_REKEY_IND_SIZE <= buf->size); GNCR_LORAWAN_REKEY_IND_SIZE <= buf->size);
buf->data[buf->index++] = GNCR_LORAWAN_CID_REKEY_CONF; buf->data[buf->index++] = GNCR_LORAWAN_CID_REKEY_CONF;
buf->data[buf->index++] = MINOR_LRWAN; buf->data[buf->index++] = MINOR_LRWAN;
@ -353,6 +353,7 @@ static void _mlme_rekey_check_conf(gnrc_lorawan_t *mac, uint8_t *p)
{ {
/* server version must by smaller or equal to device's LoRaWAN version */ /* server version must by smaller or equal to device's LoRaWAN version */
uint8_t server_minor = p[1]; uint8_t server_minor = p[1];
if (server_minor <= MINOR_LRWAN) { if (server_minor <= MINOR_LRWAN) {
mac->mlme.pending_mlme_opts &= ~GNRC_LORAWAN_MLME_OPTS_REKEY_IND_REQ; mac->mlme.pending_mlme_opts &= ~GNRC_LORAWAN_MLME_OPTS_REKEY_IND_REQ;
} }

2
sys/net/gnrc/link_layer/lorawan/include/gnrc_lorawan_internal.h
View File

@ -46,7 +46,7 @@ extern "C" {
#define MAJOR_MASK 0x3 /**< Major mtype mask */ #define MAJOR_MASK 0x3 /**< Major mtype mask */
#define MAJOR_LRWAN_R1 0x0 /**< LoRaWAN R1 version type */ #define MAJOR_LRWAN_R1 0x0 /**< LoRaWAN R1 version type */
#define MINOR_LRWAN 0x1 /**< Minor LoRaWAN version of device */ #define MINOR_LRWAN 0x1 /**< Minor LoRaWAN version of device */
#define JOIN_REQUEST_SIZE (23U) /**< Join Request size in bytes */ #define JOIN_REQUEST_SIZE (23U) /**< Join Request size in bytes */
#define MIC_SIZE (4U) /**< MIC size in bytes */ #define MIC_SIZE (4U) /**< MIC size in bytes */

369
sys/shell/cmds/gnrc_netif.c
View File

@ -86,6 +86,7 @@ static const struct {
static void _print_iface_name(netif_t *iface) static void _print_iface_name(netif_t *iface)
{ {
char name[CONFIG_NETIF_NAMELENMAX]; char name[CONFIG_NETIF_NAMELENMAX];
netif_get_name(iface, name); netif_get_name(iface, name);
printf("%s", name); printf("%s", name);
} }
@ -94,7 +95,7 @@ __attribute__ ((unused))
static void str_toupper(char *str) static void str_toupper(char *str)
{ {
while (*str) { while (*str) {
*str = toupper((unsigned) *str); *str = toupper((unsigned)*str);
++str; ++str;
} }
} }
@ -132,21 +133,21 @@ __attribute__ ((unused))
static void frac_extend(uint8_t *a, uint8_t *b, uint8_t base) static void frac_extend(uint8_t *a, uint8_t *b, uint8_t base)
{ {
*a *= base / *b; *a *= base / *b;
*b = base; *b = base;
} }
#ifdef MODULE_NETSTATS #ifdef MODULE_NETSTATS
static const char *_netstats_module_to_str(uint8_t module) static const char *_netstats_module_to_str(uint8_t module)
{ {
switch (module) { switch (module) {
case NETSTATS_LAYER2: case NETSTATS_LAYER2:
return "Layer 2"; return "Layer 2";
case NETSTATS_IPV6: case NETSTATS_IPV6:
return "IPv6"; return "IPv6";
case NETSTATS_ALL: case NETSTATS_ALL:
return "all"; return "all";
default: default:
return "Unknown"; return "Unknown";
} }
} }
@ -292,203 +293,203 @@ static void _stats_usage(char *cmd_name)
static void _print_netopt(netopt_t opt) static void _print_netopt(netopt_t opt)
{ {
switch (opt) { switch (opt) {
case NETOPT_ADDRESS: case NETOPT_ADDRESS:
printf("(short) address"); printf("(short) address");
break; break;
case NETOPT_ADDRESS_LONG: case NETOPT_ADDRESS_LONG:
printf("long address"); printf("long address");
break; break;
case NETOPT_LORAWAN_APPKEY: case NETOPT_LORAWAN_APPKEY:
printf("AppKey"); printf("AppKey");
break; break;
case NETOPT_LORAWAN_APPSKEY: case NETOPT_LORAWAN_APPSKEY:
printf("AppSKey"); printf("AppSKey");
break; break;
#if IS_USED(MODULE_GNRC_LORAWAN_1_1) #if IS_USED(MODULE_GNRC_LORAWAN_1_1)
case NETOPT_LORAWAN_JOINEUI: case NETOPT_LORAWAN_JOINEUI:
printf("JoinEUI"); printf("JoinEUI");
break; break;
case NETOPT_LORAWAN_NWKKEY: case NETOPT_LORAWAN_NWKKEY:
printf("NwkKey"); printf("NwkKey");
break; break;
case NETOPT_LORAWAN_NWKSENCKEY: case NETOPT_LORAWAN_NWKSENCKEY:
printf("NwkSEncKey"); printf("NwkSEncKey");
break; break;
case NETOPT_LORAWAN_SNWKSINTKEY: case NETOPT_LORAWAN_SNWKSINTKEY:
printf("SNwkSIntKey"); printf("SNwkSIntKey");
break; break;
case NETOPT_LORAWAN_FNWKSINTKEY: case NETOPT_LORAWAN_FNWKSINTKEY:
printf("FNwkSIntKey"); printf("FNwkSIntKey");
break; break;
#else #else
case NETOPT_LORAWAN_APPEUI: case NETOPT_LORAWAN_APPEUI:
printf("AppEUI"); printf("AppEUI");
break; break;
case NETOPT_LORAWAN_NWKSKEY: case NETOPT_LORAWAN_NWKSKEY:
printf("NwkSKey"); printf("NwkSKey");
break; break;
#endif /* IS_USED(MODULE_GNRC_LORAWAN_1_1) */ #endif /* IS_USED(MODULE_GNRC_LORAWAN_1_1) */
case NETOPT_SRC_LEN: case NETOPT_SRC_LEN:
printf("source address length"); printf("source address length");
break; break;
case NETOPT_CHANNEL: case NETOPT_CHANNEL:
printf("channel"); printf("channel");
break; break;
case NETOPT_CHANNEL_FREQUENCY: case NETOPT_CHANNEL_FREQUENCY:
printf("frequency [in Hz]"); printf("frequency [in Hz]");
break; break;
case NETOPT_CHANNEL_PAGE: case NETOPT_CHANNEL_PAGE:
printf("page"); printf("page");
break; break;
case NETOPT_HOP_LIMIT: case NETOPT_HOP_LIMIT:
printf("hop limit"); printf("hop limit");
break; break;
case NETOPT_MAX_PDU_SIZE: case NETOPT_MAX_PDU_SIZE:
printf("MTU"); printf("MTU");
break; break;
case NETOPT_NID: case NETOPT_NID:
printf("network identifier"); printf("network identifier");
break; break;
case NETOPT_TX_POWER: case NETOPT_TX_POWER:
printf("TX power [in dBm]"); printf("TX power [in dBm]");
break; break;
case NETOPT_RETRANS: case NETOPT_RETRANS:
printf("max. retransmissions"); printf("max. retransmissions");
break; break;
case NETOPT_CSMA_RETRIES: case NETOPT_CSMA_RETRIES:
printf("CSMA retries"); printf("CSMA retries");
break; break;
case NETOPT_CCA_THRESHOLD: case NETOPT_CCA_THRESHOLD:
printf("CCA threshold [in dBm]"); printf("CCA threshold [in dBm]");
break; break;
case NETOPT_ENCRYPTION: case NETOPT_ENCRYPTION:
printf("encryption"); printf("encryption");
break; break;
case NETOPT_ENCRYPTION_KEY: case NETOPT_ENCRYPTION_KEY:
printf("encryption key"); printf("encryption key");
break; break;
#ifdef MODULE_GNRC_NETIF_CMD_LORA #ifdef MODULE_GNRC_NETIF_CMD_LORA
case NETOPT_BANDWIDTH: case NETOPT_BANDWIDTH:
printf("bandwidth"); printf("bandwidth");
break; break;
case NETOPT_SPREADING_FACTOR: case NETOPT_SPREADING_FACTOR:
printf("spreading factor"); printf("spreading factor");
break; break;
case NETOPT_CODING_RATE: case NETOPT_CODING_RATE:
printf("coding rate"); printf("coding rate");
break; break;
#endif /* MODULE_GNRC_NETIF_CMD_LORA */ #endif /* MODULE_GNRC_NETIF_CMD_LORA */
#ifdef MODULE_NETDEV_IEEE802154_MULTIMODE #ifdef MODULE_NETDEV_IEEE802154_MULTIMODE
case NETOPT_IEEE802154_PHY: case NETOPT_IEEE802154_PHY:
printf("PHY mode"); printf("PHY mode");
break; break;
#endif /* MODULE_NETDEV_IEEE802154_MULTIMODE */ #endif /* MODULE_NETDEV_IEEE802154_MULTIMODE */
#ifdef MODULE_NETDEV_IEEE802154_OQPSK #ifdef MODULE_NETDEV_IEEE802154_OQPSK
case NETOPT_OQPSK_RATE: case NETOPT_OQPSK_RATE:
printf("high rate"); printf("high rate");
break; break;
#endif /* MODULE_NETDEV_IEEE802154_OQPSK */ #endif /* MODULE_NETDEV_IEEE802154_OQPSK */
#ifdef MODULE_NETDEV_IEEE802154_MR_OQPSK #ifdef MODULE_NETDEV_IEEE802154_MR_OQPSK
case NETOPT_MR_OQPSK_CHIPS: case NETOPT_MR_OQPSK_CHIPS:
printf("chip rate"); printf("chip rate");
break; break;
case NETOPT_MR_OQPSK_RATE: case NETOPT_MR_OQPSK_RATE:
printf("rate mode"); printf("rate mode");
break; break;
#endif /* MODULE_NETDEV_IEEE802154_MR_OQPSK */ #endif /* MODULE_NETDEV_IEEE802154_MR_OQPSK */
#ifdef MODULE_NETDEV_IEEE802154_MR_OFDM #ifdef MODULE_NETDEV_IEEE802154_MR_OFDM
case NETOPT_MR_OFDM_OPTION: case NETOPT_MR_OFDM_OPTION:
printf("OFDM option"); printf("OFDM option");
break; break;
case NETOPT_MR_OFDM_MCS: case NETOPT_MR_OFDM_MCS:
printf("modulation/coding scheme"); printf("modulation/coding scheme");
break; break;
#endif /* MODULE_NETDEV_IEEE802154_MR_OFDM */ #endif /* MODULE_NETDEV_IEEE802154_MR_OFDM */
#ifdef MODULE_NETDEV_IEEE802154_MR_FSK #ifdef MODULE_NETDEV_IEEE802154_MR_FSK
case NETOPT_MR_FSK_MODULATION_INDEX: case NETOPT_MR_FSK_MODULATION_INDEX:
printf("FSK modulation index"); printf("FSK modulation index");
break; break;
case NETOPT_MR_FSK_MODULATION_ORDER: case NETOPT_MR_FSK_MODULATION_ORDER:
printf("FSK modulation order"); printf("FSK modulation order");
break; break;
case NETOPT_MR_FSK_SRATE: case NETOPT_MR_FSK_SRATE:
printf("FSK symbol rate"); printf("FSK symbol rate");
break; break;
case NETOPT_MR_FSK_FEC: case NETOPT_MR_FSK_FEC:
printf("FSK Forward Error Correction"); printf("FSK Forward Error Correction");
break; break;
case NETOPT_CHANNEL_SPACING: case NETOPT_CHANNEL_SPACING:
printf("Channel Spacing"); printf("Channel Spacing");
break; break;
#endif /* MODULE_NETDEV_IEEE802154_MR_FSK */ #endif /* MODULE_NETDEV_IEEE802154_MR_FSK */
case NETOPT_CHECKSUM: case NETOPT_CHECKSUM:
printf("checksum"); printf("checksum");
break; break;
case NETOPT_OTAA: case NETOPT_OTAA:
printf("otaa"); printf("otaa");
break; break;
case NETOPT_LINK_CHECK: case NETOPT_LINK_CHECK:
printf("link check"); printf("link check");
break; break;
case NETOPT_PHY_BUSY: case NETOPT_PHY_BUSY:
printf("PHY busy"); printf("PHY busy");
break; break;
case NETOPT_LORAWAN_DR: case NETOPT_LORAWAN_DR:
printf("datarate"); printf("datarate");
break; break;
case NETOPT_LORAWAN_RX2_DR: case NETOPT_LORAWAN_RX2_DR:
printf("RX2 datarate"); printf("RX2 datarate");
break; break;
default: default:
/* we don't serve these options here */ /* we don't serve these options here */
break; break;
} }
} }
@ -565,7 +566,7 @@ static unsigned _netif_list_flag(netif_t *iface, netopt_t opt, char *str,
{ {
netopt_enable_t enable = NETOPT_DISABLE; netopt_enable_t enable = NETOPT_DISABLE;
int res = netif_get_opt(iface, opt, 0, &enable, int res = netif_get_opt(iface, opt, 0, &enable,
sizeof(enable)); sizeof(enable));
if ((res >= 0) && (enable == NETOPT_ENABLE)) { if ((res >= 0) && (enable == NETOPT_ENABLE)) {
printf("%s", str); printf("%s", str);
@ -603,15 +604,15 @@ static void _netif_list_ipv6(ipv6_addr_t *addr, uint8_t flags)
} }
else { else {
switch (flags & GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_MASK) { switch (flags & GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_MASK) {
case GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_DEPRECATED: case GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_DEPRECATED:
printf(" DPR"); printf(" DPR");
break; break;
case GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID: case GNRC_NETIF_IPV6_ADDRS_FLAGS_STATE_VALID:
printf(" VAL"); printf(" VAL");
break; break;
default: default:
printf(" UNK"); printf(" UNK");
break; break;
} }
} }
_newline(0U, _LINE_THRESHOLD); _newline(0U, _LINE_THRESHOLD);
@ -743,7 +744,8 @@ static void _netif_list(netif_t *iface)
frac_short(&u8, hwaddr); frac_short(&u8, hwaddr);
if (hwaddr[0] == 1) { if (hwaddr[0] == 1) {
printf(" modulation index: %u ", u8); printf(" modulation index: %u ", u8);
} else { }
else {
printf(" modulation index: %u/%u ", u8, hwaddr[0]); printf(" modulation index: %u/%u ", u8, hwaddr[0]);
} }
} }
@ -809,12 +811,12 @@ static void _netif_list(netif_t *iface)
#ifdef MODULE_GNRC_NETIF_CMD_LORA #ifdef MODULE_GNRC_NETIF_CMD_LORA
res = netif_get_opt(iface, NETOPT_DEMOD_MARGIN, 0, &u8, sizeof(u8)); res = netif_get_opt(iface, NETOPT_DEMOD_MARGIN, 0, &u8, sizeof(u8));
if (res >= 0) { if (res >= 0) {
printf(" Demod margin.: %u ", (unsigned) u8); printf(" Demod margin.: %u ", (unsigned)u8);
line_thresh++; line_thresh++;
} }
res = netif_get_opt(iface, NETOPT_NUM_GATEWAYS, 0, &u8, sizeof(u8)); res = netif_get_opt(iface, NETOPT_NUM_GATEWAYS, 0, &u8, sizeof(u8));
if (res >= 0) { if (res >= 0) {
printf(" Num gateways.: %u ", (unsigned) u8); printf(" Num gateways.: %u ", (unsigned)u8);
line_thresh++; line_thresh++;
} }
#endif #endif
@ -888,24 +890,24 @@ static void _netif_list(netif_t *iface)
#ifdef MODULE_GNRC_IPV6 #ifdef MODULE_GNRC_IPV6
printf("Link type: %s", printf("Link type: %s",
(netif_get_opt(iface, NETOPT_IS_WIRED, 0, &u16, sizeof(u16)) > 0) ? (netif_get_opt(iface, NETOPT_IS_WIRED, 0, &u16, sizeof(u16)) > 0) ?
"wired" : "wireless"); "wired" : "wireless");
_newline(0U, ++line_thresh); _newline(0U, ++line_thresh);
res = netif_get_opt(iface, NETOPT_IPV6_ADDR, 0, ipv6_addrs, res = netif_get_opt(iface, NETOPT_IPV6_ADDR, 0, ipv6_addrs,
sizeof(ipv6_addrs)); sizeof(ipv6_addrs));
if (res >= 0) { if (res >= 0) {
uint8_t ipv6_addrs_flags[CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF]; uint8_t ipv6_addrs_flags[CONFIG_GNRC_NETIF_IPV6_ADDRS_NUMOF];
memset(ipv6_addrs_flags, 0, sizeof(ipv6_addrs_flags)); memset(ipv6_addrs_flags, 0, sizeof(ipv6_addrs_flags));
/* assume it to succeed (otherwise array will stay 0) */ /* assume it to succeed (otherwise array will stay 0) */
netif_get_opt(iface, NETOPT_IPV6_ADDR_FLAGS, 0, ipv6_addrs_flags, netif_get_opt(iface, NETOPT_IPV6_ADDR_FLAGS, 0, ipv6_addrs_flags,
sizeof(ipv6_addrs_flags)); sizeof(ipv6_addrs_flags));
/* yes, the res of NETOPT_IPV6_ADDR is meant to be here ;-) */ /* yes, the res of NETOPT_IPV6_ADDR is meant to be here ;-) */
for (unsigned i = 0; i < (res / sizeof(ipv6_addr_t)); i++) { for (unsigned i = 0; i < (res / sizeof(ipv6_addr_t)); i++) {
_netif_list_ipv6(&ipv6_addrs[i], ipv6_addrs_flags[i]); _netif_list_ipv6(&ipv6_addrs[i], ipv6_addrs_flags[i]);
} }
} }
res = netif_get_opt(iface, NETOPT_IPV6_GROUP, 0, ipv6_groups, res = netif_get_opt(iface, NETOPT_IPV6_GROUP, 0, ipv6_groups,
sizeof(ipv6_groups)); sizeof(ipv6_groups));
if (res >= 0) { if (res >= 0) {
for (unsigned i = 0; i < (res / sizeof(ipv6_addr_t)); i++) { for (unsigned i = 0; i < (res / sizeof(ipv6_addr_t)); i++) {
_netif_list_groups(&ipv6_groups[i]); _netif_list_groups(&ipv6_groups[i]);
@ -1087,11 +1089,13 @@ static int _netif_set_fsk_fec(netif_t *iface, char *value)
static int _netif_set_fsk_modulation_index(netif_t *iface, char *value) static int _netif_set_fsk_modulation_index(netif_t *iface, char *value)
{ {
uint8_t a, b; uint8_t a, b;
char* frac = strchr(value, '/'); char *frac = strchr(value, '/');
if (frac) { if (frac) {
*frac = 0; *frac = 0;
b = atoi(frac + 1); b = atoi(frac + 1);
} else { }
else {
b = 1; b = 1;
} }
a = atoi(value); a = atoi(value);
@ -1099,10 +1103,12 @@ static int _netif_set_fsk_modulation_index(netif_t *iface, char *value)
frac_extend(&a, &b, 64); frac_extend(&a, &b, 64);
int res = netif_set_opt(iface, NETOPT_MR_FSK_MODULATION_INDEX, 0, &a, sizeof(uint8_t)); int res = netif_set_opt(iface, NETOPT_MR_FSK_MODULATION_INDEX, 0, &a, sizeof(uint8_t));
if (res < 0) { if (res < 0) {
printf("error: unable to set modulation index to %d/%d\n", a, b); printf("error: unable to set modulation index to %d/%d\n", a, b);
return 1; return 1;
} else { }
else {
printf("success: set modulation index to %d/%d\n", res, b); printf("success: set modulation index to %d/%d\n", res, b);
} }
@ -1253,20 +1259,21 @@ static int _netif_set_lw_key(netif_t *iface, netopt_t opt, char *key_str)
size_t key_len = fmt_hex_bytes(key, key_str); size_t key_len = fmt_hex_bytes(key, key_str);
size_t expected_len; size_t expected_len;
switch (opt) { switch (opt) {
case NETOPT_LORAWAN_APPKEY: case NETOPT_LORAWAN_APPKEY:
case NETOPT_LORAWAN_APPSKEY: case NETOPT_LORAWAN_APPSKEY:
case NETOPT_LORAWAN_NWKSKEY: case NETOPT_LORAWAN_NWKSKEY:
case NETOPT_LORAWAN_NWKKEY: case NETOPT_LORAWAN_NWKKEY:
case NETOPT_LORAWAN_SNWKSINTKEY: case NETOPT_LORAWAN_SNWKSINTKEY:
case NETOPT_LORAWAN_FNWKSINTKEY: case NETOPT_LORAWAN_FNWKSINTKEY:
case NETOPT_LORAWAN_NWKSENCKEY: case NETOPT_LORAWAN_NWKSENCKEY:
/* All keys have the same length as the APP KEY */ /* All keys have the same length as the APP KEY */
expected_len = LORAMAC_APPKEY_LEN; expected_len = LORAMAC_APPKEY_LEN;
break; break;
default: default:
/* Same rationale here */ /* Same rationale here */
expected_len = LORAMAC_DEVEUI_LEN; expected_len = LORAMAC_DEVEUI_LEN;
} }
if (!key_len || key_len != expected_len) { if (!key_len || key_len != expected_len) {
puts("error: unable to parse key.\n"); puts("error: unable to parse key.\n");
@ -1358,7 +1365,8 @@ static int _netif_set_state(netif_t *iface, char *state_str)
return 0; return 0;
} }
static int _hex_to_int(char c) { static int _hex_to_int(char c)
{
if ('0' <= c && c <= '9') { if ('0' <= c && c <= '9') {
return c - '0'; return c - '0';
} }
@ -1870,7 +1878,8 @@ int _gnrc_netif_config(int argc, char **argv)
(strcmp(argv[1], "--help") == 0)) { (strcmp(argv[1], "--help") == 0)) {
_usage(argv[0]); _usage(argv[0]);
return 0; return 0;
} else { }
else {
puts("error: invalid interface given"); puts("error: invalid interface given");
return 1; return 1;
} }

6
tests/gnrc_lorawan/main.c
View File

@ -70,7 +70,8 @@ static void test_gnrc_lorawan__validate_mic(void)
/* Uplink packet */ /* Uplink packet */
le_uint32_t calc_mic; le_uint32_t calc_mic;
gnrc_lorawan_t mac = {0}; gnrc_lorawan_t mac = { 0 };
memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr)); memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr));
mac.ctx.fnwksintkey = nwkskey; mac.ctx.fnwksintkey = nwkskey;
mac.mcps.fcnt = fcnt; mac.mcps.fcnt = fcnt;
@ -89,7 +90,8 @@ static void test_gnrc_lorawan__wrong_mic(void)
/* Uplink packet */ /* Uplink packet */
le_uint32_t calc_mic; le_uint32_t calc_mic;
gnrc_lorawan_t mac = {0}; gnrc_lorawan_t mac = { 0 };
memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr)); memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr));
mac.ctx.fnwksintkey = nwkskey; mac.ctx.fnwksintkey = nwkskey;
mac.mcps.fcnt = fcnt; mac.mcps.fcnt = fcnt;

12
tests/gnrc_lorawan_11/main.c
View File

@ -25,9 +25,11 @@ static uint8_t snwksintkey[] =
{ 0xc0, 0x9f, 0x9e, 0x9a, 0x13, 0x91, 0xae, 0xcc, 0x54, 0xdb, 0x49, 0x0e, 0x11, 0x26, 0x1f, 0x21 }; { 0xc0, 0x9f, 0x9e, 0x9a, 0x13, 0x91, 0xae, 0xcc, 0x54, 0xdb, 0x49, 0x0e, 0x11, 0x26, 0x1f, 0x21 };
static uint8_t lorawan_packet_no_mic[] = static uint8_t lorawan_packet_no_mic[] =
{ 0x40, 0x30, 0xe2, 0xde, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3b, 0xc5, 0xf0, 0xa0, 0x69, 0x49, 0x66, 0xee, 0x00, 0xc1, 0xaa, 0x0d, 0xee, 0x20 }; { 0x40, 0x30, 0xe2, 0xde, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3b, 0xc5, 0xf0, 0xa0, 0x69, 0x49, 0x66,
0xee, 0x00, 0xc1, 0xaa, 0x0d, 0xee, 0x20 };
static uint8_t lorawan_packet_wrong[] = static uint8_t lorawan_packet_wrong[] =
{ 0x40, 0x30, 0xe2, 0xde, 0x00, 0x00, 0x00, 0xaa, 0x01, 0x3b, 0xc5, 0xf0, 0xa0, 0x69, 0x49, 0x66, 0xee, 0x00, 0xc1, 0xaa, 0x0d, 0xee, 0x20 }; { 0x40, 0x30, 0xe2, 0xde, 0x00, 0x00, 0x00, 0xaa, 0x01, 0x3b, 0xc5, 0xf0, 0xa0, 0x69, 0x49, 0x66,
0xee, 0x00, 0xc1, 0xaa, 0x0d, 0xee, 0x20 };
static uint8_t mic[] = { 0x12, 0xcd, 0x3c, 0x8a }; static uint8_t mic[] = { 0x12, 0xcd, 0x3c, 0x8a };
static le_uint32_t dev_addr = { static le_uint32_t dev_addr = {
@ -76,7 +78,8 @@ static void test_gnrc_lorawan__validate_mic(void)
/* Uplink packet */ /* Uplink packet */
le_uint32_t calc_mic; le_uint32_t calc_mic;
gnrc_lorawan_t mac = {0}; gnrc_lorawan_t mac = { 0 };
memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr)); memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr));
mac.ctx.fnwksintkey = fnwksintkey; mac.ctx.fnwksintkey = fnwksintkey;
mac.ctx.snwksintkey = snwksintkey; mac.ctx.snwksintkey = snwksintkey;
@ -99,7 +102,8 @@ static void test_gnrc_lorawan__wrong_mic(void)
/* Uplink packet */ /* Uplink packet */
le_uint32_t calc_mic; le_uint32_t calc_mic;
gnrc_lorawan_t mac = {0}; gnrc_lorawan_t mac = { 0 };
memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr)); memcpy(&mac.dev_addr, &dev_addr, sizeof(dev_addr));
mac.ctx.fnwksintkey = fnwksintkey; mac.ctx.fnwksintkey = fnwksintkey;
mac.ctx.snwksintkey = snwksintkey; mac.ctx.snwksintkey = snwksintkey;