Changeset bdae198 in mainline for uspace/lib/c/include/inet/addr.h

Timestamp:

2013-08-04T12:01:10Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

ea509069

Parents:

b08879c2 (diff), d856110 (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/lib/c/include/inet/addr.h (modified) (3 diffs)

uspace/lib/c/include/inet/addr.h

@@ -73 +73 @@
 extern void addr128(const addr128_t, addr128_t);
 
+extern int addr48_compare(const addr48_t, const addr48_t);
+extern int addr128_compare(const addr128_t, const addr128_t);
+
+extern void addr48_solicited_node(const addr128_t, addr48_t);
+
 extern void host2addr128_t_be(const addr128_t, addr128_t);
 extern void addr128_t_be2host(const addr128_t, addr128_t);
@@ -87 +92 @@
 extern int inet_addr_family(const char *, uint16_t *);
 extern void inet_naddr_addr(const inet_naddr_t *, inet_addr_t *);
+extern void inet_addr_naddr(const inet_addr_t *, uint8_t, inet_naddr_t *);
 
 extern void inet_addr_any(inet_addr_t *);
@@ -94 +100 @@
 extern int inet_addr_is_any(const inet_addr_t *);
 
+extern int inet_naddr_compare(const inet_naddr_t *, const inet_addr_t *);
 extern int inet_naddr_compare_mask(const inet_naddr_t *, const inet_addr_t *);