riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10905 from maribu/packet_size_l2_pdu

Browse Source 
net: NETOPT_MAX_{PACKET_SIZE -> PDU_SIZE}
This commit is contained in:
Martine Lenders 2019-02-22 15:23:00 +01:00 committed by GitHub
commit 727a843ce4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/esp_common/esp-now/esp_now_netdev.c
View File

@ -627,7 +627,7 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
break;
#endif
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
CHECK_PARAM_RET(max_len >= sizeof(uint16_t), -EOVERFLOW);
*((uint16_t *)val) = ESP_NOW_MAX_SIZE;
res = sizeof(uint16_t);

2
cpu/nrf5x_common/radio/nrfmin/nrfmin.c
View File

@ -473,7 +473,7 @@ static int nrfmin_get(netdev_t *dev, netopt_t opt, void *val, size_t max_len)
assert(max_len >= sizeof(int16_t));
*((int16_t *)val) = nrfmin_get_txpower();
return sizeof(int16_t);
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
assert(max_len >= sizeof(uint16_t));
*((uint16_t *)val) = NRFMIN_PAYLOAD_MAX;
return sizeof(uint16_t);

2
drivers/cc110x/cc110x-netdev.c
View File

@ -109,7 +109,7 @@ static int _get(netdev_t *dev, netopt_t opt, void *value, size_t value_len)
assert(value_len > 0);
*((uint8_t *)value) = cc110x->radio_address;
return sizeof(uint8_t);
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
assert(value_len > 0);
*((uint16_t *)value) = CC110X_PACKET_LENGTH - CC110X_L2_HDR_SIZE;
return sizeof(uint16_t);

2
drivers/netdev_eth/netdev_eth.c
View File

@ -63,7 +63,7 @@ int netdev_eth_get(netdev_t *dev, netopt_t opt, void *value, size_t max_len)
res = sizeof(uint16_t);
break;
}
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
{
assert(max_len >= 2);
uint16_t *val = (uint16_t*) value;

2
drivers/netdev_ieee802154/netdev_ieee802154.c
View File

@ -150,7 +150,7 @@ int netdev_ieee802154_get(netdev_ieee802154_t *dev, netopt_t opt, void *value,
res = sizeof(l2filter_t **);
break;
#endif
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
assert(max_len >= sizeof(int16_t));
*((uint16_t *)value) = (IEEE802154_FRAME_LEN_MAX -
IEEE802154_MAX_HDR_LEN) -

4
drivers/sx127x/sx127x_netdev.c
View File

@ -333,7 +333,7 @@ static int _get(netdev_t *netdev, netopt_t opt, void *val, size_t max_len)
*((uint8_t*) val) = sx127x_get_coding_rate(dev);
return sizeof(uint8_t);
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
assert(max_len >= sizeof(uint8_t));
*((uint8_t*) val) = sx127x_get_max_payload_len(dev);
return sizeof(uint8_t);
@ -437,7 +437,7 @@ static int _set(netdev_t *netdev, netopt_t opt, const void *val, size_t len)
sx127x_set_coding_rate(dev, cr);
return sizeof(uint8_t);
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
assert(len <= sizeof(uint8_t));
sx127x_set_max_payload_len(dev, *((const uint8_t*) val));
return sizeof(uint8_t);

2
drivers/xbee/xbee.c
View File

@ -770,7 +770,7 @@ static int xbee_get(netdev_t *ndev, netopt_t opt, void *value, size_t max_len)
return sizeof(eui64_t);
case NETOPT_CHANNEL:
return _get_channel(dev, (uint8_t *)value, max_len);
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
if (max_len < sizeof(uint16_t)) {
return -EOVERFLOW;
}

12
sys/include/net/netopt.h
View File

@ -29,6 +29,14 @@
extern "C" {
#endif
/**
* @brief A deprecated alias for @ref NETOPT_MAX_PDU_SIZE
*
* @deprecated Please use @ref NETOPT_MAX_PDU_SIZE instead of
* `NETOPT_MAX_PACKET_SIZE`
*/
#define NETOPT_MAX_PACKET_SIZE NETOPT_MAX_PDU_SIZE
/**
* @brief Global list of configuration options available throughout the
* network stack, e.g. by netdev and netapi
@ -171,9 +179,9 @@ typedef enum {
*/
NETOPT_TX_POWER,
/**
* @brief (uint16_t) maximum packet size a network module can handle
* @brief (uint16_t) maximum protocol data unit
*/
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
/**
* @brief (@ref netopt_enable_t) frame preloading
*

2
sys/net/crosslayer/netopt/netopt.c
View File

@ -41,7 +41,7 @@ static const char *_netopt_strmap[] = {
[NETOPT_IPV6_FORWARDING] = "NETOPT_IPV6_FORWARDING",
[NETOPT_IPV6_SND_RTR_ADV] = "NETOPT_IPV6_SND_RTR_ADV",
[NETOPT_TX_POWER] = "NETOPT_TX_POWER",
[NETOPT_MAX_PACKET_SIZE] = "NETOPT_MAX_PACKET_SIZE",
[NETOPT_MAX_PDU_SIZE] = "NETOPT_MAX_PDU_SIZE",
[NETOPT_PRELOADING] = "NETOPT_PRELOADING",
[NETOPT_PROMISCUOUSMODE] = "NETOPT_PROMISCUOUSMODE",
[NETOPT_AUTOACK] = "NETOPT_AUTOACK",

2
sys/net/gnrc/application_layer/tftp/gnrc_tftp.c
View File

@ -256,7 +256,7 @@ static uint16_t _tftp_get_maximum_block_size(void)
uint16_t tmp;
gnrc_netif_t *netif = gnrc_netif_iter(NULL);
if ((netif != NULL) && gnrc_netapi_get(netif->pid, NETOPT_MAX_PACKET_SIZE,
if ((netif != NULL) && gnrc_netapi_get(netif->pid, NETOPT_MAX_PDU_SIZE,
0, &tmp, sizeof(uint16_t)) >= 0) {
/* TODO calculate proper block size */
return tmp - sizeof(udp_hdr_t) - sizeof(ipv6_hdr_t) - 10;

4
sys/net/gnrc/netif/gnrc_netif.c
View File

@ -192,7 +192,7 @@ int gnrc_netif_get_from_netdev(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
assert(opt->data_len >= sizeof(eui64_t));
res = gnrc_netif_ipv6_get_iid(netif, opt->data);
break;
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
if (opt->context == GNRC_NETTYPE_IPV6) {
assert(opt->data_len == sizeof(uint16_t));
*((uint16_t *)opt->data) = netif->ipv6.mtu;
@ -285,7 +285,7 @@ int gnrc_netif_set_from_netdev(gnrc_netif_t *netif,
gnrc_netif_ipv6_group_leave_internal(netif, opt->data);
res = sizeof(ipv6_addr_t);
break;
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
if (opt->context == GNRC_NETTYPE_IPV6) {
assert(opt->data_len == sizeof(uint16_t));
netif->ipv6.mtu = *((uint16_t *)opt->data);

4
sys/net/gnrc/netif/gnrc_netif_device_type.c
View File

@ -149,7 +149,7 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
#endif
/* intentionally falls through */
case NETDEV_TYPE_ESP_NOW:
res = dev->driver->get(dev, NETOPT_MAX_PACKET_SIZE,
res = dev->driver->get(dev, NETOPT_MAX_PDU_SIZE,
&tmp, sizeof(tmp));
assert(res == sizeof(tmp));
#ifdef MODULE_GNRC_SIXLOWPAN
@ -184,7 +184,7 @@ void gnrc_netif_ipv6_init_mtu(gnrc_netif_t *netif)
LOG_DEBUG("gnrc_netif: getting MTU from device for interface %i\n",
netif->pid);
#endif
res = dev->driver->get(dev, NETOPT_MAX_PACKET_SIZE,
res = dev->driver->get(dev, NETOPT_MAX_PDU_SIZE,
&tmp, sizeof(tmp));
if (res < 0) {
/* assume maximum possible transition unit */

8
sys/shell/commands/sc_gnrc_netif.c
View File

@ -237,7 +237,7 @@ static void _print_netopt(netopt_t opt)
printf("hop limit");
break;
case NETOPT_MAX_PACKET_SIZE:
case NETOPT_MAX_PDU_SIZE:
printf("MTU");
break;
@ -505,13 +505,13 @@ static void _netif_list(kernel_pid_t iface)
line_thresh);
line_thresh = _netif_list_flag(iface, NETOPT_CHANNEL_HOP, "CHAN_HOP",
line_thresh);
res = gnrc_netapi_get(iface, NETOPT_MAX_PACKET_SIZE, 0, &u16, sizeof(u16));
res = gnrc_netapi_get(iface, NETOPT_MAX_PDU_SIZE, 0, &u16, sizeof(u16));
if (res > 0) {
printf("L2-PDU:%" PRIu16 " ", u16);
line_thresh++;
}
#ifdef MODULE_GNRC_IPV6
res = gnrc_netapi_get(iface, NETOPT_MAX_PACKET_SIZE, GNRC_NETTYPE_IPV6, &u16, sizeof(u16));
res = gnrc_netapi_get(iface, NETOPT_MAX_PDU_SIZE, GNRC_NETTYPE_IPV6, &u16, sizeof(u16));
if (res > 0) {
printf("MTU:%" PRIu16 " ", u16);
line_thresh++;
@ -1040,7 +1040,7 @@ static int _netif_set(char *cmd_name, kernel_pid_t iface, char *key, char *value
}
#ifdef MODULE_GNRC_IPV6
else if (strcmp("mtu", key) == 0) {
return _netif_set_u16(iface, NETOPT_MAX_PACKET_SIZE, GNRC_NETTYPE_IPV6,
return _netif_set_u16(iface, NETOPT_MAX_PDU_SIZE, GNRC_NETTYPE_IPV6,
value);
}
#endif

2
tests/driver_at86rf2xx/cmd.c
View File

@ -61,7 +61,7 @@ int ifconfig_list(int idx)
}
printf(", Source address length: %u", (unsigned)u16_val);
res = get((netdev_t *)dev, NETOPT_MAX_PACKET_SIZE, &u16_val,
res = get((netdev_t *)dev, NETOPT_MAX_PDU_SIZE, &u16_val,
sizeof(u16_val));
if (res < 0) {
puts("(err)");

2
tests/gnrc_ipv6_nib/main.c
View File

@ -1366,7 +1366,7 @@ int _mock_netif_get(gnrc_netapi_opt_t *opt)
return sizeof(_loc_l2);
case NETOPT_IS_WIRED:
return 1;
case NETOPT_MAX_PACKET_SIZE: {
case NETOPT_MAX_PDU_SIZE: {
uint16_t *val = opt->data;
if (opt->data_len != sizeof(uint16_t)) {
return -EOVERFLOW;

2
tests/gnrc_ipv6_nib/mockup_netif.c
View File

@ -74,7 +74,7 @@ void _tests_init(void)
netdev_test_setup(&_mock_netdev, 0);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_DEVICE_TYPE,
_get_device_type);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
_get_max_packet_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_ADDRESS,
_get_address);

6
tests/gnrc_ipv6_nib_6ln/main.c
View File

@ -1075,11 +1075,9 @@ static void test_handle_pkt__rtr_adv__success(uint8_t rtr_adv_flags,
TEST_ASSERT((_PIO_PFX_LTIME / MS_PER_SEC) < prefix.pref_until);
}
}
if (!pio) {
if (!pio) {
else {
TEST_ASSERT_EQUAL_INT(exp_addr_count,
_netif_addr_count(_mock_netif));
}
TEST_ASSERT_MESSAGE(!gnrc_ipv6_nib_pl_iter(0, &state, &prefix),
"There is an unexpected prefix list entry");
}
@ -1333,7 +1331,7 @@ int _mock_netif_get(gnrc_netapi_opt_t *opt)
return sizeof(_loc_iid);
case NETOPT_IS_WIRED:
return 1;
case NETOPT_MAX_PACKET_SIZE: {
case NETOPT_MAX_PDU_SIZE: {
uint16_t *val = opt->data;
if (opt->data_len != sizeof(uint16_t)) {
return -EOVERFLOW;

2
tests/gnrc_ipv6_nib_6ln/mockup_netif.c
View File

@ -83,7 +83,7 @@ void _tests_init(void)
netdev_test_setup(&_mock_netdev, 0);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_DEVICE_TYPE,
_get_device_type);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&_mock_netdev, NETOPT_MAX_PDU_SIZE,
_get_max_packet_size);
netdev_test_set_get_cb(&_mock_netdev, NETOPT_SRC_LEN,
_get_src_len);

2
tests/gnrc_ndp/main.c
View File

@ -973,7 +973,7 @@ static int _test_netif_get(gnrc_netif_t *netif, gnrc_netapi_opt_t *opt)
return sizeof(uint64_t);
case NETOPT_IS_WIRED:
return 1;
case NETOPT_MAX_PACKET_SIZE: {
case NETOPT_MAX_PDU_SIZE: {
uint16_t *val = opt->data;
if (opt->data_len != sizeof(uint16_t)) {
return -EOVERFLOW;

6
tests/gnrc_netif/common.c
View File

@ -158,7 +158,7 @@ void _tests_init(void)
netdev_test_set_isr_cb((netdev_test_t *)ethernet_dev, _netdev_isr);
netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_DEVICE_TYPE,
_get_netdev_device_type);
netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb((netdev_test_t *)ethernet_dev, NETOPT_MAX_PDU_SIZE,
_get_netdev_max_packet_size);
netdev_test_setup((netdev_test_t *)ieee802154_dev, (void *)1);
netdev_test_set_send_cb((netdev_test_t *)ieee802154_dev, _dump_send_packet);
@ -167,13 +167,13 @@ void _tests_init(void)
netdev_test_set_get_cb((netdev_test_t *)ieee802154_dev, NETOPT_DEVICE_TYPE,
_get_netdev_device_type);
netdev_test_set_get_cb((netdev_test_t *)ieee802154_dev,
NETOPT_MAX_PACKET_SIZE, _get_netdev_max_packet_size);
NETOPT_MAX_PDU_SIZE, _get_netdev_max_packet_size);
for (intptr_t i = SPECIAL_DEVS; i < GNRC_NETIF_NUMOF; i++) {
devs[i - SPECIAL_DEVS] = (netdev_t *)&_devs[i];
netdev_test_setup(&_devs[i], (void *)i);
netdev_test_set_get_cb(&_devs[i], NETOPT_DEVICE_TYPE,
_get_netdev_device_type);
netdev_test_set_get_cb(&_devs[i], NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&_devs[i], NETOPT_MAX_PDU_SIZE,
_get_netdev_max_packet_size);
}
gnrc_netreg_entry_init_pid(&dumper_undef, GNRC_NETREG_DEMUX_CTX_ALL,

16
tests/gnrc_netif/main.c
View File

@ -774,32 +774,32 @@ static void test_netapi_get__MAX_PACKET_SIZE(void)
uint16_t value;
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ethernet_netif->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_IPV6,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(ETHERNET_DATA_LEN, value);
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ethernet_netif->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_NETIF,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(ETHERNET_DATA_LEN, value);
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ieee802154_netif->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_IPV6,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(ieee802154_netif->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_NETIF,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(TEST_IEEE802154_MAX_FRAG_SIZE, value);
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(netifs[0]->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_IPV6,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
TEST_ASSERT_EQUAL_INT(sizeof(uint16_t), gnrc_netapi_get(netifs[0]->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_NETIF,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(IPV6_MIN_MTU, value);
@ -935,13 +935,13 @@ static void test_netapi_set__MAX_PACKET_SIZE(void)
TEST_ASSERT_EQUAL_INT(sizeof(value),
gnrc_netapi_set(netifs[0]->pid,
NETOPT_MAX_PACKET_SIZE,
NETOPT_MAX_PDU_SIZE,
GNRC_NETTYPE_IPV6,
&value, sizeof(value)));
TEST_ASSERT_EQUAL_INT(value, netifs[0]->ipv6.mtu);
TEST_ASSERT_EQUAL_INT(-ENOTSUP,
gnrc_netapi_set(netifs[0]->pid,
NETOPT_MAX_PACKET_SIZE, 0,
NETOPT_MAX_PDU_SIZE, 0,
&value, sizeof(value)));
}

2
tests/gnrc_sixlowpan/main.c
View File

@ -91,7 +91,7 @@ static void _init_interface(void)
netdev_test_setup(&_ieee802154_dev, NULL);
netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_DEVICE_TYPE,
_get_netdev_device_type);
netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_MAX_PDU_SIZE,
_get_netdev_max_packet_size);
netdev_test_set_get_cb(&_ieee802154_dev, NETOPT_SRC_LEN,
_get_netdev_src_len);

4
tests/lwip_sock_ip/stack.c
View File

@ -60,7 +60,7 @@ static inline void _get_iid(uint8_t *iid)
static int _get_max_pkt_size(netdev_t *dev, void *value, size_t max_len)
{
return netdev_eth_get(dev, NETOPT_MAX_PACKET_SIZE, value, max_len);
return netdev_eth_get(dev, NETOPT_MAX_PDU_SIZE, value, max_len);
}
static int _get_src_len(netdev_t *dev, void *value, size_t max_len)
@ -172,7 +172,7 @@ void _net_init(void)
netdev_test_setup(&netdev, NULL);
netdev_test_set_get_cb(&netdev, NETOPT_SRC_LEN, _get_src_len);
netdev_test_set_get_cb(&netdev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&netdev, NETOPT_MAX_PDU_SIZE,
_get_max_pkt_size);
netdev_test_set_get_cb(&netdev, NETOPT_ADDRESS, _get_addr);
netdev_test_set_get_cb(&netdev, NETOPT_ADDR_LEN,

4
tests/lwip_sock_udp/stack.c
View File

@ -61,7 +61,7 @@ static inline void _get_iid(uint8_t *iid)
static int _get_max_pkt_size(netdev_t *dev, void *value, size_t max_len)
{
return netdev_eth_get(dev, NETOPT_MAX_PACKET_SIZE, value, max_len);
return netdev_eth_get(dev, NETOPT_MAX_PDU_SIZE, value, max_len);
}
static int _get_src_len(netdev_t *dev, void *value, size_t max_len)
@ -174,7 +174,7 @@ void _net_init(void)
netdev_test_setup(&netdev, NULL);
netdev_test_set_get_cb(&netdev, NETOPT_SRC_LEN, _get_src_len);
netdev_test_set_get_cb(&netdev, NETOPT_MAX_PACKET_SIZE,
netdev_test_set_get_cb(&netdev, NETOPT_MAX_PDU_SIZE,
_get_max_pkt_size);
netdev_test_set_get_cb(&netdev, NETOPT_ADDRESS, _get_addr);
netdev_test_set_get_cb(&netdev, NETOPT_ADDR_LEN,