Changeset 15d0046 in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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:

Merge mainline changes

File:

• uspace/srv/net/inetsrv/pdu.c (modified) (1 diff)

uspace/srv/net/inetsrv/pdu.c

@@ -106 +106 @@
 {
         /* Upper bound for fragment offset field */
-        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l);
+        size_t fragoff_limit = 1 << (FF_FRAGOFF_h - FF_FRAGOFF_l + 1);
         
         /* Verify that total size of datagram is within reasonable bounds */
-        if (offs + packet->size > FRAG_OFFS_UNIT * fragoff_limit)
+        if (packet->size > FRAG_OFFS_UNIT * fragoff_limit)
                 return ELIMIT;