Changeset 8fdb18e in mainline for uspace/srv/net/inetsrv/inetsrv.h

Timestamp:

2013-05-03T14:51:30Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5d1cb8a

Parents:

ef904895 (diff), 1c7ba2d (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/inetsrv.h (modified) (2 diffs)

uspace/srv/net/inetsrv/inetsrv.h

@@ -40 +40 @@
 #include <adt/list.h>
 #include <stdbool.h>
+#include <inet/addr.h>
 #include <inet/iplink.h>
 #include <ipc/loc.h>
@@ -61 +62 @@
         link_t client_list;
 } inetping_client_t;
-
-/** Host address */
-typedef struct {
-        uint32_t ipv4;
-} inet_addr_t;
-
-/** Network address */
-typedef struct {
-        /** Address */
-        uint32_t ipv4;
-        /** Number of valid bits in @c ipv4 */
-        int bits;
-} inet_naddr_t;
 
 /** Address object info */