patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

net: icmp: Allow to autogenerate Echo Request payload

Browse source 
Let net_icmpv4_send_echo_request() and net_icmpv6_send_echo_request()
autogenerate Echo Request payload, in case data length is specified but
no data pointer provided. The autogenerated payload includes timestamp
(if payload size permits) so that the turnround time can be calculated.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
This commit is contained in:
Robert Lubos 2022-11-17 14:33:07 +01:00 committed by Anas Nashif
parent 1ad63d9c13
commit 967a91dce5
4 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
subsys/net/ip/icmpv4.c
View file

@ -555,7 +555,24 @@ int net_icmpv4_send_echo_request(struct net_if *iface,
echo_req->sequence = htons(sequence);
net_pkt_set_data(pkt, &icmpv4_access);
net_pkt_write(pkt, data, data_size);
if (data != NULL && data_size > 0) {
net_pkt_write(pkt, data, data_size);
} else if (data == NULL && data_size > 0) {
/* Generate payload. */
if (data_size >= sizeof(uint32_t)) {
uint32_t time_stamp = htonl(k_cycle_get_32());
net_pkt_write(pkt, &time_stamp, sizeof(time_stamp));
data_size -= sizeof(time_stamp);
}
for (size_t i = 0; i < data_size; i++) {
net_pkt_write_u8(pkt, (uint8_t)i);
}
} else {
/* No payload. */
}
net_pkt_cursor_init(pkt);

6
subsys/net/ip/icmpv4.h
View file

@ -69,8 +69,10 @@ int net_icmpv4_send_error(struct net_pkt *pkt, uint8_t type, uint8_t code);
* @param tos IPv4 Type-of-service field value. Represents combined DSCP and ECN
* values.
* @param data Arbitrary payload data that will be included in the
* Echo Reply verbatim. May be zero.
* @param data_size Size of the Payload Data in bytes. May be zero.
* Echo Reply verbatim. May be NULL.
* @param data_size Size of the Payload Data in bytes. May be zero. In case data
* pointer is NULL, the function will generate the payload up to the requested
* size.
*
* @return Return 0 if the sending succeed, <0 otherwise.
*/

19
subsys/net/ip/icmpv6.c
View file

@ -380,7 +380,24 @@ int net_icmpv6_send_echo_request(struct net_if *iface,
echo_req->sequence = htons(sequence);
net_pkt_set_data(pkt, &icmpv6_access);
net_pkt_write(pkt, data, data_size);
if (data != NULL && data_size > 0) {
net_pkt_write(pkt, data, data_size);
} else if (data == NULL && data_size > 0) {
/* Generate payload. */
if (data_size >= sizeof(uint32_t)) {
uint32_t time_stamp = htonl(k_cycle_get_32());
net_pkt_write(pkt, &time_stamp, sizeof(time_stamp));
data_size -= sizeof(time_stamp);
}
for (size_t i = 0; i < data_size; i++) {
net_pkt_write_u8(pkt, (uint8_t)i);
}
} else {
/* No payload. */
}
net_pkt_cursor_init(pkt);
net_ipv6_finalize(pkt, IPPROTO_ICMPV6);

6
subsys/net/ip/icmpv6.h
View file

@ -201,8 +201,10 @@ int net_icmpv6_send_error(struct net_pkt *pkt, uint8_t type, uint8_t code,
* @param tc IPv6 Traffic Class field value. Represents combined DSCP and
* ECN values.
* @param data Arbitrary payload data that will be included in the
* Echo Reply verbatim. May be zero.
* @param data_size Size of the Payload Data in bytes. May be zero.
* Echo Reply verbatim. May be NULL.
* @param data_size Size of the Payload Data in bytes. May be zero. In case data
* pointer is NULL, the function will generate the payload up to the requested
* size.
*
* @return Return 0 if the sending succeed, <0 otherwise.
*/