Changeset d5a89a3 in mainline for uspace/srv/net

Timestamp:

2019-02-11T22:31:04Z (7 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

aaf9789c

Parents:

e3272101 (diff), 4805495 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merging with upstream/master

Location:

uspace/srv/net/inetsrv

Files:

• icmp.c (modified) (1 diff)
• icmpv6.c (modified) (1 diff)
• pdu.c (modified) (1 diff)

uspace/srv/net/inetsrv/icmp.c

@@ -133 +133 @@
         sdu.dest = dgram->dest;
         sdu.seq_no = uint16_t_be2host(reply->seq_no);
-        sdu.data = reply + sizeof(icmp_echo_t);
+        sdu.data = dgram->data + sizeof(icmp_echo_t);
         sdu.size = dgram->size - sizeof(icmp_echo_t);
 

uspace/srv/net/inetsrv/icmpv6.c

@@ -124 +124 @@
 
         sdu.seq_no = uint16_t_be2host(reply->un.echo.seq_no);
-        sdu.data = reply + sizeof(icmpv6_message_t);
+        sdu.data = dgram->data + sizeof(icmpv6_message_t);
         sdu.size = dgram->size - sizeof(icmpv6_message_t);
 

uspace/srv/net/inetsrv/pdu.c

@@ -224 +224 @@
                 return EINVAL;
 
-        static_assert(sizeof(ip6_header_t) % 8 == 0);
+        static_assert(sizeof(ip6_header_t) % 8 == 0, "");
         assert(hdr_size % 8 == 0);
         assert(offs % FRAG_OFFS_UNIT == 0);