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

Merge pull request #2964 from authmillenon/icmpv6/enh/listed-payload

Browse Source 
icmpv6: add ability to add listed payload in ng_icmpv6_build
This commit is contained in:
Martine Lenders 2015-05-12 20:01:30 +02:00
commit 87e5f3acaa
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/include/net/ng_icmpv6.h
View File

@ -66,6 +66,7 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt);
/**
* @brief Builds an ICMPv6 message for sending.
*
* @param[in] next Next packet snip in the new packet.
* @param[in] type Type for the ICMPv6 message.
* @param[in] code Code for the ICMPv6 message.
* @param[in] size Size of the ICMPv6 message (needs do be >
@ -74,7 +75,7 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt);
* @return The ICMPv6 message on success
* @return NULL, on failure
*/
ng_pktsnip_t *ng_icmpv6_build(uint8_t type, uint8_t code, size_t size);
ng_pktsnip_t *ng_icmpv6_build(ng_pktsnip_t *next, uint8_t type, uint8_t code, size_t size);
/* TODO: build error messages */

2
sys/net/network_layer/ng_icmpv6/echo/ng_icmpv6_echo.c
View File

@ -27,7 +27,7 @@ ng_pktsnip_t *ng_icmpv6_echo_build(uint8_t type, uint16_t id, uint16_t seq,
ng_pktsnip_t *pkt;
ng_icmpv6_echo_t *echo;
if ((pkt = ng_icmpv6_build(type, 0, data_len + sizeof(ng_icmpv6_echo_t))) == NULL) {
if ((pkt = ng_icmpv6_build(NULL, type, 0, data_len + sizeof(ng_icmpv6_echo_t))) == NULL) {
return NULL;
}

5
sys/net/network_layer/ng_icmpv6/ng_icmpv6.c
View File

@ -126,12 +126,13 @@ void ng_icmpv6_demux(kernel_pid_t iface, ng_pktsnip_t *pkt)
}
}
ng_pktsnip_t *ng_icmpv6_build(uint8_t type, uint8_t code, size_t size)
ng_pktsnip_t *ng_icmpv6_build(ng_pktsnip_t *next, uint8_t type, uint8_t code,
size_t size)
{
ng_pktsnip_t *pkt;
ng_icmpv6_hdr_t *icmpv6;
pkt = ng_pktbuf_add(NULL, NULL, size, NG_NETTYPE_ICMPV6);
pkt = ng_pktbuf_add(next, NULL, size, NG_NETTYPE_ICMPV6);
if (pkt == NULL) {
DEBUG("icmpv6_echo: no space left in packet buffer\n");