Changes in uspace/srv/net/inetsrv/inetsrv.h [13be2583:3e6a98c5] in mainline

File:

• uspace/srv/net/inetsrv/inetsrv.h (modified) (6 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>
 #include <sys/types.h>
-#include <types/inet.h>
 #include <async.h>
 
@@ -64 +62 @@
 } inetping_client_t;
 
-/** Inetping6 Client */
-typedef struct {
-        /** Callback session */
-        async_sess_t *sess;
-        /** Session identifier */
-        uint16_t ident;
-        /** Link to client list */
-        link_t client_list;
-} inetping6_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 */
+typedef struct {
+        /** Network address */
+        inet_naddr_t naddr;
+        /** Link service ID */
+        sysarg_t ilink;
+        /** Address object name */
+        char *name;
+} inet_addr_info_t;
+
+/** IP link info */
+typedef struct {
+        /** Link service name */
+        char *name;
+        /** Default MTU */
+        size_t def_mtu;
+} inet_link_info_t;
+
+/** Static route info */
+typedef struct {
+        /** Destination network address */
+        inet_naddr_t dest;
+        /** Router address */
+        inet_addr_t router;
+        /** Static route name */
+        char *name;
+} inet_sroute_info_t;
 
 typedef struct {
@@ -86 +115 @@
         uint8_t ttl;
         /** Identifier */
-        uint32_t ident;
+        uint16_t ident;
         /** Do not fragment */
         bool df;
@@ -100 +129 @@
 
 typedef struct {
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint8_t tos;
+        void *data;
+        size_t size;
+} inet_dgram_t;
+
+typedef struct {
         link_t link_list;
         service_id_t svc_id;
@@ -106 +143 @@
         iplink_t *iplink;
         size_t def_mtu;
-        addr48_t mac;
-        bool mac_valid;
 } inet_link_t;
 
@@ -148 +183 @@
 } inet_dir_t;
 
+typedef struct {
+        inet_addr_t src;
+        inet_addr_t dest;
+        uint16_t seq_no;
+        void *data;
+        size_t size;
+} inetping_sdu_t;
+
 extern int inet_ev_recv(inet_client_t *, inet_dgram_t *);
 extern int inet_recv_packet(inet_packet_t *);