Changeset b86a32e in mainline for uspace/srv/net/inetsrv/pdu.h

Timestamp:

2013-07-15T12:14:55Z (12 years ago)

Author:

Manuele Conti <conti.ma@…>

Branches:

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

Children:

c84146d3

Parents:

87159eb8 (diff), 956d4281 (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 with mainline changes.

File:

• uspace/srv/net/inetsrv/pdu.h (modified) (2 diffs)

uspace/srv/net/inetsrv/pdu.h

@@ -40 +40 @@
 #include <sys/types.h>
 #include "inetsrv.h"
+#include "ndp.h"
 
 #define INET_CHECKSUM_INIT 0xffff
@@ -45 +46 @@
 extern uint16_t inet_checksum_calc(uint16_t, void *, size_t);
 
-extern int inet_pdu_encode(inet_packet_t *, size_t, size_t, void **,
-    size_t *, size_t *);
+extern int inet_pdu_encode(inet_packet_t *, addr32_t, addr32_t, size_t, size_t,
+    void **, size_t *, size_t *);
+extern int inet_pdu_encode6(inet_packet_t *, addr128_t, addr128_t, size_t,
+    size_t, void **, size_t *, size_t *);
 extern int inet_pdu_decode(void *, size_t, inet_packet_t *);
 extern int inet_pdu_decode6(void *, size_t, inet_packet_t *);
+
+extern int ndp_pdu_decode(inet_dgram_t *, ndp_packet_t *);
+extern int ndp_pdu_encode(ndp_packet_t *, inet_dgram_t *);
 
 #endif