Changeset f14291b for uspace/lib – HelenOS

uspace/lib/c/Makefile

-              r1882525
+              rf14291b
         generic/ipc.c \
         generic/async.c \
+        generic/async_rel.c \
         generic/loader.c \
         generic/getopt.c \
         generic/adt/list.o \
         generic/adt/hash_table.o \
+        generic/adt/dynamic_fifo.c \
+        generic/adt/measured_strings.c \
+        generic/adt/char_map.c \
         generic/time.c \
         generic/err.c \
 …
         generic/vfs/vfs.c \
         generic/vfs/canonify.c \
+        generic/net/inet.c \
+        generic/net/icmp_common.c \
+        generic/net/icmp_api.c \
+        generic/net/modules.c \
+        generic/net/packet.c \
+        generic/net/socket_client.c \
+        generic/net/socket_parse.c \
         generic/stacktrace.c \
         generic/arg_parse.c \

uspace/lib/c/generic/ddi.c

-              r1882525
+              rf14291b
+}
-/** Interrupt control
+ *
- * @param enable        1 - enable interrupts, 0 - disable interrupts
- */
-int preemption_control(int enable)
+{
-        return __SYSCALL1(SYS_PREEMPT_CONTROL, (sysarg_t) enable);
+}
 /** Enable PIO for specified I/O range.
+ *

uspace/lib/c/generic/io/io.c

-              r1882525
+              rf14291b
+}
+int fileno(FILE *stream)
+{
+        if (stream->klog) {
+                errno = EBADF;
+                return -1;
+        }
+        return stream->fd;
+}
 int fphone(FILE *stream)
+{

uspace/lib/c/generic/libc.c

-              r1882525
+              rf14291b
 #include <ipc/ipc.h>
 #include <async.h>
+#include <async_rel.h>
 #include <as.h>
 #include <loader/pcb.h>
 …
         __heap_init();
         __async_init();
+        (void) async_rel_init();
         fibril_t *fibril = fibril_setup();
         __tcb_set(fibril->tcb);

uspace/lib/c/generic/net/icmp_common.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup icmp
+/** @addtogroup libc
  *  @{
  */
 /** @file
  *  ICMP common interface implementation.
  *  @see icmp_common.h
+ * ICMP common interface implementation.
+ * @see icmp_common.h
  */
+#include <net/modules.h>
+#include <net/icmp_common.h>
+#include <ipc/services.h>
+#include <ipc/icmp.h>
+#include <sys/time.h>
 #include <async.h>
-#include <ipc/services.h>
+#include <net_modules.h>
+#include <icmp_common.h>
+#include <icmp_messages.h>
+int icmp_connect_module(services_t service, suseconds_t timeout){
+/** Connects to the ICMP module.
+ *
+ * @param service       The ICMP module service. Ignored parameter.
+ * @param[in] timeout   The connection timeout in microseconds. No timeout if
+ *                      set to zero.
+ * @returns             The ICMP module phone on success.
+ * @returns             ETIMEOUT if the connection timeouted.
+ */
+int icmp_connect_module(services_t service, suseconds_t timeout)
+{
         int phone;
         phone = connect_to_service_timeout(SERVICE_ICMP, timeout);
         if(phone >= 0){
+        if (phone >= 0)
                 async_req_0_0(phone, NET_ICMP_INIT);
+        }
         return phone;
+}

uspace/lib/c/generic/net/socket_parse.c

-              r1882525
+              rf14291b
  */
+#include <socket_parse.h>
+#include <net/socket_parse.h>
+#include <net/socket.h>
 #include <arg_parse.h>
 #include <errno.h>
 #include <str.h>
-#include <socket.h>
 /** Translate the character string to the address family number.

uspace/lib/c/include/byteorder.h

-              r1882525
+              rf14291b
 #endif
+#define htons(n)        host2uint16_t_be((n))
+#define htonl(n)        host2uint32_t_be((n))
+#define ntohs(n)        uint16_t_be2host((n))
+#define ntohl(n)        uint32_t_be2host((n))
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
+{

uspace/lib/c/include/ddi.h

r1882525	rf14291b
41	41	extern int physmem_map(void , void , unsigned long, int);
42	42	extern int iospace_enable(task_id_t, void *, unsigned long);
43		~~extern int preemption_control(int);~~
44	43	extern int pio_enable(void , size_t, void *);
45	44

uspace/lib/c/include/err.h

-              r1882525
+              rf14291b
 #define LIBC_ERR_H_
+#include <stdio.h>
+#include <errno.h>
+#ifdef CONFIG_DEBUG
+#include <str_error.h>
+#endif
 #define errx(status, fmt, ...) { \
         printf((fmt), ##__VA_ARGS__); \
 …
+}
+/** An actual stored error code.  */
+#define ERROR_CODE  error_check_return_value
+/** An error processing routines declaration.
+ *
+ * This has to be declared in the block where the error processing
+ * is desired.
+ */
+#define ERROR_DECLARE  int ERROR_CODE
+/** Store the value as an error code and checks if an error occurred.
+ *
+ * @param[in] value     The value to be checked. May be a function call.
+ * @return              False if the value indicates success (EOK).
+ * @return              True otherwise.
+ */
+#ifdef CONFIG_DEBUG
+#define ERROR_OCCURRED(value) \
+        (((ERROR_CODE = (value)) != EOK) && \
+        ({ \
+                fprintf(stderr, "libsocket error at %s:%d (%s)\n", \
+                __FILE__, __LINE__, str_error(ERROR_CODE)); \
+; \
+        }))
+#else
+#define ERROR_OCCURRED(value)   ((ERROR_CODE = (value)) != EOK)
+#endif
+#define ERROR_NONE(value)       !ERROR_OCCURRED((value))
+/** Error propagation
+ *
+ * Check if an error occurred and immediately exit the actual
+ * function returning the error code.
+ *
+ * @param[in] value     The value to be checked. May be a function call.
+ *
+ */
+#define ERROR_PROPAGATE(value) \
+        if (ERROR_OCCURRED(value)) \
+                return ERROR_CODE
 #endif

uspace/lib/c/include/errno.h

-              r1882525
+              rf14291b
 #define EMLINK        (-266)
+/** An API function is called while another blocking function is in progress. */
+#define EINPROGRESS     (-10036)
+/** The socket identifier is not valid. */
+#define ENOTSOCK        (-10038)
+/** The destination address required. */
+#define EDESTADDRREQ    (-10039)
+/** Protocol is not supported.  */
+#define EPROTONOSUPPORT (-10043)
+/** Socket type is not supported. */
+#define ESOCKTNOSUPPORT (-10044)
+/** Protocol family is not supported. */
+#define EPFNOSUPPORT    (-10046)
+/** Address family is not supported. */
+#define EAFNOSUPPORT    (-10047)
+/** Address is already in use. */
+#define EADDRINUSE      (-10048)
+/** The socket is not connected or bound. */
+#define ENOTCONN        (-10057)
+/** The requested operation was not performed.
+ *  Try again later.
+ */
+#define TRY_AGAIN       (-11002)
+/** No data.
+ */
+#define NO_DATA         (-11004)
 #endif

uspace/lib/c/include/fibril_synch.h

-              r1882525
+              rf14291b
 } fibril_mutex_t;
 #define FIBRIL_MUTEX_INITIALIZE(name) \
         fibril_mutex_t name = { \
+#define FIBRIL_MUTEX_INITIALIZER(name) \
+        { \
                 .counter = 1, \
                 .waiters = { \
 …
                 } \
+        }
+#define FIBRIL_MUTEX_INITIALIZE(name) \
+        fibril_mutex_t name = FIBRIL_MUTEX_INITIALIZER(name)
 typedef struct {
 …
 } fibril_rwlock_t;
 #define FIBRIL_RWLOCK_INITIALIZE(name) \
         fibril_rwlock_t name = { \
+#define FIBRIL_RWLOCK_INITIALIZER(name) \
+        { \
                 .readers = 0, \
                 .writers = 0, \
 …
+        }
+#define FIBRIL_RWLOCK_INITIALIZE(name) \
+        fibril_rwlock_t name = FIBRIL_RWLOCK_INITIALIZER(name)
 typedef struct {
         link_t waiters;
 } fibril_condvar_t;
 #define FIBRIL_CONDVAR_INITIALIZE(name) \
         fibril_condvar_t name = { \
+#define FIBRIL_CONDVAR_INITIALIZER(name) \
+        { \
                 .waiters = { \
                         .next = &name.waiters, \
 …
                 } \
+        }
+#define FIBRIL_CONDVAR_INITIALIZE(name) \
+        fibril_condvar_t name = FIBRIL_CONDVAR_INITIALIZER(name)
 extern void fibril_mutex_initialize(fibril_mutex_t *);

uspace/lib/c/include/ipc/arp.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup arp
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  ARP module messages.
  *  @see arp_interface.h
+ * ARP module messages.
+ * @see arp_interface.h
  */
 #ifndef __NET_ARP_MESSAGES__
 #define __NET_ARP_MESSAGES__
+#ifndef LIBC_ARP_MESSAGES_
+#define LIBC_ARP_MESSAGES_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** ARP module messages.
+ */
+typedef enum{
+/** ARP module messages. */
+typedef enum {
         /** Clean cache message.
          *  @see arp_clean_cache()
+         * @see arp_clean_cache()
          */
         NET_ARP_CLEAN_CACHE = NET_ARP_FIRST,
         /** Clear address cache message.
          *  @see arp_clear_address_msg()
+         * @see arp_clear_address_msg()
          */
         NET_ARP_CLEAR_ADDRESS,
         /** Clear device cache message.
          *  @see arp_clear_device_req()
+         * @see arp_clear_device_req()
          */
         NET_ARP_CLEAR_DEVICE,
         /** New device message.
          *  @see arp_device_req()
+         * @see arp_device_req()
          */
         NET_ARP_DEVICE,
         /** Address translation message.
          *  @see arp_translate_req()
+         * @see arp_translate_req()
          */
         NET_ARP_TRANSLATE
 } arp_messages;
+/** @name ARP specific message parameters definitions
+ */
+/** @name ARP specific message parameters definitions */
 /*@{*/
 /** Returns the protocol service message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define ARP_GET_NETIF(call) \
+        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
+        ({ \
+                services_t service = (services_t) IPC_GET_ARG2(*call); \
+                service; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/icmp.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup icmp
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  ICMP module messages.
  *  @see icmp_interface.h
+ * ICMP module messages.
+ * @see icmp_interface.h
  */
 #ifndef __NET_ICMP_MESSAGES__
 #define __NET_ICMP_MESSAGES__
+#ifndef LIBC_ICMP_MESSAGES_
+#define LIBC_ICMP_MESSAGES_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 #include <sys/types.h>
+#include <sys/time.h>
+#include <icmp_codes.h>
+#include <net_messages.h>
+#include <net/icmp_codes.h>
+/** ICMP module messages.
+ */
+typedef enum{
+        /** Sends echo request.
+         *  @see icmp_echo()
+         */
+/** ICMP module messages. */
+typedef enum {
+        /** Sends echo request. @see icmp_echo() */
         NET_ICMP_ECHO = NET_ICMP_FIRST,
+        /** Sends destination unreachable error message.
+         *  @see icmp_destination_unreachable_msg()
+        /**
+         * Sends destination unreachable error message.
+         * @see icmp_destination_unreachable_msg()
          */
         NET_ICMP_DEST_UNREACH,
+        /** Sends source quench error message.
+         *  @see icmp_source_quench_msg()
+        /**
+         * Sends source quench error message.
+         * @see icmp_source_quench_msg()
          */
         NET_ICMP_SOURCE_QUENCH,
+        /** Sends time exceeded error message.
+         *  @see icmp_time_exceeded_msg()
+        /**
+         * Sends time exceeded error message.
+         * @see icmp_time_exceeded_msg()
          */
         NET_ICMP_TIME_EXCEEDED,
+        /** Sends parameter problem error message.
+         *  @see icmp_parameter_problem_msg()
+        /**
+         * Sends parameter problem error message.
+         * @see icmp_parameter_problem_msg()
          */
         NET_ICMP_PARAMETERPROB,
         /** Initializes new connection.
          */
+        /** Initializes new connection. */
         NET_ICMP_INIT
 } icmp_messages;
+/** @name ICMP specific message parameters definitions
+ */
+/** @name ICMP specific message parameters definitions */
 /*@{*/
 /** Returns the ICMP code message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_CODE(call) \
+        ({icmp_code_t code = (icmp_code_t) IPC_GET_ARG1(*call); code;})
+        ({ \
+                icmp_code_t code = (icmp_code_t) IPC_GET_ARG1(*call); \
+                code; \
+        })
 /** Returns the ICMP link MTU message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_MTU(call) \
+        ({icmp_param_t mtu = (icmp_param_t) IPC_GET_ARG3(*call); mtu;})
+        ({ \
+                icmp_param_t mtu = (icmp_param_t) IPC_GET_ARG3(*call); \
+                mtu; \
+        })
 /** Returns the pointer message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_POINTER(call) \
+        ({icmp_param_t pointer = (icmp_param_t) IPC_GET_ARG3(*call); pointer;})
+        ({ \
+                icmp_param_t pointer = (icmp_param_t) IPC_GET_ARG3(*call); \
+                pointer; \
+        })
 /** Returns the size message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_SIZE(call) \
+        ({size_t size = (size_t) IPC_GET_ARG1(call); size;})
+        ({ \
+                size_t size = (size_t) IPC_GET_ARG1(call); \
+                size; \
+        })
 /** Returns the timeout message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_TIMEOUT(call) \
+        (({suseconds_t timeout = (suseconds_t) IPC_GET_ARG2(call); timeout;}))
+        ({ \
+                suseconds_t timeout = (suseconds_t) IPC_GET_ARG2(call); \
+                timeout; \
+        })
 /** Returns the time to live message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_TTL(call) \
+        ({ip_ttl_t ttl = (ip_ttl_t) IPC_GET_ARG3(call); ttl;})
+        ({ \
+                ip_ttl_t ttl = (ip_ttl_t) IPC_GET_ARG3(call); \
+                ttl; \
+        })
 /** Returns the type of service message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_TOS(call) \
+        ({ip_tos_t tos = (ip_tos_t) IPC_GET_ARG4(call); tos;})
+        ({ \
+                ip_tos_t tos = (ip_tos_t) IPC_GET_ARG4(call); \
+                tos; \
+        })
 /** Returns the dont fragment message parameter.
+ *  @param[in] call The message call structure.
+ *
+ * @param[in] call      The message call structure.
  */
 #define ICMP_GET_DONT_FRAGMENT(call) \
+        ({int dont_fragment = (int) IPC_GET_ARG5(call); dont_fragment;})
+        ({ \
+                int dont_fragment = (int) IPC_GET_ARG5(call); \
+                dont_fragment; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/il.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net_il
+/** @addtogroup libc
  * @{
  */
 …
  */
 #ifndef __NET_IL_MESSAGES_H__
 #define __NET_IL_MESSAGES_H__
+#ifndef LIBC_IL_MESSAGES_H_
+#define LIBC_IL_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+/** Internet layer modules messages.
+ */
+/** Internet layer modules messages. */
 typedef enum {
         /** New device message.
          *  @see ip_device_req()
+         * @see ip_device_req()
          */
         NET_IL_DEVICE = NET_IL_FIRST,
         /** Device state changed message.
          *  @see il_device_state_msg()
+         * @see il_device_state_msg()
          */
         NET_IL_DEVICE_STATE,
         /** Device MTU changed message.
          *  @see il_mtu_changed_msg()
+         * @see il_mtu_changed_msg()
          */
         NET_IL_MTU_CHANGED,
         /** Packet size message.
          *  @see il_packet_size_req()
+         * @see il_packet_size_req()
          */
         NET_IL_PACKET_SPACE,
         /** Packet received message.
          *  @see il_received_msg()
+         * @see il_received_msg()
          */
         NET_IL_RECEIVED,
         /** Packet send message.
          *  @see il_send_msg()
+         * @see il_send_msg()
          */
         NET_IL_SEND
 } il_messages;
+/** @name Internetwork layer specific message parameters definitions
+ *
+ */
+/** @name Internetwork layer specific message parameters definitions */
 /*@{*/
 /** Return the protocol number message parameter.
  * @param[in] call The message call structure.
+ *
  */
 #define IL_GET_PROTO(call)  (int) IPC_GET_ARG1(*call)
+#define IL_GET_PROTO(call)      (int) IPC_GET_ARG1(*call)
 /** Return the registering service message parameter.
  * @param[in] call The message call structure.
+ *
  */
 #define IL_GET_SERVICE(call)  (services_t) IPC_GET_ARG2(*call)
+#define IL_GET_SERVICE(call)    (services_t) IPC_GET_ARG2(*call)
 /*@}*/

uspace/lib/c/include/ipc/ip.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup ip
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  IP module messages.
  *  @see ip_interface.h
+ * IP module messages.
+ * @see ip_interface.h
  */
 #ifndef __NET_IP_MESSAGES_H__
 #define __NET_IP_MESSAGES_H__
+#ifndef LIBC_IP_MESSAGES_H_
+#define LIBC_IP_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
 #include <in.h>
 #include <ip_codes.h>
+#include <net/in.h>
+#include <net/ip_codes.h>
+/** IP module messages.
+ */
+typedef enum{
+/** IP module messages. */
+typedef enum {
         /** Adds the routing entry.
          *  @see ip_add_route()
+         * @see ip_add_route()
          */
         NET_IP_ADD_ROUTE = NET_IP_FIRST,
         /** Gets the actual route information.
          *  @see ip_get_route()
+         * @see ip_get_route()
          */
         NET_IP_GET_ROUTE,
         /** Processes the received error notification.
          *  @see ip_received_error_msg()
+         * @see ip_received_error_msg()
          */
         NET_IP_RECEIVED_ERROR,
         /** Sets the default gateway.
          *  @see ip_set_default_gateway()
+         * @see ip_set_default_gateway()
          */
         NET_IP_SET_GATEWAY
 } ip_messages;
+/** @name IP specific message parameters definitions
+ */
+/** @name IP specific message parameters definitions */
 /*@{*/
 /** Returns the address message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_ADDRESS(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG3(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG3(*call); \
+                addr; \
+        })
 /** Returns the gateway message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_GATEWAY(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG2(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG2(*call); \
+                addr; \
+        })
 /** Sets the header length in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer The message answer structure.
  */
 #define IP_SET_HEADERLEN(answer, value) \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(*answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG2(*answer, argument); \
+        } while (0)
 /** Returns the network mask message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_NETMASK(call) \
+        ({in_addr_t addr; addr.s_addr = IPC_GET_ARG4(*call); addr;})
+        ({ \
+                in_addr_t addr; \
+                addr.s_addr = IPC_GET_ARG4(*call); \
+                addr; \
+        })
 /** Returns the protocol message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call The message call structure.
  */
 #define IP_GET_PROTOCOL(call) \
+        ({ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); protocol;})
+        ({ \
+                ip_protocol_t protocol = (ip_protocol_t) IPC_GET_ARG1(*call); \
+                protocol; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/net_net.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  Networking subsystem central module messages.
  *  @see net_interface.h
+ * Networking subsystem central module messages.
+ * @see net_interface.h
  */
 #ifndef __NET_NET_MESSAGES_H__
 #define __NET_NET_MESSAGES_H__
+#ifndef LIBC_NET_NET_MESSAGES_H_
+#define LIBC_NET_NET_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** Networking subsystem central module messages.
+ */
+typedef enum{
+/** Networking subsystem central module messages. */
+typedef enum {
         /** Returns the general configuration
          *  @see net_get_conf_req()
+         * @see net_get_conf_req()
          */
         NET_NET_GET_CONF = NET_FIRST,
         /** Returns the device specific configuration
          *  @see net_get_device_conf_req()
+         * @see net_get_device_conf_req()
          */
         NET_NET_GET_DEVICE_CONF,
+        /** Starts the networking stack.
+         */
+        /** Starts the networking stack. */
         NET_NET_STARTUP,
 } net_messages;

uspace/lib/c/include/ipc/netif.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup netif
+/** @addtogroup libc
  * @{
  */
 …
  */
 #ifndef __NET_NETIF_MESSAGES_H__
 #define __NET_NETIF_MESSAGES_H__
+#ifndef LIBC_NETIF_MESSAGES_H_
+#define LIBC_NETIF_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** Network interface common module messages.
+ */
+/** Network interface common module messages. */
 typedef enum {
         /** Probe device message.
          *  @see netif_probe_req()
+         * @see netif_probe_req()
          */
         NET_NETIF_PROBE = NET_NETIF_FIRST,
         /** Send packet message.
          *  @see netif_send_msg()
+         * @see netif_send_msg()
          */
         NET_NETIF_SEND,
         /** Start device message.
          *  @see netif_start_req()
+         * @see netif_start_req()
          */
         NET_NETIF_START,
         /** Get device usage statistics message.
          *  @see netif_stats_req()
+         * @see netif_stats_req()
          */
         NET_NETIF_STATS,
         /** Stop device message.
          *  @see netif_stop_req()
+         * @see netif_stop_req()
          */
         NET_NETIF_STOP,
         /** Get device address message.
          *  @see netif_get_addr_req()
+         * @see netif_get_addr_req()
          */
         NET_NETIF_GET_ADDR,
 } netif_messages;
+/** @name Network interface specific message parameters definitions
+ */
+/** @name Network interface specific message parameters definitions */
 /*@{*/
 …
  */
 #define NETIF_GET_IRQ(call) \
+        ({int irq = (int) IPC_GET_ARG2(*call); irq;})
+        ({ \
+                int irq = (int) IPC_GET_ARG2(*call); \
+                irq; \
+        })
 /** Return the input/output address message parameter.
 …
  */
 #define NETIF_GET_IO(call) \
+        ({int io = (int) IPC_GET_ARG3(*call); io;})
+        ({ \
+                int io = (int) IPC_GET_ARG3(*call); \
+                io; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/nil.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net_nil
+/** @addtogroup libc
  * @{
  */
 …
  */
 #ifndef __NET_NIL_MESSAGES_H__
 #define __NET_NIL_MESSAGES_H__
+#ifndef LIBC_NIL_MESSAGES_H_
+#define LIBC_NIL_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** Network interface layer module messages.
+ */
+/** Network interface layer module messages. */
 typedef enum {
         /** New device or update MTU message.
          *  @see nil_device_req()
+         * @see nil_device_req()
          */
         NET_NIL_DEVICE = NET_NIL_FIRST,
         /** New device state message.
          *  @see nil_device_state_msg()
+         * @see nil_device_state_msg()
          */
         NET_NIL_DEVICE_STATE,
         /** Received packet queue message.
          *  @see nil_received_msg()
+         * @see nil_received_msg()
          */
         NET_NIL_RECEIVED,
         /** Send packet queue message.
          *  @see nil_send_msg()
+         * @see nil_send_msg()
          */
         NET_NIL_SEND,
         /** Packet size message.
          *  @see nil_packet_size_req()
+         * @see nil_packet_size_req()
          */
         NET_NIL_PACKET_SPACE,
         /** Device local hardware address message.
          *  @see nil_get_addr()
+         * @see nil_get_addr()
          */
         NET_NIL_ADDR,
         /** Device broadcast hardware address message.
          *  @see nil_get_broadcast_addr()
+         * @see nil_get_broadcast_addr()
          */
         NET_NIL_BROADCAST_ADDR,
 } nil_messages;
+/** @name Network interface layer specific message parameters definitions
+ */
+/** @name Network interface layer specific message parameters definitions */
 /*@{*/
+/** Return the protocol service message parameter.
+ */
+/** Return the protocol service message parameter. */
 #define NIL_GET_PROTO(call) \
+        ({services_t service = (services_t) IPC_GET_ARG2(*call); service;})
+        ({ \
+                services_t service = (services_t) IPC_GET_ARG2(*call); \
+                service; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/packet.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup packet
+/** @addtogroup libc
  *  @{
  */
 …
  */
 #ifndef __NET_PACKET_MESSAGES__
 #define __NET_PACKET_MESSAGES__
+#ifndef LIBC_PACKET_MESSAGES_
+#define LIBC_PACKET_MESSAGES_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** Packet server module messages.
+ */
+/** Packet server module messages. */
 typedef enum {
         /** Create packet message with specified content length.
          *  @see packet_get_1()
+         * @see packet_get_1()
          */
         NET_PACKET_CREATE_1 = NET_PACKET_FIRST,
+        /** Create packet message with specified address length, prefix, content and suffix.
+         *  @see packet_get_4()
+        /**
+         * Create packet message with specified address length, prefix, content
+         * and suffix.
+         * @see packet_get_4()
          */
         NET_PACKET_CREATE_4,
         /** Get packet message.
+         *  @see packet_return()
+         */
+         * @see packet_return() */
         NET_PACKET_GET,
         /** Get packet size message.
          *  @see packet_translate()
+         * @see packet_translate()
          */
         NET_PACKET_GET_SIZE,
         /** Release packet message.
          *  @see pq_release()
+         * @see pq_release()
          */
         NET_PACKET_RELEASE
 } packet_messages;
+/** Returns the protocol service message parameter.
+ */
+#define ARP_GET_PROTO(call)             (services_t) IPC_GET_ARG2(*call)
+/** Returns the protocol service message parameter. */
+#define ARP_GET_PROTO(call)     (services_t) IPC_GET_ARG2(*call)
+/** Returns the packet identifier message parameter.
+ */
+#define IPC_GET_ID(call)                        (packet_id_t) IPC_GET_ARG1(*call)
+/** Returns the packet identifier message parameter. */
+#define IPC_GET_ID(call)        (packet_id_t) IPC_GET_ARG1(*call)
+/** Returns the maximal content length message parameter.
+ */
+#define IPC_GET_CONTENT(call)           (size_t) IPC_GET_ARG1(*call)
+/** Returns the maximal content length message parameter. */
+#define IPC_GET_CONTENT(call)   (size_t) IPC_GET_ARG1(*call)
+/** Returns the maximal address length message parameter.
+ */
+/** Returns the maximal address length message parameter. */
 #define IPC_GET_ADDR_LEN(call)  (size_t) IPC_GET_ARG2(*call)
+/** Returns the maximal prefix length message parameter.
+ */
+#define IPC_GET_PREFIX(call)            (size_t) IPC_GET_ARG3(*call)
+/** Returns the maximal prefix length message parameter. */
+#define IPC_GET_PREFIX(call)    (size_t) IPC_GET_ARG3(*call)
+/** Returns the maximal suffix length message parameter.
+ */
+#define IPC_GET_SUFFIX(call)            (size_t) IPC_GET_ARG4(*call)
+/** Returns the maximal suffix length message parameter. */
+#define IPC_GET_SUFFIX(call)    (size_t) IPC_GET_ARG4(*call)
 #endif

uspace/lib/c/include/ipc/socket.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup socket
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
+ *  Socket messages.
+ *  @see socket.h
+ */
+#ifndef __NET_SOCKET_MESSAGES_H__
+#define __NET_SOCKET_MESSAGES_H__
+ * Socket messages.
+ */
+#ifndef LIBC_SOCKET_MESSAGES_H_
+#define LIBC_SOCKET_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <net_messages.h>
+#include <socket_codes.h>
+/** Socket client messages.
+ */
+typedef enum{
+        /** Creates a new socket.
+         *  @see socket()
+         */
+#include <ipc/net.h>
+/** Socket client messages. */
+typedef enum {
+        /** Creates a new socket. @see socket() */
         NET_SOCKET = NET_SOCKET_FIRST,
+        /** Binds the socket.
+         *  @see bind()
+         */
+        /** Binds the socket. @see bind() */
         NET_SOCKET_BIND,
+        /** Creates a new socket.
+         *  @see socket()
+         */
+        /** Creates a new socket. @see socket() */
         NET_SOCKET_LISTEN,
+        /** Accepts an incomming connection.
+         *  @see accept()
+         */
+        /** Accepts an incomming connection. @see accept() */
         NET_SOCKET_ACCEPT,
+        /** Connects the socket.
+         *  @see connect()
+         */
+        /** Connects the socket. @see connect() */
         NET_SOCKET_CONNECT,
+        /** Closes the socket.
+         *  @see closesocket()
+         */
+        /** Closes the socket. @see closesocket() */
         NET_SOCKET_CLOSE,
+        /** Sends data via the stream socket.
+         *  @see send()
+         */
+        /** Sends data via the stream socket. @see send() */
         NET_SOCKET_SEND,
+        /** Sends data via the datagram socket.
+         *  @see sendto()
+         */
+        /** Sends data via the datagram socket. @see sendto() */
         NET_SOCKET_SENDTO,
+        /** Receives data from the stream socket.
+         *  @see socket()
+         */
+        /** Receives data from the stream socket. @see socket() */
         NET_SOCKET_RECV,
+        /** Receives data from the datagram socket.
+         *  @see socket()
+         */
+        /** Receives data from the datagram socket. @see socket() */
         NET_SOCKET_RECVFROM,
+        /** Gets the socket option.
+         *  @see getsockopt()
+         */
+        /** Gets the socket option. @see getsockopt() */
         NET_SOCKET_GETSOCKOPT,
+        /** Sets the socket option.
+         *  @see setsockopt()
+         */
+        /** Sets the socket option. @see setsockopt() */
         NET_SOCKET_SETSOCKOPT,
+        /** New socket for acceptence notification message.
+         */
+        /** New socket for acceptence notification message. */
         NET_SOCKET_ACCEPTED,
+        /** New data received notification message.
+         */
+        /** New data received notification message. */
         NET_SOCKET_RECEIVED,
+        /** New socket data fragment size notification message.
+         */
+        /** New socket data fragment size notification message. */
         NET_SOCKET_DATA_FRAGMENT_SIZE
 } socket_messages;
 …
 /** Sets the socket identifier in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer   The message answer structure.
  */
 #define SOCKET_SET_SOCKET_ID(answer, value) \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG1(answer, argument); \
+        } while (0)
 /** Returns the socket identifier message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_SOCKET_ID(call) \
+        ({int socket_id = (int) IPC_GET_ARG1(call); socket_id;})
+        ({ \
+                int socket_id = (int) IPC_GET_ARG1(call); \
+                socket_id; \
+        })
 /** Sets the read data length in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer   The message answer structure.
  */
 #define SOCKET_SET_READ_DATA_LENGTH(answer, value) \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG1(answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG1(answer, argument); \
+        } while (0)
 /** Returns the read data length message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_READ_DATA_LENGTH(call) \
+        ({int data_length = (int) IPC_GET_ARG1(call); data_length;})
+        ({ \
+                int data_length = (int) IPC_GET_ARG1(call); \
+                data_length; \
+        })
 /** Returns the backlog message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_BACKLOG(call) \
+        ({int backlog = (int) IPC_GET_ARG2(call); backlog;})
+        ({ \
+                int backlog = (int) IPC_GET_ARG2(call); \
+                backlog; \
+        })
 /** Returns the option level message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_OPT_LEVEL(call) \
+        ({int opt_level = (int) IPC_GET_ARG2(call); opt_level;})
+        ({ \
+                int opt_level = (int) IPC_GET_ARG2(call); \
+                opt_level; \
+        })
 /** Returns the data fragment size message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_DATA_FRAGMENT_SIZE(call) \
+        ({size_t size = (size_t) IPC_GET_ARG2(call); size;})
+        ({ \
+                size_t size = (size_t) IPC_GET_ARG2(call); \
+                size; \
+        })
 /** Sets the data fragment size in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer   The message answer structure.
  */
 #define SOCKET_SET_DATA_FRAGMENT_SIZE(answer, value) \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG2(answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG2(answer, argument); \
+        } while (0)
 /** Sets the address length in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer   The message answer structure.
  */
 #define SOCKET_SET_ADDRESS_LENGTH(answer, value) \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG3(answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG3(answer, argument);\
+        } while (0)
 /** Returns the address length message parameter.
  *  @param[in] call The message call structure.
+ * @param[in] call      The message call structure.
  */
 #define SOCKET_GET_ADDRESS_LENGTH(call) \
+        ({socklen_t address_length = (socklen_t) IPC_GET_ARG3(call); address_length;})
+        ({ \
+                socklen_t address_length = (socklen_t) IPC_GET_ARG3(call); \
+                address_length; \
+        })
 /** Sets the header size in the message answer.
  *  @param[out] answer The message answer structure.
+ * @param[out] answer   The message answer structure.
  */
 #define SOCKET_SET_HEADER_SIZE(answer, value) \
+        \
+        {ipcarg_t argument = (ipcarg_t) (value); IPC_SET_ARG3(answer, argument);}
+        do { \
+                ipcarg_t argument = (ipcarg_t) (value); \
+                IPC_SET_ARG3(answer, argument); \
+        } while (0)
 /** Returns the header size message parameter.
  *  @param[in] call The message call structure.
+ *  @param[in] call     The message call structure.
  */
 #define SOCKET_GET_HEADER_SIZE(call) \
+        ({size_t size = (size_t) IPC_GET_ARG3(call); size;})
+        ({ \
+                size_t size = (size_t) IPC_GET_ARG3(call); \
+                size; \
+        })
 /** Returns the flags message parameter.
  *  @param[in] call The message call structure.
+ *  @param[in] call     The message call structure.
  */
 #define SOCKET_GET_FLAGS(call) \
+        ({int flags = (int) IPC_GET_ARG4(call); flags;})
+        ({ \
+                int flags = (int) IPC_GET_ARG4(call); \
+                flags; \
+        })
 /** Returns the option name message parameter.
  *  @param[in] call The message call structure.
+ *  @param[in] call     The message call structure.
  */
 #define SOCKET_GET_OPT_NAME(call) \
+        ({int opt_name = (int) IPC_GET_ARG4(call); opt_name;})
+        ({ \
+                int opt_name = (int) IPC_GET_ARG4(call); \
+                opt_name; \
+        })
 /** Returns the data fragments message parameter.
  *  @param[in] call The message call structure.
+ *  @param[in] call     The message call structure.
  */
 #define SOCKET_GET_DATA_FRAGMENTS(call) \
+        ({int fragments = (int) IPC_GET_ARG5(call); fragments;})
+        ({ \
+                int fragments = (int) IPC_GET_ARG5(call); \
+                fragments; \
+        })
 /** Returns the new socket identifier message parameter.
  *  @param[in] call The message call structure.
+ *  @param[in] call     The message call structure.
  */
 #define SOCKET_GET_NEW_SOCKET_ID(call) \
+        ({int socket_id = (int) IPC_GET_ARG5(call); socket_id;})
+        ({ \
+                int socket_id = (int) IPC_GET_ARG5(call); \
+                socket_id; \
+        })
 /*@}*/

uspace/lib/c/include/ipc/tl.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net_tl
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  Transport layer modules messages.
  *  @see tl_interface.h
+ * Transport layer modules messages.
+ * @see tl_interface.h
  */
 #ifndef __NET_TL_MESSAGES_H__
 #define __NET_TL_MESSAGES_H__
+#ifndef LIBC_TL_MESSAGES_H_
+#define LIBC_TL_MESSAGES_H_
 #include <ipc/ipc.h>
+#include <ipc/net.h>
+#include <net_messages.h>
+/** Transport layer modules messages.
+ */
+typedef enum{
+/** Transport layer modules messages. */
+typedef enum {
         /** Packet received message.
          *  @see tl_received_msg()
+         * @see tl_received_msg()
          */
         NET_TL_RECEIVED = NET_TL_FIRST

uspace/lib/c/include/net/device.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup netif
  *  @{
+/** @addtogroup libc
+ * @{
  */
 /** @file
  *  Device identifier, state and usage statistics.
+ * Device identifier, state and usage statistics.
  */
 #ifndef __NET_DEVICE_ID_TYPE_H__
 #define __NET_DEVICE_ID_TYPE_H__
+#ifndef LIBC_DEVICE_ID_TYPE_H_
+#define LIBC_DEVICE_ID_TYPE_H_
 #include <adt/int_map.h>
+/** Device identifier to generic type map declaration.
+ */
+#define DEVICE_MAP_DECLARE              INT_MAP_DECLARE
+/** Device identifier to generic type map declaration. */
+#define DEVICE_MAP_DECLARE      INT_MAP_DECLARE
+/** Device identifier to generic type map implementation.
+ */
+/** Device identifier to generic type map implementation. */
 #define DEVICE_MAP_IMPLEMENT    INT_MAP_IMPLEMENT
+/** Invalid device identifier.
+ */
+#define DEVICE_INVALID_ID               (-1)
+/** Invalid device identifier. */
+#define DEVICE_INVALID_ID       (-1)
+/** Device identifier type.
+ */
+typedef int     device_id_t;
+/** Device identifier type. */
+typedef int device_id_t;
+/** Device state type.
+ */
+typedef enum device_state       device_state_t;
+/** Device state type. */
+typedef enum device_state device_state_t;
 /** Type definition of the device usage statistics.
  *  @see device_stats
+ * @see device_stats
  */
 typedef struct device_stats     device_stats_t;
+typedef struct device_stats device_stats_t;
 /** Type definition of the device usage statistics pointer.
  *  @see device_stats
+ * @see device_stats
  */
 typedef device_stats_t *        device_stats_ref;
+typedef device_stats_t *device_stats_ref;
+/** Device state.
+ */
+enum    device_state{
+        /** Device not present or not initialized.
+         */
+/** Device state. */
+enum device_state {
+        /** Device not present or not initialized. */
         NETIF_NULL = 0,
+        /** Device present and stopped.
+         */
+        /** Device present and stopped. */
         NETIF_STOPPED,
+        /** Device present and active.
+         */
+        /** Device present and active. */
         NETIF_ACTIVE,
+        /** Device present but unable to transmit.
+         */
+        /** Device present but unable to transmit. */
         NETIF_CARRIER_LOST
 };
+/** Device usage statistics.
+ */
+struct  device_stats{
+        /** Total packets received.
+         */
+/** Device usage statistics. */
+struct device_stats {
+        /** Total packets received. */
         unsigned long receive_packets;
+        /** Total packets transmitted.
+         */
+        /** Total packets transmitted. */
         unsigned long send_packets;
+        /** Total bytes received.
+         */
+        /** Total bytes received. */
         unsigned long receive_bytes;
+        /** Total bytes transmitted.
+         */
+        /** Total bytes transmitted. */
         unsigned long send_bytes;
+        /** Bad packets received counter.
+         */
+        /** Bad packets received counter. */
         unsigned long receive_errors;
+        /** Packet transmition problems counter.
+         */
+        /** Packet transmition problems counter. */
         unsigned long send_errors;
+        /** No space in buffers counter.
+         */
+        /** No space in buffers counter. */
         unsigned long receive_dropped;
+        /** No space available counter.
+         */
+        /** No space available counter. */
         unsigned long send_dropped;
+        /** Total multicast packets received.
+         */
+        /** Total multicast packets received. */
         unsigned long multicast;
+        /** The number of collisions due to congestion on the medium.
+         */
+        /** The number of collisions due to congestion on the medium. */
         unsigned long collisions;
         /* detailed receive_errors: */
+        /** Received packet length error counter.
          */
+        /* detailed receive_errors */
+        /** Received packet length error counter. */
         unsigned long receive_length_errors;
+        /** Receiver buffer overflow counter.
+         */
+        /** Receiver buffer overflow counter. */
         unsigned long receive_over_errors;
+        /** Received packet with crc error counter.
+         */
+        /** Received packet with crc error counter. */
         unsigned long receive_crc_errors;
+        /** Received frame alignment error counter.
+         */
+        /** Received frame alignment error counter. */
         unsigned long receive_frame_errors;
+        /** Receiver fifo overrun counter.
+         */
+        /** Receiver fifo overrun counter. */
         unsigned long receive_fifo_errors;
+        /** Receiver missed packet counter.
+         */
+        /** Receiver missed packet counter. */
         unsigned long receive_missed_errors;
         /* detailed send_errors */
+        /** Transmitter aborted counter.
          */
+        /** Transmitter aborted counter. */
         unsigned long send_aborted_errors;
+        /** Transmitter carrier errors counter.
+         */
+        /** Transmitter carrier errors counter. */
         unsigned long send_carrier_errors;
+        /** Transmitter fifo overrun counter.
+         */
+        /** Transmitter fifo overrun counter. */
         unsigned long send_fifo_errors;
+        /** Transmitter carrier errors counter.
+         */
+        /** Transmitter carrier errors counter. */
         unsigned long send_heartbeat_errors;
+        /** Transmitter window errors counter.
+         */
+        /** Transmitter window errors counter. */
         unsigned long send_window_errors;
         /* for cslip etc */
         /** Total compressed packets received.
          */
+        /** Total compressed packets received. */
         unsigned long receive_compressed;
+        /** Total compressed packet transmitted.
+         */
+        /** Total compressed packet transmitted. */
         unsigned long send_compressed;
 };
 …
 /** @}
  */

uspace/lib/c/include/net/icmp_codes.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup icmp
+/** @addtogroup libc
  *  @{
  */
 /** @file
+ *  ICMP types and codes according to the on-line IANA - ICMP Type Numbers - <http://http://www.iana.org/assignments/icmp-parameters>, cited September 14 2009.
+ */
+#ifndef __NET_ICMP_CODES_H__
+#define __NET_ICMP_CODES_H__
+/** ICMP type type definition.
+ */
+typedef uint8_t icmp_type_t;
+/** ICMP code type definition.
+ */
+typedef uint8_t icmp_code_t;
+/** ICMP parameter type definition.
+ */
+typedef uint16_t        icmp_param_t;
+/** @name ICMP types definitions
+ */
+/*@{*/
+/** Echo Reply.
+ */
+ * ICMP types and codes according to the on-line IANA - ICMP Type Numbers
+ *
+ * http://www.iana.org/assignments/icmp-parameters>
+ *
+ * cited September 14 2009.
+ */
+#ifndef LIBC_ICMP_CODES_H_
+#define LIBC_ICMP_CODES_H_
+/** ICMP type type definition. */
+typedef uint8_t icmp_type_t;
+/** ICMP code type definition. */
+typedef uint8_t icmp_code_t;
+/** ICMP parameter type definition. */
+typedef uint16_t icmp_param_t;
+/** @name ICMP types definitions */
+/*@{*/
+/** Echo Reply. */
 #define ICMP_ECHOREPLY          0
+/** Destination Unreachable.
+ */
+/** Destination Unreachable. */
 #define ICMP_DEST_UNREACH       3
+/** Source Quench.
+ */
+/** Source Quench. */
 #define ICMP_SOURCE_QUENCH      4
+/** Redirect.
+ */
+/** Redirect. */
 #define ICMP_REDIRECT           5
+/** Alternate Host Address.
+ */
+/** Alternate Host Address. */
 #define ICMP_ALTERNATE_ADDR     6
+/** Echo Request.
+ */
+#define ICMP_ECHO                       8
+/** Router Advertisement.
+ */
+/** Echo Request. */
+#define ICMP_ECHO               8
+/** Router Advertisement. */
 #define ICMP_ROUTER_ADV         9
+/** Router solicitation.
+ */
+/** Router solicitation. */
 #define ICMP_ROUTER_SOL         10
+/** Time Exceeded.
+ */
+/** Time Exceeded. */
 #define ICMP_TIME_EXCEEDED      11
+/** Parameter Problem.
+ */
+/** Parameter Problem. */
 #define ICMP_PARAMETERPROB      12
+/** Timestamp Request.
+ */
+/** Timestamp Request. */
 #define ICMP_TIMESTAMP          13
+/** Timestamp Reply.
+ */
+/** Timestamp Reply. */
 #define ICMP_TIMESTAMPREPLY     14
+/** Information Request.
+ */
+/** Information Request. */
 #define ICMP_INFO_REQUEST       15
+/** Information Reply.
+ */
+/** Information Reply. */
 #define ICMP_INFO_REPLY         16
+/** Address Mask Request.
+ */
+/** Address Mask Request. */
 #define ICMP_ADDRESS            17
+/** Address Mask Reply.
+ */
+/** Address Mask Reply. */
 #define ICMP_ADDRESSREPLY       18
+/** Traceroute.
+ */
+/** Traceroute. */
 #define ICMP_TRACEROUTE         30
+/** Datagram Conversion Error.
+ */
+/** Datagram Conversion Error. */
 #define ICMP_CONVERSION_ERROR   31
+/** Mobile Host Redirect.
+ */
+/** Mobile Host Redirect. */
 #define ICMP_REDIRECT_MOBILE    32
+/** IPv6 Where-Are-You.
+ */
+/** IPv6 Where-Are-You. */
 #define ICMP_IPV6_WHERE_ARE_YOU 33
+/** IPv6 I-Am-Here.
+ */
+/** IPv6 I-Am-Here. */
 #define ICMP_IPV6_I_AM_HERE     34
+/** Mobile Registration Request.
+ */
+/** Mobile Registration Request. */
 #define ICMP_MOBILE_REQUEST     35
+/** Mobile Registration Reply.
+ */
+/** Mobile Registration Reply. */
 #define ICMP_MOBILE_REPLY       36
+/** Domain name request.
+ */
+/** Domain name request. */
 #define ICMP_DN_REQUEST         37
+/** Domain name reply.
+ */
+/** Domain name reply. */
 #define ICMP_DN_REPLY           38
+/** SKIP.
+ */
+#define ICMP_SKIP                       39
+/** Photuris.
+ */
+/** SKIP. */
+#define ICMP_SKIP               39
+/** Photuris. */
 #define ICMP_PHOTURIS           40
 …
 /*@{*/
+/** Network Unreachable.
+ */
+/** Network Unreachable. */
 #define ICMP_NET_UNREACH        0
+/** Host Unreachable.
+ */
+/** Host Unreachable. */
 #define ICMP_HOST_UNREACH       1
+/** Protocol Unreachable.
+ */
+/** Protocol Unreachable. */
 #define ICMP_PROT_UNREACH       2
+/** Port Unreachable.
+ */
+/** Port Unreachable. */
 #define ICMP_PORT_UNREACH       3
+/** Fragmentation needed but the Do Not Fragment bit was set.
+ */
+/** Fragmentation needed but the Do Not Fragment bit was set. */
 #define ICMP_FRAG_NEEDED        4
+/** Source Route failed.
+ */
+/** Source Route failed. */
 #define ICMP_SR_FAILED          5
+/** Destination network unknown.
+ */
+/** Destination network unknown. */
 #define ICMP_NET_UNKNOWN        6
+/** Destination host unknown.
+ */
+/** Destination host unknown. */
 #define ICMP_HOST_UNKNOWN       7
+/** Source host isolated (obsolete).
+ */
+/** Source host isolated (obsolete). */
 #define ICMP_HOST_ISOLATED      8
+/** Destination network administratively prohibited.
+ */
+/** Destination network administratively prohibited. */
 #define ICMP_NET_ANO            9
+/** Destination host administratively prohibited.
+ */
+/** Destination host administratively prohibited. */
 #define ICMP_HOST_ANO           10
+/** Network unreachable for this type of service.
+ */
+/** Network unreachable for this type of service. */
 #define ICMP_NET_UNR_TOS        11
+/** Host unreachable for this type of service.
+ */
+/** Host unreachable for this type of service. */
 #define ICMP_HOST_UNR_TOS       12
+/** Communication administratively prohibited by filtering.
+ */
+/** Communication administratively prohibited by filtering. */
 #define ICMP_PKT_FILTERED       13
+/** Host precedence violation.
+ */
+/** Host precedence violation. */
 #define ICMP_PREC_VIOLATION     14
+/** Precedence cutoff in effect.
+ */
+/** Precedence cutoff in effect. */
 #define ICMP_PREC_CUTOFF        15
 /*@}*/
+/** @name ICMP_REDIRECT codes definitions
+ */
+/*@{*/
+/** Network redirect (or subnet).
+ */
+/** @name ICMP_REDIRECT codes definitions */
+/*@{*/
+/** Network redirect (or subnet). */
 #define ICMP_REDIR_NET          0
+/** Host redirect.
+ */
+/** Host redirect. */
 #define ICMP_REDIR_HOST         1
+/** Network redirect for this type of service.
+ */
+/** Network redirect for this type of service. */
 #define ICMP_REDIR_NETTOS       2
+/** Host redirect for this type of service.
+ */
+/** Host redirect for this type of service. */
 #define ICMP_REDIR_HOSTTOS      3
 /*@}*/
+/** @name ICMP_ALTERNATE_ADDRESS codes definitions
+ */
+/*@{*/
+/** Alternate address for host.
+ */
+/** @name ICMP_ALTERNATE_ADDRESS codes definitions */
+/*@{*/
+/** Alternate address for host. */
 #define ICMP_ALTERNATE_HOST     0
 /*@}*/
+/** @name ICMP_ROUTER_ADV codes definitions
+ */
+/*@{*/
+/** Normal router advertisement.
+ */
+/** @name ICMP_ROUTER_ADV codes definitions */
+/*@{*/
+/** Normal router advertisement. */
 #define ICMP_ROUTER_NORMAL      0
+/** Does not route common traffic.
+ */
+/** Does not route common traffic. */
 #define ICMP_ROUTER_NO_NORMAL_TRAFFIC   16
 /*@}*/
+/** @name ICMP_TIME_EXCEEDED codes definitions
+ */
+/*@{*/
+/** Transit TTL exceeded.
+ */
+/** @name ICMP_TIME_EXCEEDED codes definitions */
+/*@{*/
+/** Transit TTL exceeded. */
 #define ICMP_EXC_TTL            0
+/** Reassembly TTL exceeded.
+ */
+/** Reassembly TTL exceeded. */
 #define ICMP_EXC_FRAGTIME       1
 /*@}*/
+/** @name ICMP_PARAMETERPROB codes definitions
+ */
+/*@{*/
+/** Pointer indicates the error.
+ */
+/** @name ICMP_PARAMETERPROB codes definitions */
+/*@{*/
+/** Pointer indicates the error. */
 #define ICMP_PARAM_POINTER      0
+/** Missing required option.
+ */
+/** Missing required option. */
 #define ICMP_PARAM_MISSING      1
+/** Bad length.
+ */
+/** Bad length. */
 #define ICMP_PARAM_LENGTH       2
 /*@}*/
+/** @name ICMP_PHOTURIS codes definitions
+ */
+/*@{*/
+/** Bad SPI.
+ */
+#define ICMP_PHOTURIS_BAD_SPI   0
+/** Authentication failed.
+ */
+#define ICMP_PHOTURIS_AUTHENTICATION    1
+/** Decompression failed.
+ */
+/** @name ICMP_PHOTURIS codes definitions */
+/*@{*/
+/** Bad SPI. */
+#define ICMP_PHOTURIS_BAD_SPI                   0
+/** Authentication failed. */
+#define ICMP_PHOTURIS_AUTHENTICATION            1
+/** Decompression failed. */
 #define ICMP_PHOTURIS_DECOMPRESSION             2
+/** Decryption failed.
+ */
+#define ICMP_PHOTURIS_DECRYPTION        3
+/** Need authentication.
+ */
+/** Decryption failed. */
+#define ICMP_PHOTURIS_DECRYPTION                3
+/** Need authentication. */
 #define ICMP_PHOTURIS_NEED_AUTHENTICATION       4
+/** Need authorization.
+ */
+/** Need authorization. */
 #define ICMP_PHOTURIS_NEED_AUTHORIZATION        5

uspace/lib/c/include/net/icmp_common.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup icmp
+/** @addtogroup libc
  *  @{
  */
 /** @file
  *  ICMP module common interface.
+ * ICMP module common interface.
  */
 #ifndef __NET_ICMP_COMMON_H__
 #define __NET_ICMP_COMMON_H__
+#ifndef LIBC_ICMP_COMMON_H_
+#define LIBC_ICMP_COMMON_H_
 #include <ipc/services.h>
 #include <sys/time.h>
+/** Default timeout for incoming connections in microseconds.
+ */
+/** Default timeout for incoming connections in microseconds. */
 #define ICMP_CONNECT_TIMEOUT    (1 * 1000 * 1000)
+/** Connects to the ICMP module.
+ *  @param service The ICMP module service. Ignored parameter.
+ *  @param[in] timeout The connection timeout in microseconds. No timeout if set to zero (0).
+ *  @returns The ICMP module phone on success.
+ *  @returns The ICMP socket identifier if called by the bundle module.
+ *  @returns ETIMEOUT if the connection timeouted.
+ */
+extern int icmp_connect_module(services_t service, suseconds_t timeout);
+extern int icmp_connect_module(services_t, suseconds_t);
 #endif

uspace/lib/c/include/net/in.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
+/** @addtogroup libc
  *  @{
  */
 …
  */
 #ifndef __NET_IN_H__
 #define __NET_IN_H__
+#ifndef LIBC_IN_H_
+#define LIBC_IN_H_
+#include <net/inet.h>
+#include <net/ip_protocols.h>
 #include <sys/types.h>
+#include <ip_protocols.h>
+#include <inet.h>
+/** INET string address maximum length.
+ */
+/** INET string address maximum length. */
 #define INET_ADDRSTRLEN         (4 * 3 + 3 + 1)
 /** Type definition of the INET address.
  *  @see in_addr
+ * @see in_addr
  */
 typedef struct in_addr          in_addr_t;
 /** Type definition of the INET socket address.
  *  @see sockaddr_in
+ * @see sockaddr_in
  */
 typedef struct sockaddr_in      sockaddr_in_t;
+/** INET address.
+ */
+struct in_addr{
+        /** 4 byte IP address.
+         */
+/** INET address. */
+struct in_addr {
+        /** 4 byte IP address. */
         uint32_t s_addr;
 };
 /** INET socket address.
  *  @see sockaddr
+ * @see sockaddr
  */
+struct sockaddr_in{
+        /** Address family.
+         *  Should be AF_INET.
+         */
+struct sockaddr_in {
+        /** Address family. Should be AF_INET. */
         uint16_t sin_family;
+        /** Port number.
+         */
+        /** Port number. */
         uint16_t sin_port;
+        /** Internet address.
+         */
+        /** Internet address. */
         struct in_addr sin_addr;
+        /** Padding to meet the sockaddr size.
+         */
+        /** Padding to meet the sockaddr size. */
         uint8_t sin_zero[8];
 };

uspace/lib/c/include/net/in6.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
+/** @addtogroup libc
  *  @{
  */
 …
  */
 #ifndef __NET_IN6_H__
 #define __NET_IN6_H__
+#ifndef LIBC_IN6_H_
+#define LIBC_IN6_H_
+#include <net/inet.h>
+#include <net/ip_protocols.h>
 #include <sys/types.h>
+#include <ip_protocols.h>
+#include <inet.h>
+/** INET6 string address maximum length.
+ */
+/** INET6 string address maximum length. */
 #define INET6_ADDRSTRLEN        (8 * 4 + 7 + 1)
 /** Type definition of the INET6 address.
  *  @see in6_addr
+ * @see in6_addr
  */
 typedef struct in6_addr in6_addr_t;
 /** Type definition of the INET6 socket address.
  *  @see sockaddr_in6
+ * @see sockaddr_in6
  */
 typedef struct sockaddr_in6     sockaddr_in6_t;
+/** INET6 address.
+ */
+struct in6_addr{
+        /** 16 byte IPv6 address.
+         */
+/** INET6 address. */
+struct in6_addr {
+        /** 16 byte IPv6 address. */
         unsigned char s6_addr[16];
 };
 /** INET6 socket address.
  *  @see sockaddr
+ * @see sockaddr
  */
+struct sockaddr_in6{
+        /** Address family.
+         *  Should be AF_INET6.
+         */
+struct sockaddr_in6 {
+        /** Address family. Should be AF_INET6. */
         uint16_t sin6_family;
+        /** Port number.
+         */
+        /** Port number. */
         uint16_t sin6_port;
+        /** IPv6 flow information.
+         */
+        /** IPv6 flow information. */
         uint32_t sin6_flowinfo;
+        /** IPv6 address.
+         */
+        /** IPv6 address. */
         struct in6_addr sin6_addr;
+        /** Scope identifier.
+         */
+        /** Scope identifier. */
         uint32_t sin6_scope_id;
 };

uspace/lib/c/include/net/packet_header.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup packet
+/** @addtogroup libc
  *  @{
  */
 /** @file
  *  Packet header.
+ * Packet header.
  */
 #ifndef __NET_PACKET_HEADER_H__
 #define __NET_PACKET_HEADER_H__
+#ifndef LIBC_PACKET_HEADER_H_
+#define LIBC_PACKET_HEADER_H_
 #include <packet/packet.h>
+#include <net/packet.h>
 /** Returns the actual packet data length.
  *  @param[in] header The packet header.
+ * @param[in] header    The packet header.
  */
+#define PACKET_DATA_LENGTH(header)              ((header)->data_end - (header)->data_start)
+#define PACKET_DATA_LENGTH(header) \
+        ((header)->data_end - (header)->data_start)
 /** Returns the maximum packet address length.
  *  @param[in] header The packet header.
+ * @param[in] header    The packet header.
  */
+#define PACKET_MAX_ADDRESS_LENGTH(header)               ((header)->dest_addr - (header)->src_addr)
+#define PACKET_MAX_ADDRESS_LENGTH(header) \
+        ((header)->dest_addr - (header)->src_addr)
 /** Returns the minimum packet suffix.
  *  @param[in] header The packet header.
+ *  @param[in] header   The packet header.
  */
+#define PACKET_MIN_SUFFIX(header)               ((header)->length - (header)->data_start - (header)->max_content)
+#define PACKET_MIN_SUFFIX(header) \
+        ((header)->length - (header)->data_start - (header)->max_content)
+/** Packet integrity check magic value.
+ */
+/** Packet integrity check magic value. */
 #define PACKET_MAGIC_VALUE      0x11227788
+/** Packet header.
+ */
+struct packet{
+        /** Packet identifier.
+         */
+/** Packet header. */
+struct packet {
+        /** Packet identifier. */
         packet_id_t packet_id;
+        /** Packet queue sorting value.
+         *  The packet queue is sorted the ascending order.
+        /**
+         * Packet queue sorting value.
+         * The packet queue is sorted the ascending order.
          */
         size_t order;
+        /** Packet metric.
          */
+        /** Packet metric. */
         size_t metric;
+        /** Previous packet in the queue.
+         */
+        /** Previous packet in the queue. */
         packet_id_t previous;
+        /** Next packet in the queue.
+         */
+        /** Next packet in the queue. */
         packet_id_t next;
+        /** Total length of the packet.
+         *  Contains the header, the addresses and the data of the packet.
+         *  Corresponds to the mapped sharable memory block.
+        /**
+         * Total length of the packet.
+         * Contains the header, the addresses and the data of the packet.
+         * Corresponds to the mapped sharable memory block.
          */
         size_t length;
+        /** Stored source and destination addresses length.
          */
+        /** Stored source and destination addresses length. */
         size_t addr_len;
+        /** Souce address offset in bytes from the beginning of the packet header.
+        /**
+         * Souce address offset in bytes from the beginning of the packet
+         * header.
          */
         size_t src_addr;
+        /** Destination address offset in bytes from the beginning of the packet header.
+        /**
+         * Destination address offset in bytes from the beginning of the packet
+         * header.
          */
         size_t dest_addr;
+        /** Reserved data prefix length in bytes.
          */
+        /** Reserved data prefix length in bytes. */
         size_t max_prefix;
+        /** Reserved content length in bytes.
+         */
+        /** Reserved content length in bytes. */
         size_t max_content;
+        /** Actual data start offset in bytes from the beginning of the packet header.
+        /**
+         * Actual data start offset in bytes from the beginning of the packet
+         * header.
          */
         size_t data_start;
+        /** Actual data end offset in bytes from the beginning of the packet header.
+        /**
+         * Actual data end offset in bytes from the beginning of the packet
+         * header.
          */
         size_t data_end;
+        /** Integrity check magic value.
          */
+        /** Integrity check magic value. */
         int magic_value;
 };
 /** Returns whether the packet is valid.
+ *  @param[in] packet The packet to be checked.
+ *  @returns true if the packet is not NULL and the magic value is correct.
+ *  @returns false otherwise.
+ * @param[in] packet    The packet to be checked.
+ * @returns             True if the packet is not NULL and the magic value is
+ *                      correct.
+ * @returns             False otherwise.
  */
+static inline int packet_is_valid(const packet_t packet){
+static inline int packet_is_valid(const packet_t packet)
+{
         return packet && (packet->magic_value == PACKET_MAGIC_VALUE);
+}

uspace/lib/c/include/stdio.h

r1882525	rf14291b
171	171	extern off64_t ftell(FILE *);
172	172	extern int feof(FILE *);
	173	extern int fileno(FILE *);
173	174
174	175	extern int fflush(FILE *);

uspace/lib/c/include/sys/time.h

-              r1882525
+              rf14291b
 typedef long suseconds_t;
+typedef uint32_t useconds_t;
+typedef uint32_t mseconds_t;
 struct timeval {
         time_t tv_sec;        /* seconds */

uspace/lib/c/include/unistd.h

-              r1882525
+              rf14291b
 #include <sys/types.h>
+#include <time.h>
 #include <libarch/config.h>
 …
         #define SEEK_END  2
 #endif
-typedef uint32_t useconds_t;
 extern int dup2(int oldfd, int newfd);

uspace/lib/net/Makefile

-              r1882525
+              rf14291b
 USPACE_PREFIX = ../..
 EXTRA_CFLAGS = -Iinclude -I$(LIBSOCKET_PREFIX)/include
+EXTRA_CFLAGS = -Iinclude
 LIBRARY = libnet
 SOURCES = \
+        generic/generic.c \
         generic/net_remote.c \
         generic/net_checksum.c \
+        generic/packet_client.c \
         generic/packet_remote.c \
+        generic/socket_core.c \
         adt/module_map.c \
         netif/netif_local.c \
         netif/netif_remote.c \
-        netif/netif_nil_bundle.c \
         nil/nil_remote.c \
         il/ip_remote.c \

uspace/lib/net/adt/module_map.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  Character string to module map implementation.
+ * Character string to module map implementation.
  */
 …
 #include <task.h>
 #include <unistd.h>
+#include <err.h>
 #include <ipc/services.h>
+#include <net_err.h>
+#include <net_modules.h>
+#include <net/modules.h>
 #include <adt/generic_char_map.h>
 …
 GENERIC_CHAR_MAP_IMPLEMENT(modules, module_t)
+int add_module(module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t connect_module){
+/** Adds module to the module map.
+ *
+ * @param[out] module   The module structure added.
+ * @param[in] modules   The module map.
+ * @param[in] name      The module name.
+ * @param[in] filename  The full path filename.
+ * @param[in] service   The module service.
+ * @param[in] task_id   The module current task identifier. Zero means not
+ *                      running.
+ * @param[in] connect_module The module connecting function.
+ * @returns             EOK on success.
+ * @returns             ENOMEM if there is not enough memory left.
+ */
+int
+add_module(module_ref *module, modules_ref modules, const char *name,
+    const char *filename, services_t service, task_id_t task_id,
+    connect_module_t connect_module)
+{
         ERROR_DECLARE;
 …
         tmp_module = (module_ref) malloc(sizeof(module_t));
         if(! tmp_module){
+        if (!tmp_module)
                 return ENOMEM;
+        }
         tmp_module->task_id = task_id;
         tmp_module->phone = 0;
 …
         tmp_module->service = service;
         tmp_module->connect_module = connect_module;
+        if(ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0, tmp_module))){
+        if (ERROR_OCCURRED(modules_add(modules, tmp_module->name, 0,
+            tmp_module))) {
                 free(tmp_module);
                 return ERROR_CODE;
+        }
         if(module){
+        if (module)
                 *module = tmp_module;
+        }
         return EOK;
+}
+module_ref get_running_module(modules_ref modules, char * name){
+/** Searches and returns the specified module.
+ *
+ * If the module is not running, the module filaname is spawned.
+ * If the module is not connected, the connect_function is called.
+ *
+ * @param[in] modules   The module map.
+ * @param[in] name      The module name.
+ * @returns             The running module found. It does not have to be
+ *                      connected.
+ * @returns             NULL if there is no such module.
+ */
+module_ref get_running_module(modules_ref modules, char *name)
+{
         module_ref module;
         module = modules_find(modules, name, 0);
         if(! module){
+        if (!module)
                 return NULL;
+        if (!module->task_id) {
+                module->task_id = spawn(module->filename);
+                if (!module->task_id)
+                        return NULL;
+        }
+        if(! module->task_id){
+                module->task_id = spawn(module->filename);
+                if(! module->task_id){
+                        return NULL;
+                }
+        }
+        if(! module->phone){
+        if (!module->phone)
                 module->phone = module->connect_module(module->service);
+        }
         return module;
+}
+/** Starts the given module.
+ *
+ * @param[in] fname     The module full or relative path filename.
+ * @returns             The new module task identifier on success.
+ * @returns             Zero if there is no such module.
+ */
 task_id_t spawn(const char *fname)
+{

uspace/lib/net/generic/net_checksum.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  General CRC and checksum computation implementation.
+ * General CRC and checksum computation implementation.
  */
 …
 #include <net_checksum.h>
+/** Big-endian encoding CRC divider.
+ */
+#define CRC_DIVIDER_BE  0x04C11DB7
+/** Little-endian encoding CRC divider.
+ */
+#define CRC_DIVIDER_LE  0xEDB88320
+uint16_t compact_checksum(uint32_t sum){
+/** Big-endian encoding CRC divider. */
+#define CRC_DIVIDER_BE  0x04c11db7
+/** Little-endian encoding CRC divider. */
+#define CRC_DIVIDER_LE  0xedb88320
+/** Compacts the computed checksum to the 16 bit number adding the carries.
+ *
+ * @param[in] sum       Computed checksum.
+ * @returns             Compacted computed checksum to the 16 bits.
+ */
+uint16_t compact_checksum(uint32_t sum)
+{
         // shorten to the 16 bits
+        while(sum >> 16){
+                sum = (sum &0xFFFF) + (sum >> 16);
+        }
+        while (sum >> 16)
+                sum = (sum & 0xffff) + (sum >> 16);
         return (uint16_t) sum;
+}
+uint32_t compute_checksum(uint32_t seed, uint8_t * data, size_t length){
+/** Computes sum of the 2 byte fields.
+ *
+ * Padds one zero (0) byte if odd.
+ *
+ * @param[in] seed      Initial value. Often used as 0 or ~0.
+ * @param[in] data      Pointer to the beginning of data to process.
+ * @param[in] length    Length of the data in bytes.
+ * @returns             The computed checksum of the length bytes of the data.
+ */
+uint32_t compute_checksum(uint32_t seed, uint8_t *data, size_t length)
+{
         size_t index;
         // sum all the 16 bit fields
         for(index = 0; index + 1 < length; index += 2){
+        for (index = 0; index + 1 < length; index += 2)
                 seed += (data[index] << 8) + data[index + 1];
+        }
         // last odd byte with zero padding
         if(index + 1 == length){
+        if (index + 1 == length)
                 seed += data[index] << 8;
+        }
         return seed;
+}
+uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length){
+/** Computes CRC32 value in the big-endian environment.
+ *
+ * @param[in] seed      Initial value. Often used as 0 or ~0.
+ * @param[in] data      Pointer to the beginning of data to process.
+ * @param[in] length    Length of the data in bits.
+ * @returns             The computed CRC32 of the length bits of the data.
+ */
+uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length)
+{
         size_t index;
         // process full bytes
         while(length >= 8){
+        while (length >= 8) {
                 // add the data
                 seed ^= (*data) << 24;
                 // for each added bit
                 for(index = 0; index < 8; ++ index){
+                for (index = 0; index < 8; ++index) {
                         // if the first bit is set
                         if(seed &0x80000000){
+                        if (seed & 0x80000000) {
                                 // shift and divide the checksum
                                 seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
                         }else{
+                        } else {
                                 // shift otherwise
                                 seed <<= 1;
+                        }
+                }
                 // move to the next byte
                 ++ data;
+                ++data;
                 length -= 8;
+        }
         // process the odd bits
         if(length > 0){
+        if (length > 0) {
                 // add the data with zero padding
+                seed ^= ((*data) &(0xFF << (8 - length))) << 24;
+                seed ^= ((*data) & (0xff << (8 - length))) << 24;
                 // for each added bit
                 for(index = 0; index < length; ++ index){
+                for (index = 0; index < length; ++index) {
                         // if the first bit is set
                         if(seed &0x80000000){
+                        if (seed & 0x80000000) {
                                 // shift and divide the checksum
                                 seed = (seed << 1) ^ ((uint32_t) CRC_DIVIDER_BE);
                         }else{
+                        } else {
                                 // shift otherwise
                                 seed <<= 1;
 …
+}
+uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length){
+/** Computes CRC32 value in the little-endian environment.
+ *
+ * @param[in] seed      Initial value. Often used as 0 or ~0.
+ * @param[in] data      Pointer to the beginning of data to process.
+ * @param[in] length    Length of the data in bits.
+ * @returns             The computed CRC32 of the length bits of the data.
+ */
+uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length)
+{
         size_t index;
         // process full bytes
         while(length >= 8){
+        while (length >= 8) {
                 // add the data
                 seed ^= (*data);
                 // for each added bit
                 for(index = 0; index < 8; ++ index){
+                for (index = 0; index < 8; ++index) {
                         // if the last bit is set
                         if(seed &1){
+                        if (seed & 1) {
                                 // shift and divide the checksum
                                 seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
                         }else{
+                        } else {
                                 // shift otherwise
                                 seed >>= 1;
+                        }
+                }
                 // move to the next byte
                 ++ data;
+                ++data;
                 length -= 8;
+        }
         // process the odd bits
         if(length > 0){
+        if (length > 0) {
                 // add the data with zero padding
                 seed ^= (*data) >> (8 - length);
+                for(index = 0; index < length; ++ index){
+                for (index = 0; index < length; ++index) {
                         // if the last bit is set
                         if(seed &1){
+                        if (seed & 1) {
                                 // shift and divide the checksum
                                 seed = (seed >> 1) ^ ((uint32_t) CRC_DIVIDER_LE);
                         }else{
+                        } else {
                                 // shift otherwise
                                 seed >>= 1;
 …
+}
+uint16_t flip_checksum(uint16_t checksum){
+/** Returns or flips the checksum if zero.
+ *
+ * @param[in] checksum  The computed checksum.
+ * @returns             The internet protocol header checksum.
+ * @returns             0xFFFF if the computed checksum is zero.
+ */
+uint16_t flip_checksum(uint16_t checksum)
+{
         // flip, zero is returned as 0xFFFF (not flipped)
         checksum = ~ checksum;
+        checksum = ~checksum;
         return checksum ? checksum : IP_CHECKSUM_ZERO;
+}
+uint16_t ip_checksum(uint8_t * data, size_t length){
+/** Computes the ip header checksum.
+ *
+ * To compute the checksum of a new packet, the checksum header field must be
+ * zero. To check the checksum of a received packet, the checksum may be left
+ * set. Zero will be returned in this case if valid.
+ *
+ * @param[in] data      The header data.
+ * @param[in] length    The header length in bytes.
+ * @returns             The internet protocol header checksum.
+ * @returns             0xFFFF if the computed checksum is zero.
+ */
+uint16_t ip_checksum(uint8_t *data, size_t length)
+{
         // compute, compact and flip the data checksum
+        return flip_checksum(compact_checksum(compute_checksum(0, data, length)));
+        return flip_checksum(compact_checksum(compute_checksum(0, data,
+            length)));
+}

uspace/lib/net/generic/net_remote.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  Networking interface implementation for remote modules.
  *  @see net_interface.h
+ * Networking interface implementation for remote modules.
+ * @see net_interface.h
  */
 #include <ipc/services.h>
+#include <ipc/net_net.h>
 #include <malloc.h>
 #include <net_messages.h>
 #include <net_modules.h>
 #include <net_device.h>
+#include <generic.h>
+#include <net/modules.h>
+#include <net/device.h>
 #include <net_interface.h>
 #include <adt/measured_strings.h>
-#include <net_net_messages.h>
+int net_connect_module(services_t service){
+/** Connects to the networking module.
+ *
+ * @returns             The networking module phone on success.
+ */
+int net_connect_module(void)
+{
         return connect_to_service(SERVICE_NETWORKING);
+}
+void net_free_settings(measured_string_ref settings, char * data){
+        if(settings){
+/** Frees the received settings.
+ *
+ * @param[in] settings  The received settings.
+ * @param[in] data      The received settings data.
+ * @see net_get_device_conf_req()
+ * @see net_get_conf_req()
+ */
+void net_free_settings(measured_string_ref settings, char *data)
+{
+        if (settings)
                 free(settings);
+        }
+        if(data){
+        if (data)
                 free(data);
+        }
+}
+int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data){
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0, * configuration, count, configuration, data);
+/** Returns the global configuration.
+ *
+ * The configuration names are read and the appropriate settings are set
+ * instead. Call net_free_settings() function to release the returned
+ * configuration.
+ *
+ * @param[in] net_phone The networking module phone.
+ * @param[in,out] configuration The requested configuration. The names are read
+ * and the appropriate settings are set instead.
+ *
+ * @param[in] count     The configuration entries count.
+ * @param[in,out] data  The configuration and settings data.
+ * @returns             EOK on success.
+ * @returns             EINVAL if the configuration is NULL.
+ * @returns             EINVAL if the count is zero.
+ * @returns             Other error codes as defined for the
+ *                      generic_translate_req() function.
+ */
+int
+net_get_conf_req(int net_phone, measured_string_ref *configuration,
+    size_t count, char **data)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, 0, 0,
+            *configuration, count, configuration, data);
+}
+int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data){
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF, device_id, 0, * configuration, count, configuration, data);
+/** Returns the device specific configuration.
+ *
+ * Returns the global configuration if the device specific is not found.
+ * The configuration names are read and the appropriate settings are set
+ * instead. Call net_free_settings() function to release the returned
+ * configuration.
+ *
+ * @param[in] net_phone The networking module phone.
+ * @param[in] device_id The device identifier.
+ * @param[in,out] configuration The requested device configuration. The names
+ *                      are read and the appropriate settings are set instead.
+ * @param[in] count     The configuration entries count.
+ * @param[in,out] data  The configuration and settings data.
+ * @returns             EOK on success.
+ * @returns             EINVAL if the configuration is NULL.
+ * @returns             EINVAL if the count is zero.
+ * @returns             Other error codes as defined for the
+ *                      generic_translate_req() function.
+ */
+int
+net_get_device_conf_req(int net_phone, device_id_t device_id,
+    measured_string_ref *configuration, size_t count, char **data)
+{
+        return generic_translate_req(net_phone, NET_NET_GET_DEVICE_CONF,
+            device_id, 0, *configuration, count, configuration, data);
+}

uspace/lib/net/generic/packet_remote.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup packet
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  Packet client interface implementation for remote modules.
  *  @see packet_client.h
+ * Packet client interface implementation for remote modules.
+ * @see packet_client.h
  */
 #include <async.h>
 #include <errno.h>
+#include <err.h>
 #include <ipc/ipc.h>
+#include <ipc/packet.h>
 #include <sys/mman.h>
+#include <net_err.h>
+#include <net_messages.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <packet/packet_header.h>
+#include <packet/packet_messages.h>
+#include <packet_client.h>
 #include <packet_remote.h>
+#include <net/packet.h>
+#include <net/packet_header.h>
 /** Obtain the packet from the packet server as the shared memory block.
 …
+ *
  */
+static int packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size){
+static int
+packet_return(int phone, packet_ref packet, packet_id_t packet_id, size_t size)
+{
         ERROR_DECLARE;
         ipc_call_t answer;
         aid_t message = async_send_1(phone, NET_PACKET_GET, packet_id, &answer);
         *packet = (packet_t) as_get_mappable_page(size);
         if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size))
             || ERROR_OCCURRED(pm_add(*packet))) {
+        if (ERROR_OCCURRED(async_share_in_start_0_0(phone, *packet, size)) ||
+            ERROR_OCCURRED(pm_add(*packet))) {
                 munmap(*packet, size);
                 async_wait_for(message, NULL);
 …
+}
+/** Translates the packet identifier to the packet reference.
+ *
+ * Tries to find mapping first.
+ * Contacts the packet server to share the packet if the mapping is not present.
+ *
+ * @param[in] phone     The packet server module phone.
+ * @param[out] packet   The packet reference.
+ * @param[in] packet_id The packet identifier.
+ * @returns             EOK on success.
+ * @returns             EINVAL if the packet parameter is NULL.
+ * @returns             Other error codes as defined for the NET_PACKET_GET_SIZE
+ *                      message.
+ * @returns             Other error codes as defined for the packet_return()
+ *                      function.
+ */
 int packet_translate_remote(int phone, packet_ref packet, packet_id_t packet_id)
+{
 …
         *packet = pm_find(packet_id);
         if (!(*packet)) {
+        if (!*packet) {
                 ipcarg_t size;
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE, packet_id, &size));
+                ERROR_PROPAGATE(async_req_1_1(phone, NET_PACKET_GET_SIZE,
+                    packet_id, &size));
                 ERROR_PROPAGATE(packet_return(phone, packet, packet_id, size));
+        }
         if ((** packet).next) {
+        if ((*packet)->next) {
                 packet_t next;
                 return packet_translate_remote(phone, &next, (** packet).next);
+                return packet_translate_remote(phone, &next, (*packet)->next);
+        }
 …
+}
+/** Obtains the packet of the given dimensions.
+ *
+ * Contacts the packet server to return the appropriate packet.
+ *
+ * @param[in] phone     The packet server module phone.
+ * @param[in] addr_len  The source and destination addresses maximal length in
+ *                      bytes.
+ * @param[in] max_prefix The maximal prefix length in bytes.
+ * @param[in] max_content The maximal content length in bytes.
+ * @param[in] max_suffix The maximal suffix length in bytes.
+ * @returns             The packet reference.
+ * @returns             NULL on error.
+ */
 packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
     size_t max_prefix, size_t max_suffix)
 …
         ipcarg_t size;
         if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4, max_content,
             addr_len, max_prefix, max_suffix, &packet_id, &size)))
+        if (ERROR_OCCURRED(async_req_4_2(phone, NET_PACKET_CREATE_4,
+            max_content, addr_len, max_prefix, max_suffix, &packet_id, &size)))
                 return NULL;
 …
         packet_t packet = pm_find(packet_id);
         if (!packet) {
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
+        }
 …
+}
+/** Obtains the packet of the given content size.
+ *
+ * Contacts the packet server to return the appropriate packet.
+ *
+ * @param[in] phone     The packet server module phone.
+ * @param[in] content   The maximal content length in bytes.
+ * @returns             The packet reference.
+ * @returns             NULL on error.
+ */
 packet_t packet_get_1_remote(int phone, size_t content)
+{
 …
         packet_t packet = pm_find(packet_id);
         if (!packet) {
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id, size)))
+                if (ERROR_OCCURRED(packet_return(phone, &packet, packet_id,
+                    size)))
                         return NULL;
+        }
 …
+}
+/** Releases the packet queue.
+ *
+ * All packets in the queue are marked as free for use.
+ * The packet queue may be one packet only.
+ * The module should not use the packets after this point until they are
+ * received or obtained again.
+ *
+ * @param[in] phone     The packet server module phone.
+ * @param[in] packet_id The packet identifier.
+ */
 void pq_release_remote(int phone, packet_id_t packet_id)
+{

uspace/lib/net/il/arp_remote.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup arp
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  ARP interface implementation for remote modules.
  *  @see arp_interface.h
+ * ARP interface implementation for remote modules.
+ * @see arp_interface.h
  */
+#include <arp_interface.h>
+#include <generic.h>
 #include <async.h>
 …
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/arp.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net_device.h>
+#include <arp_interface.h>
+#include <net/modules.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
-#include <arp_messages.h>
+int arp_connect_module(services_t service){
+        if(service != SERVICE_ARP){
+/** Connects to the ARP module.
+ *
+ * @param service       The ARP module service. Ignored parameter.
+ * @returns             The ARP module phone on success.
+ */
+int arp_connect_module(services_t service)
+{
+        if (service != SERVICE_ARP)
                 return EINVAL;
+        }
         return connect_to_service(SERVICE_ARP);
+}
+int arp_clean_cache_req(int arp_phone){
+/** Cleans the cache.
+ *
+ * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ * @returns             EOK on success.
+ */
+int arp_clean_cache_req(int arp_phone)
+{
         return (int) async_req_0_0(arp_phone, NET_ARP_CLEAN_CACHE);
+}
+int arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address){
+/** Clears the given protocol address from the cache.
+ *
+ * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] protocol  The requesting protocol service.
+ * @param[in] address   The protocol address to be cleared.
+ * @returns             EOK on success.
+ * @returns             ENOENT if the mapping is not found.
+ */
+int
+arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol,
+    measured_string_ref address)
+{
         aid_t message_id;
         ipcarg_t result;
+        message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS, (ipcarg_t) device_id, protocol, NULL);
+        message_id = async_send_2(arp_phone, NET_ARP_CLEAR_ADDRESS,
+            (ipcarg_t) device_id, protocol, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
         return (int) result;
+}
+int arp_clear_device_req(int arp_phone, device_id_t device_id){
+        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE, (ipcarg_t) device_id);
+/** Clears the device cache.
+ *
+ * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @returns             EOK on success.
+ * @returns             ENOENT if the device is not found.
+ */
+int arp_clear_device_req(int arp_phone, device_id_t device_id)
+{
+        return (int) async_req_1_0(arp_phone, NET_ARP_CLEAR_DEVICE,
+            (ipcarg_t) device_id);
+}
+int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address){
+/** Registers the new device and the requesting protocol service.
+ *
+ * Connects to the network interface layer service.
+ * Determines the device broadcast address, its address lengths and packet size.
+ *
+ * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ * @param[in] device_id The new device identifier.
+ * @param[in] protocol  The requesting protocol service.
+ * @param[in] netif     The underlying device network interface layer service.
+ * @param[in] address   The local requesting protocol address of the device.
+ * @returns             EOK on success.
+ * @returns             EEXIST if the device is already used.
+ * @returns             ENOMEM if there is not enough memory left.
+ * @returns             ENOENT if the network interface service is not known.
+ * @returns             EREFUSED if the network interface service is not
+ *                      responding.
+ * @returns             Other error codes as defined for the
+ *                      nil_packet_get_size() function.
+ * @returns             Other error codes as defined for the nil_get_addr()
+ *                      function.
+ * @returns             Other error codes as defined for the
+ *                      nil_get_broadcast_addr() function.
+ */
+int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol,
+    services_t netif, measured_string_ref address)
+{
         aid_t message_id;
         ipcarg_t result;
+        message_id = async_send_3(arp_phone, NET_ARP_DEVICE, (ipcarg_t) device_id, protocol, netif, NULL);
+        message_id = async_send_3(arp_phone, NET_ARP_DEVICE,
+            (ipcarg_t) device_id, protocol, netif, NULL);
         measured_strings_send(arp_phone, address, 1);
         async_wait_for(message_id, &result);
         return (int) result;
+}
+task_id_t arp_task_get_id(void){
+        return 0;
+}
+int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data){
+        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id, protocol, address, 1, translation, data);
+/** Translates the given protocol address to the network interface address.
+ *
+ * Broadcasts the ARP request if the mapping is not found.
+ * Allocates and returns the needed memory block as the data parameter.
+ *
+ * @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] protocol  The requesting protocol service.
+ * @param[in] address   The local requesting protocol address.
+ * @param[out] translation The translation of the local protocol address.
+ * @param[out] data     The allocated raw translation data container.
+ * @returns             EOK on success.
+ * @returns             EINVAL if the address parameter is NULL.
+ * @returns             EBADMEM if the translation or the data parameters are
+ *                      NULL.
+ * @returns             ENOENT if the mapping is not found.
+ */
+int
+arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol,
+    measured_string_ref address, measured_string_ref *translation, char **data)
+{
+        return generic_translate_req(arp_phone, NET_ARP_TRANSLATE, device_id,
+            protocol, address, 1, translation, data);
+}

uspace/lib/net/il/ip_client.c

-              r1882525
+              rf14291b
  */
 /** @addtogroup ip
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  IP client interface implementation.
  *  @see ip_client.h
+ * IP client interface implementation.
+ * @see ip_client.h
  */
 …
 #include <ip_client.h>
+#include <socket_errno.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <packet_client.h>
 #include <ip_header.h>
+size_t ip_client_header_length(packet_t packet){
+#include <net/packet.h>
+/** Returns the IP header length.
+ *
+ * @param[in] packet    The packet.
+ * @returns             The IP header length in bytes.
+ * @returns             Zero if there is no IP header.
+ */
+size_t ip_client_header_length(packet_t packet)
+{
         ip_header_ref header;
         header = (ip_header_ref) packet_get_data(packet);
+        if((! header)
+                || (packet_get_data_length(packet) < sizeof(ip_header_t))){
+        if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return 0;
+        }
         return IP_HEADER_LENGTH(header);
+}
+int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, void **header, size_t * headerlen){
+/** Constructs the IPv4 pseudo header.
+ *
+ * @param[in] protocol  The transport protocol.
+ * @param[in] src       The source address.
+ * @param[in] srclen    The source address length.
+ * @param[in] dest      The destination address.
+ * @param[in] destlen   The destination address length.
+ * @param[in] data_length The data length to be set.
+ * @param[out] header   The constructed IPv4 pseudo header.
+ * @param[out] headerlen The length of the IP pseudo header in bytes.
+ * @returns             EOK on success.
+ * @returns             EBADMEM if the header and/or the headerlen parameter is
+ *                      NULL.
+ * @returns             EINVAL if the source address and/or the destination
+ *                      address parameter is NULL.
+ * @returns             EINVAL if the source address length is less than struct
+ *                      sockaddr length.
+ * @returns             EINVAL if the source address length differs from the
+ *                      destination address length.
+ * @returns             EINVAL if the source address family differs from the
+ *                      destination family.
+ * @returns             EAFNOSUPPORT if the address family is not supported.
+ * @returns             ENOMEM if there is not enough memory left.
+ */
+int
+ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr *src,
+    socklen_t srclen, struct sockaddr *dest, socklen_t destlen,
+    size_t data_length, void **header, size_t *headerlen)
+{
         ipv4_pseudo_header_ref header_in;
         struct sockaddr_in * address_in;
         if(!(header && headerlen)){
+        struct sockaddr_in *address_in;
+        if (!header || !headerlen)
                 return EBADMEM;
+        }
+        if(!(src && dest && (srclen > 0) && ((size_t) srclen >= sizeof(struct sockaddr)) && (srclen == destlen) && (src->sa_family == dest->sa_family))){
+        if (!src || !dest || srclen <= 0 ||
+            (((size_t) srclen < sizeof(struct sockaddr))) ||
+            (srclen != destlen) || (src->sa_family != dest->sa_family)) {
                 return EINVAL;
+        }
+        switch(src->sa_family){
+                case AF_INET:
+                        if(srclen != sizeof(struct sockaddr_in)){
+                                return EINVAL;
+                        }
+                        *headerlen = sizeof(*header_in);
+                        header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+                        if(! header_in){
+                                return ENOMEM;
+                        }
+                        bzero(header_in, * headerlen);
+                        address_in = (struct sockaddr_in *) dest;
+                        header_in->destination_address = address_in->sin_addr.s_addr;
+                        address_in = (struct sockaddr_in *) src;
+                        header_in->source_address = address_in->sin_addr.s_addr;
+                        header_in->protocol = protocol;
+                        header_in->data_length = htons(data_length);
+                        *header = header_in;
+                        return EOK;
+                // TODO IPv6
+/*              case AF_INET6:
+                        if(addrlen != sizeof(struct sockaddr_in6)){
+                                return EINVAL;
+                        }
+                        address_in6 = (struct sockaddr_in6 *) addr;
+                        return EOK;
+*/              default:
+                        return EAFNOSUPPORT;
+        }
+}
+int ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length){
+        switch (src->sa_family) {
+        case AF_INET:
+                if (srclen != sizeof(struct sockaddr_in))
+                        return EINVAL;
+                *headerlen = sizeof(*header_in);
+                header_in = (ipv4_pseudo_header_ref) malloc(*headerlen);
+                if (!header_in)
+                        return ENOMEM;
+                bzero(header_in, *headerlen);
+                address_in = (struct sockaddr_in *) dest;
+                header_in->destination_address = address_in->sin_addr.s_addr;
+                address_in = (struct sockaddr_in *) src;
+                header_in->source_address = address_in->sin_addr.s_addr;
+                header_in->protocol = protocol;
+                header_in->data_length = htons(data_length);
+                *header = header_in;
+                return EOK;
+        // TODO IPv6
+/*      case AF_INET6:
+                if (addrlen != sizeof(struct sockaddr_in6))
+                        return EINVAL;
+                address_in6 = (struct sockaddr_in6 *) addr;
+                return EOK;
+*/
+        default:
+                return EAFNOSUPPORT;
+        }
+}
+/** Prepares the packet to be transfered via IP.
+ *
+ * The IP header is prefixed.
+ *
+ * @param[in,out] packet The packet to be prepared.
+ * @param[in] protocol  The transport protocol.
+ * @param[in] ttl       The time to live counter. The IPDEFTTL is set if zero.
+ * @param[in] tos       The type of service.
+ * @param[in] dont_fragment The value indicating whether fragmentation is
+ *                      disabled.
+ * @param[in] ipopt_length The prefixed IP options length in bytes.
+ * @returns             EOK on success.
+ * @returns             ENOMEM if there is not enough memory left in the packet.
+ */
+int
+ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl,
+    ip_tos_t tos, int dont_fragment, size_t ipopt_length)
+{
         ip_header_ref header;
         uint8_t * data;
+        uint8_t *data;
         size_t padding;
 …
         // multiple of 4 bytes
         padding =  ipopt_length % 4;
         if(padding){
+        if (padding) {
                 padding = 4 - padding;
                 ipopt_length += padding;
 …
         // prefix the header
         data = (uint8_t *) packet_prefix(packet, sizeof(ip_header_t) + padding);
         if(! data){
+        if (!data)
                 return ENOMEM;
+        }
         // add the padding
         while(padding --){
+        while (padding--)
                 data[sizeof(ip_header_t) + padding] = IPOPT_NOOP;
+        }
         // set the header
         header = (ip_header_ref) data;
+        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) + ipopt_length);
+        header->ttl = (ttl ? ttl : IPDEFTTL); //(((ttl) <= MAXTTL) ? ttl : MAXTTL) : IPDEFTTL;
+        header->header_length = IP_COMPUTE_HEADER_LENGTH(sizeof(ip_header_t) +
+            ipopt_length);
+        header->ttl = (ttl ? ttl : IPDEFTTL);
         header->tos = tos;
         header->protocol = protocol;
         if(dont_fragment){
+        if (dont_fragment)
                 header->flags = IPFLAG_DONT_FRAGMENT;
+        }
         return EOK;
+}
+int ip_client_process_packet(packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length){
+/** Processes the received IP packet.
+ *
+ * Fills set header fields.
+ * Returns the prefixed IP header length.
+ *
+ * @param[in] packet    The received packet.
+ * @param[out] protocol The transport protocol. May be NULL if not desired.
+ * @param[out] ttl      The time to live counter. May be NULL if not desired.
+ * @param[out] tos      The type of service. May be NULL if not desired.
+ * @param[out] dont_fragment The value indicating whether the fragmentation is
+ *                      disabled. May be NULL if not desired.
+ * @param[out] ipopt_length The IP options length in bytes. May be NULL if not
+ *                      desired.
+ * @returns             The prefixed IP header length in bytes on success.
+ * @returns             ENOMEM if the packet is too short to contain the IP
+ *                      header.
+ */
+int
+ip_client_process_packet(packet_t packet, ip_protocol_t *protocol,
+    ip_ttl_t *ttl, ip_tos_t *tos, int *dont_fragment, size_t *ipopt_length)
+{
         ip_header_ref header;
         header = (ip_header_ref) packet_get_data(packet);
+        if((! header)
+                || (packet_get_data_length(packet) < sizeof(ip_header_t))){
+        if (!header || (packet_get_data_length(packet) < sizeof(ip_header_t)))
                 return ENOMEM;
+        }
+        if(protocol){
+        if (protocol)
                 *protocol = header->protocol;
+        }
+        if(ttl){
+        if (ttl)
                 *ttl = header->ttl;
+        }
+        if(tos){
+        if (tos)
                 *tos = header->tos;
+        }
+        if(dont_fragment){
+                *dont_fragment = header->flags &IPFLAG_DONT_FRAGMENT;
+        }
+        if(ipopt_length){
+        if (dont_fragment)
+                *dont_fragment = header->flags & IPFLAG_DONT_FRAGMENT;
+        if (ipopt_length) {
                 *ipopt_length = IP_HEADER_LENGTH(header) - sizeof(ip_header_t);
                 return sizeof(ip_header_t);
         }else{
+        } else {
                 return IP_HEADER_LENGTH(header);
+        }
+}
+int ip_client_set_pseudo_header_data_length(void *header, size_t headerlen, size_t data_length){
+/** Updates the IPv4 pseudo header data length field.
+ *
+ * @param[in,out] header The IPv4 pseudo header to be updated.
+ * @param[in] headerlen The length of the IP pseudo header in bytes.
+ * @param[in] data_length The data length to be set.
+ * @returns             EOK on success.
+ * @returns             EBADMEM if the header parameter is NULL.
+ * @returns             EINVAL if the headerlen parameter is not IPv4 pseudo
+ *                      header length.
+ */
+int
+ip_client_set_pseudo_header_data_length(void *header, size_t headerlen,
+    size_t data_length)
+{
         ipv4_pseudo_header_ref header_in;
         if(! header){
+        if (!header)
                 return EBADMEM;
+        }
+        if(headerlen == sizeof(ipv4_pseudo_header_t)){
+        if (headerlen == sizeof(ipv4_pseudo_header_t)) {
                 header_in = (ipv4_pseudo_header_ref) header;
                 header_in->data_length = htons(data_length);
                 return EOK;
         // TODO IPv6
         }else{
+        } else {
                 return EINVAL;
+        }

uspace/lib/net/il/ip_remote.c

-              r1882525
+              rf14291b
  */
+#include <ip_remote.h>
+#include <ip_interface.h>
+#include <packet_client.h>
+#include <generic.h>
 #include <ipc/services.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net_device.h>
+#include <inet.h>
+#include <ip_interface.h>
+#include <packet/packet_client.h>
+#include <il_messages.h>
+#include <ip_messages.h>
+#include <ip_remote.h>
+#include <ipc/il.h>
+#include <ipc/ip.h>
+#include <net/modules.h>
+#include <net/device.h>
+#include <net/inet.h>
 /** Add a route to the device routing table.
 …
 int ip_bind_service(services_t service, int protocol, services_t me,
     async_client_conn_t receiver, tl_received_msg_t tl_received_msg)
+    async_client_conn_t receiver)
+{
         return (int) bind_service(service, (ipcarg_t) protocol, me, service,
 …
                 return EINVAL;
         if ((!device_id) || (header) || (headerlen))
+        if ((!device_id) || (!header) || (!headerlen))
                 return EBADMEM;

uspace/lib/net/include/adt/module_map.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  Character string to module map.
+ * Character string to module map.
  */
 #ifndef __NET_MODULES_MAP_H__
 #define __NET_MODULES_MAP_H__
+#ifndef LIBNET_MODULES_MAP_H_
+#define LIBNET_MODULES_MAP_H_
 #include <task.h>
 #include <ipc/services.h>
+#include <net_modules.h>
+#include <net/modules.h>
 #include <adt/generic_char_map.h>
 /** Type definition of the module structure.
  *  @see module_struct
+ * @see module_struct
  */
 typedef struct module_struct    module_t;
+typedef struct module_struct module_t;
 /** Type definition of the module structure pointer.
  *  @see module_struct
+ * @see module_struct
  */
 typedef module_t *                              module_ref;
+typedef module_t *module_ref;
 /** Module map.
  *  Sorted by module names.
  *  @see generic_char_map.h
+ * Sorted by module names.
+ * @see generic_char_map.h
  */
 GENERIC_CHAR_MAP_DECLARE(modules, module_t)
+/** Module structure.
+ */
+struct  module_struct{
+        /** Module task identifier if running.
+         */
+/** Module structure. */
+struct module_struct {
+        /** Module task identifier if running. */
         task_id_t task_id;
+        /** Module service identifier.
+         */
+        /** Module service identifier. */
         services_t service;
+        /** Module phone if running and connected.
+         */
+        /** Module phone if running and connected. */
         int phone;
+        /** Usage counter.
+         */
+        /** Usage counter. */
         int usage;
+        /** Module name.
+         */
+        const char * name;
+        /** Module full path filename.
+         */
+        const char * filename;
+        /** Connecting function.
+         */
+        connect_module_t * connect_module;
+        /** Module name. */
+        const char *name;
+        /** Module full path filename. */
+        const char *filename;
+        /** Connecting function. */
+        connect_module_t *connect_module;
 };
+/** Adds module to the module map.
+ *  @param[out] module The module structure added.
+ *  @param[in] modules The module map.
+ *  @param[in] name The module name.
+ *  @param[in] filename The full path filename.
+ *  @param[in] service The module service.
+ *  @param[in] task_id The module current task identifier. Zero (0) means not running.
+ *  @param[in] connect_module The module connecting function.
+ *  @returns EOK on success.
+ *  @returns ENOMEM if there is not enough memory left.
+ */
+int add_module(module_ref * module, modules_ref modules, const char * name, const char * filename, services_t service, task_id_t task_id, connect_module_t * connect_module);
+/** Searches and returns the specified module.
+ *  If the module is not running, the module filaname is spawned.
+ *  If the module is not connected, the connect_function is called.
+ *  @param[in] modules The module map.
+ *  @param[in] name The module name.
+ *  @returns The running module found. It does not have to be connected.
+ *  @returns NULL if there is no such module.
+ */
+module_ref get_running_module(modules_ref modules, char * name);
+/** Starts the given module.
+ *  @param[in] fname The module full or relative path filename.
+ *  @returns The new module task identifier on success.
+ *  @returns 0 if there is no such module.
+ */
+task_id_t spawn(const char * fname);
+extern int add_module(module_ref *, modules_ref, const char *, const char *,
+    services_t, task_id_t, connect_module_t *);
+extern module_ref get_running_module(modules_ref, char *);
+extern task_id_t spawn(const char *);
 #endif

uspace/lib/net/include/arp_interface.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup arp
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 #ifndef __NET_ARP_INTERFACE_H__
 #define __NET_ARP_INTERFACE_H__
+#ifndef LIBNET_ARP_INTERFACE_H_
+#define LIBNET_ARP_INTERFACE_H_
 #include <adt/measured_strings.h>
+#include <net_device.h>
+#include <task.h>
+#include <ipc/services.h>
+#include <net/device.h>
+#include <net/socket.h>
 /** @name ARP module interface
  *  This interface is used by other modules.
+ * This interface is used by other modules.
  */
 /*@{*/
+/** Registers the new device and the requesting protocol service.
+ *  Connects to the network interface layer service.
+ *  Determines the device broadcast address, its address lengths and packet size.
+ *  @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ *  @param[in] device_id The new device identifier.
+ *  @param[in] protocol The requesting protocol service.
+ *  @param[in] netif The underlying device network interface layer service.
+ *  @param[in] address The local requesting protocol address of the device.
+ *  @returns EOK on success.
+ *  @returns EEXIST if the device is already used.
+ *  @returns ENOMEM if there is not enough memory left.
+ *  @returns ENOENT if the network interface service is not known.
+ *  @returns EREFUSED if the network interface service is not responding.
+ *  @returns Other error codes as defined for the nil_packet_get_size() function.
+ *  @returns Other error codes as defined for the nil_get_addr() function.
+ *  @returns Other error codes as defined for the nil_get_broadcast_addr() function.
+ */
+extern int arp_device_req(int arp_phone, device_id_t device_id, services_t protocol, services_t netif, measured_string_ref address);
+/** Translates the given protocol address to the network interface address.
+ *  Broadcasts the ARP request if the mapping is not found.
+ *  Allocates and returns the needed memory block as the data parameter.
+ *  @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ *  @param[in] device_id The device identifier.
+ *  @param[in] protocol The requesting protocol service.
+ *  @param[in] address The local requesting protocol address.
+ *  @param[out] translation The translation of the local protocol address.
+ *  @param[out] data The allocated raw translation data container.
+ *  @returns EOK on success.
+ *  @returns EINVAL if the address parameter is NULL.
+ *  @returns EBADMEM if the translation or the data parameters are NULL.
+ *  @returns ENOENT if the mapping is not found.
+ */
+extern int arp_translate_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address, measured_string_ref * translation, char ** data);
+/** Clears the device cache.
+ *  @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ *  @param[in] device_id The device identifier.
+ *  @returns EOK on success.
+ *  @returns ENOENT if the device is not found.
+ */
+extern int arp_clear_device_req(int arp_phone, device_id_t device_id);
+/** Clears the given protocol address from the cache.
+ *  @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ *  @param[in] device_id The device identifier.
+ *  @param[in] protocol The requesting protocol service.
+ *  @param[in] address The protocol address to be cleared.
+ *  @returns EOK on success.
+ *  @returns ENOENT if the mapping is not found.
+ */
+extern int arp_clear_address_req(int arp_phone, device_id_t device_id, services_t protocol, measured_string_ref address);
+/** Cleans the cache.
+ *  @param[in] arp_phone The ARP module phone used for (semi)remote calls.
+ *  @returns EOK on success.
+ */
+extern int arp_clean_cache_req(int arp_phone);
+/** Connects to the ARP module.
+ *  @param service The ARP module service. Ignored parameter.
+ *  @returns The ARP module phone on success.
+ *  @returns 0 if called by the bundle module.
+ */
+extern int arp_connect_module(services_t service);
+/** Returns the ARP task identifier.
+ *  @returns The current task identifier if called by the bundle module.
+ *  @returns 0 if called by the remote module.
+ */
+extern task_id_t arp_task_get_id(void);
+extern int arp_device_req(int, device_id_t, services_t, services_t,
+    measured_string_ref);
+extern int arp_translate_req(int, device_id_t, services_t, measured_string_ref,
+    measured_string_ref *, char **);
+extern int arp_clear_device_req(int, device_id_t);
+extern int arp_clear_address_req(int, device_id_t, services_t,
+    measured_string_ref);
+extern int arp_clean_cache_req(int);
+extern int arp_connect_module(services_t);
 /*@}*/

uspace/lib/net/include/generic.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup icmp
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
+ *  ICMP application interface implementation.
+ *  @see icmp_api.h
+ * Generic communication interfaces for networking.
  */
+#ifndef LIBNET_GENERIC_H_
+#define LIBNET_GENERIC_H_
 #include <async.h>
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <sys/types.h>
+#include <net/device.h>
+#include <adt/measured_strings.h>
+#include <net/packet.h>
+#include <net_modules.h>
+#include <icmp_api.h>
+#include <inet.h>
+#include <ip_codes.h>
+#include <socket_codes.h>
+#include <icmp_messages.h>
+extern int generic_device_state_msg_remote(int, int, device_id_t, int,
+    services_t);
+extern int generic_device_req_remote(int, int, device_id_t, int, services_t);
+extern int generic_get_addr_req(int, int, device_id_t, measured_string_ref *,
+    char **);
+extern int generic_packet_size_req_remote(int, int, device_id_t,
+    packet_dimension_ref);
+extern int generic_received_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_send_msg_remote(int, int, device_id_t, packet_id_t,
+    services_t, services_t);
+extern int generic_translate_req(int, int, device_id_t, services_t,
+    measured_string_ref, size_t, measured_string_ref *, char **);
+int icmp_echo_msg(int icmp_phone, size_t size, mseconds_t timeout, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, const struct sockaddr * addr, socklen_t addrlen){
+        aid_t message_id;
+        ipcarg_t result;
+        if(addrlen <= 0){
+                return EINVAL;
+        }
+        message_id = async_send_5(icmp_phone, NET_ICMP_ECHO, size, timeout, ttl, tos, (ipcarg_t) dont_fragment, NULL);
+        // send the address
+        async_data_write_start(icmp_phone, addr, (size_t) addrlen);
+        // timeout version may cause inconsistency - there is also an inner timer
+        // return async_wait_timeout(message_id, &result, timeout);
+        async_wait_for(message_id, &result);
+        return (int) result;
+}
+#endif
 /** @}

uspace/lib/net/include/icmp_client.h

-              r1882525
+              rf14291b
 #define __NET_ICMP_CLIENT_H__
 #include <icmp_codes.h>
 #include <packet/packet.h>
+#include <net/icmp_codes.h>
+#include <net/packet.h>
 /** Processes the received packet prefixed with an ICMP header.

uspace/lib/net/include/icmp_header.h

-              r1882525
+              rf14291b
 #include <sys/types.h>
 #include <in.h>
 #include <icmp_codes.h>
+#include <net/in.h>
+#include <net/icmp_codes.h>
 /** ICMP header size in bytes.

uspace/lib/net/include/icmp_interface.h

-              r1882525
+              rf14291b
 #define __NET_ICMP_INTERFACE_H__
+#include <net/socket_codes.h>
 #include <sys/types.h>
 #include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <inet.h>
+#include <ip_codes.h>
+#include <socket_codes.h>
+#include <icmp_codes.h>
+#include <icmp_common.h>
+#include <net/packet.h>
+#include <net/inet.h>
+#include <net/ip_codes.h>
+#include <net/icmp_codes.h>
+#include <net/icmp_common.h>
 /** @name ICMP module interface

uspace/lib/net/include/il_interface.h

-              r1882525
+              rf14291b
 #define __NET_IL_INTERFACE_H__
 #include <async.h>
+#include <generic.h>
 #include <ipc/services.h>
+#include <ipc/il.h>
+#include <net_messages.h>
+#include <net_device.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <il_messages.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <packet_client.h>
 /** @name Internetwork layer module interface

uspace/lib/net/include/ip_client.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup ip
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  IP client interface.
+ * IP client interface.
  */
 #ifndef __NET_IP_CLIENT_H__
 #define __NET_IP_CLIENT_H__
+#ifndef LIBNET_IP_CLIENT_H_
+#define LIBNET_IP_CLIENT_H_
+#include <net/socket_codes.h>
 #include <sys/types.h>
 #include <packet/packet.h>
 #include <ip_codes.h>
+#include <net/packet.h>
+#include <net/ip_codes.h>
 #include <ip_interface.h>
-#include <socket_codes.h>
+/** Prepares the packet to be transfered via IP.
+ *  The IP header is prefixed.
+ *  @param[in,out] packet The packet to be prepared.
+ *  @param[in] protocol The transport protocol.
+ *  @param[in] ttl The time to live counter. The IPDEFTTL is set if zero (0).
+ *  @param[in] tos The type of service.
+ *  @param[in] dont_fragment The value indicating whether fragmentation is disabled.
+ *  @param[in] ipopt_length The prefixed IP options length in bytes.
+ *  @returns EOK on success.
+ *  @returns ENOMEM if there is not enough memory left in the packet.
+ */
+extern int ip_client_prepare_packet(packet_t packet, ip_protocol_t protocol, ip_ttl_t ttl, ip_tos_t tos, int dont_fragment, size_t ipopt_length);
+/** Processes the received IP packet.
+ *  Fills set header fields.
+ *  Returns the prefixed IP header length.
+ *  @param[in] packet The received packet.
+ *  @param[out] protocol The transport protocol. May be NULL if not desired.
+ *  @param[out] ttl The time to live counter. May be NULL if not desired.
+ *  @param[out] tos The type of service. May be NULL if not desired.
+ *  @param[out] dont_fragment The value indicating whether the fragmentation is disabled. May be NULL if not desired.
+ *  @param[out] ipopt_length The IP options length in bytes. May be NULL if not desired.
+ *  @returns The prefixed IP header length in bytes on success.
+ *  @returns ENOMEM if the packet is too short to contain the IP header.
+ */
+extern int ip_client_process_packet(packet_t packet, ip_protocol_t * protocol, ip_ttl_t * ttl, ip_tos_t * tos, int * dont_fragment, size_t * ipopt_length);
+/** Returns the IP header length.
+ *  @param[in] packet The packet.
+ *  @returns The IP header length in bytes.
+ *  @returns Zero (0) if there is no IP header.
+ */
+extern size_t ip_client_header_length(packet_t packet);
+/** Updates the IPv4 pseudo header data length field.
+ *  @param[in,out] header The IPv4 pseudo header to be updated.
+ *  @param[in] headerlen The length of the IP pseudo header in bytes.
+ *  @param[in] data_length The data length to be set.
+ *  @returns EOK on success.
+ *  @returns EBADMEM if the header parameter is NULL.
+ *  @returns EINVAL if the headerlen parameter is not IPv4 pseudo header length.
+ */
+extern int ip_client_set_pseudo_header_data_length(void *header, size_t headerlen, size_t data_length);
+/** Constructs the IPv4 pseudo header.
+ *  @param[in] protocol The transport protocol.
+ *  @param[in] src The source address.
+ *  @param[in] srclen The source address length.
+ *  @param[in] dest The destination address.
+ *  @param[in] destlen The destination address length.
+ *  @param[in] data_length The data length to be set.
+ *  @param[out] header The constructed IPv4 pseudo header.
+ *  @param[out] headerlen The length of the IP pseudo header in bytes.
+ *  @returns EOK on success.
+ *  @returns EBADMEM if the header and/or the headerlen parameter is NULL.
+ *  @returns EINVAL if the source address and/or the destination address parameter is NULL.
+ *  @returns EINVAL if the source address length is less than struct sockaddr length.
+ *  @returns EINVAL if the source address length differs from the destination address length.
+ *  @returns EINVAL if the source address family differs from the destination family.
+ *  @returns EAFNOSUPPORT if the address family is not supported.
+ *  @returns ENOMEM if there is not enough memory left.
+ */
+extern int ip_client_get_pseudo_header(ip_protocol_t protocol, struct sockaddr * src, socklen_t srclen, struct sockaddr * dest, socklen_t destlen, size_t data_length, void **header, size_t * headerlen);
+extern int ip_client_prepare_packet(packet_t, ip_protocol_t, ip_ttl_t, ip_tos_t,
+    int, size_t);
+extern int ip_client_process_packet(packet_t, ip_protocol_t *, ip_ttl_t *,
+    ip_tos_t *, int *, size_t *);
+extern size_t ip_client_header_length(packet_t);
+extern int ip_client_set_pseudo_header_data_length(void *, size_t, size_t);
+extern int ip_client_get_pseudo_header(ip_protocol_t, struct sockaddr *,
+    socklen_t, struct sockaddr *, socklen_t, size_t, void **, size_t *);
 // TODO ipopt manipulation

uspace/lib/net/include/ip_interface.h

-              r1882525
+              rf14291b
 #define __NET_IP_INTERFACE_H__
+#include <net/socket_codes.h>
 #include <async.h>
 #include <ipc/services.h>
 #include <net_device.h>
 #include <packet/packet.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <in.h>
+#include <ip_codes.h>
+#include <socket_codes.h>
+#ifdef CONFIG_IL_TL_BUNDLE
+#include <ip_local.h>
+#define ip_received_error_msg  ip_received_error_msg_local
+#define ip_set_gateway_req     ip_set_gateway_req_local
+#define ip_packet_size_req     ip_packet_size_req_local
+#define ip_device_req          ip_device_req_local
+#define ip_add_route_req       ip_add_route_req_local
+#define ip_send_msg            ip_send_msg_local
+#define ip_get_route_req       ip_get_route_req_local
+#else
+#include <net/in.h>
+#include <net/ip_codes.h>
 #include <ip_remote.h>
 …
 #define ip_send_msg            ip_send_msg_remote
 #define ip_get_route_req       ip_get_route_req_remote
-#endif
 /** @name IP module interface
 …
  *  @param[in] me The requesting module service.
  *  @param[in] receiver The message receiver. Used for remote connection.
- *  @param[in] tl_received_msg The message processing function. Used if bundled together.
  *  @returns The phone of the needed service.
  *  @returns EOK on success.
  *  @returns Other error codes as defined for the bind_service() function.
  */
 extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver, tl_received_msg_t tl_received_msg);
+extern int ip_bind_service(services_t service, int protocol, services_t me, async_client_conn_t receiver);
 /** Connects to the IP module.
  *  @param service The IP module service. Ignored parameter.
  *  @returns The IP module phone on success.
- *  @returns 0 if called by the bundle module.
  */
 extern int ip_connect_module(services_t service);

uspace/lib/net/include/ip_remote.h

-              r1882525
+              rf14291b
 #define __NET_IP_REMOTE_H__
-#include <async.h>
 #include <ipc/services.h>
+#include <ip_codes.h>
+#include <inet.h>
+#include <in.h>
+#include <socket.h>
+#include <net/ip_codes.h>
+#include <net/inet.h>
+#include <net/in.h>
+#include <net/packet.h>
+#include <net/device.h>
+#include <net/socket.h>
 extern int ip_set_gateway_req_remote(int, device_id_t, in_addr_t);

uspace/lib/net/include/net_checksum.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
  *  @{
+/** @addtogroup libnet
+ * @{
  */
 /** @file
  *  General CRC and checksum computation.
+ * General CRC and checksum computation.
  */
 #ifndef __NET_CHECKSUM_H__
 #define __NET_CHECKSUM_H__
+#ifndef LIBNET_CHECKSUM_H_
+#define LIBNET_CHECKSUM_H_
 #include <byteorder.h>
 #include <sys/types.h>
 /** IP checksum value for computed zero checksum.
  *  Zero is returned as 0xFFFF (not flipped)
+ * Zero is returned as 0xFFFF (not flipped)
  */
 #define IP_CHECKSUM_ZERO                        0xFFFFu
+#define IP_CHECKSUM_ZERO        0xffffU
-/**     Computes CRC32 value.
- *  @param[in] seed Initial value. Often used as 0 or ~0.
- *  @param[in] data Pointer to the beginning of data to process.
- *  @param[in] length Length of the data in bits.
- *  @returns The computed CRC32 of the length bits of the data.
- */
 #ifdef ARCH_IS_BIG_ENDIAN
+        #define compute_crc32(seed, data, length)       compute_crc32_be(seed, (uint8_t *) data, length)
+#define compute_crc32(seed, data, length) \
+        compute_crc32_be(seed, (uint8_t *) data, length)
 #else
+        #define compute_crc32(seed, data, length)       compute_crc32_le(seed, (uint8_t *) data, length)
+#define compute_crc32(seed, data, length) \
+        compute_crc32_le(seed, (uint8_t *) data, length)
 #endif
+/**     Computes CRC32 value in the little-endian environment.
+ *  @param[in] seed Initial value. Often used as 0 or ~0.
+ *  @param[in] data Pointer to the beginning of data to process.
+ *  @param[in] length Length of the data in bits.
+ *  @returns The computed CRC32 of the length bits of the data.
+ */
+extern uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length);
+/**     Computes CRC32 value in the big-endian environment.
+ *  @param[in] seed Initial value. Often used as 0 or ~0.
+ *  @param[in] data Pointer to the beginning of data to process.
+ *  @param[in] length Length of the data in bits.
+ *  @returns The computed CRC32 of the length bits of the data.
+ */
+extern uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length);
+/** Computes sum of the 2 byte fields.
+ *  Padds one zero (0) byte if odd.
+ *  @param[in] seed Initial value. Often used as 0 or ~0.
+ *  @param[in] data Pointer to the beginning of data to process.
+ *  @param[in] length Length of the data in bytes.
+ *  @returns The computed checksum of the length bytes of the data.
+ */
+extern uint32_t compute_checksum(uint32_t seed, uint8_t * data, size_t length);
+/** Compacts the computed checksum to the 16 bit number adding the carries.
+ *  @param[in] sum Computed checksum.
+ *  @returns Compacted computed checksum to the 16 bits.
+ */
+extern uint16_t compact_checksum(uint32_t sum);
+/** Returns or flips the checksum if zero.
+ *  @param[in] checksum The computed checksum.
+ *  @returns The internet protocol header checksum.
+ *  @returns 0xFFFF if the computed checksum is zero.
+ */
+extern uint16_t flip_checksum(uint16_t checksum);
+/** Computes the ip header checksum.
+ *  To compute the checksum of a new packet, the checksum header field must be zero.
+ *  To check the checksum of a received packet, the checksum may be left set.
+ *  The zero (0) value will be returned in this case if valid.
+ *  @param[in] data The header data.
+ *  @param[in] length The header length in bytes.
+ *  @returns The internet protocol header checksum.
+ *  @returns 0xFFFF if the computed checksum is zero.
+ */
+extern uint16_t ip_checksum(uint8_t * data, size_t length);
+extern uint32_t compute_crc32_le(uint32_t, uint8_t *, size_t);
+extern uint32_t compute_crc32_be(uint32_t, uint8_t *, size_t);
+extern uint32_t compute_checksum(uint32_t, uint8_t *, size_t);
+extern uint16_t compact_checksum(uint32_t);
+extern uint16_t flip_checksum(uint16_t);
+extern uint16_t ip_checksum(uint8_t *, size_t);
 #endif

uspace/lib/net/include/net_interface.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup net
+/** @addtogroup libnet
  *  @{
  */
 #ifndef __NET_NET_INTERFACE_H__
 #define __NET_NET_INTERFACE_H__
+#ifndef LIBNET_NET_INTERFACE_H_
+#define LIBNET_NET_INTERFACE_H_
 #include <ipc/services.h>
 #include <net_device.h>
+#include <net/device.h>
 #include <adt/measured_strings.h>
 /** @name Networking module interface
  *  This interface is used by other modules.
+ * This interface is used by other modules.
  */
 /*@{*/
+/** Returns the device specific configuration.
+ *  Returns the global configuration if the device specific is not found.
+ *  The configuration names are read and the appropriate settings are set instead.
+ *  Call net_free_settings() function to release the returned configuration.
+ *  @param[in] net_phone The networking module phone.
+ *  @param[in] device_id The device identifier.
+ *  @param[in,out] configuration The requested device configuration. The names are read and the appropriate settings are set instead.
+ *  @param[in] count The configuration entries count.
+ *  @param[in,out] data The configuration and settings data.
+ *  @returns EOK on success.
+ *  @returns EINVAL if the configuration is NULL.
+ *  @returns EINVAL if the count is zero (0).
+ *  @returns Other error codes as defined for the generic_translate_req() function.
+ */
+extern int net_get_device_conf_req(int net_phone, device_id_t device_id, measured_string_ref * configuration, size_t count, char ** data);
+/** Returns the global configuration.
+ *  The configuration names are read and the appropriate settings are set instead.
+ *  Call net_free_settings() function to release the returned configuration.
+ *  @param[in] net_phone The networking module phone.
+ *  @param[in,out] configuration The requested configuration. The names are read and the appropriate settings are set instead.
+ *  @param[in] count The configuration entries count.
+ *  @param[in,out] data The configuration and settings data.
+ *  @returns EOK on success.
+ *  @returns EINVAL if the configuration is NULL.
+ *  @returns EINVAL if the count is zero (0).
+ *  @returns Other error codes as defined for the generic_translate_req() function.
+ */
+extern int net_get_conf_req(int net_phone, measured_string_ref * configuration, size_t count, char ** data);
+/** Frees the received settings.
+ *  @param[in] settings The received settings.
+ *  @param[in] data The received settings data.
+ *  @see net_get_device_conf_req()
+ *  @see net_get_conf_req()
+ */
+extern void net_free_settings(measured_string_ref settings, char * data);
+/** Connects to the networking module.
+ *  @param service The networking module service. Ignored parameter.
+ *  @returns The networking module phone on success.
+ *  @returns 0 if called by the bundle module.
+ */
+extern int net_connect_module(services_t service);
+extern int net_get_device_conf_req(int, device_id_t, measured_string_ref *,
+    size_t, char **);
+extern int net_get_conf_req(int, measured_string_ref *, size_t, char **);
+extern void net_free_settings(measured_string_ref, char *);
+extern int net_connect_module(void);
 /*@}*/

uspace/lib/net/include/netif_interface.h

-              r1882525
+              rf14291b
 #define __NET_NETIF_INTERFACE_H__
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-#include <netif_local.h>
-#include <netif_nil_bundle.h>
-#include <packet/packet_server.h>
-#define netif_module_message    netif_nil_module_message
-#define netif_module_start      netif_nil_module_start
-#define netif_get_addr_req      netif_get_addr_req_local
-#define netif_probe_req         netif_probe_req_local
-#define netif_send_msg          netif_send_msg_local
-#define netif_start_req         netif_start_req_local
-#define netif_stop_req          netif_stop_req_local
-#define netif_stats_req         netif_stats_req_local
-#define netif_bind_service      netif_bind_service_local
-#else /* CONFIG_NETIF_NIL_BUNDLE */
 #include <netif_remote.h>
 #include <packet/packet_client.h>
+#include <packet_client.h>
 #define netif_module_message    netif_module_message_standalone
 …
 #define netif_bind_service      netif_bind_service_remote
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
 #endif

uspace/lib/net/include/netif_local.h

-              r1882525
+              rf14291b
  * Network interface module skeleton.
  * The skeleton has to be part of each network interface module.
- * The skeleton can be also part of the module bundled with the network interface layer.
  */
 …
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <err.h>
 #include <adt/measured_strings.h>
+#include <net_err.h>
+#include <net_device.h>
+#include <packet/packet.h>
+#include <net/device.h>
+#include <net/packet.h>
 /** Network interface device specific data.

uspace/lib/net/include/netif_remote.h

-              r1882525
+              rf14291b
 #define __NET_NETIF_REMOTE_H__
 #include <async.h>
 #include <fibril_synch.h>
 #include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <adt/measured_strings.h>
+#include <net/device.h>
 extern int netif_get_addr_req_remote(int, device_id_t, measured_string_ref *,

uspace/lib/net/include/nil_interface.h

-              r1882525
+              rf14291b
 #include <ipc/ipc.h>
+#include <ipc/nil.h>
+#include <net_messages.h>
+#include <adt/measured_strings.h>
+#include <packet/packet.h>
+#include <nil_messages.h>
+#include <net_device.h>
+#include <generic.h>
+#include <nil_remote.h>
 #define nil_bind_service(service, device_id, me, receiver) \
 …
             netif_service)
-#ifdef CONFIG_NETIF_NIL_BUNDLE
-#include <nil_local.h>
-#include <packet/packet_server.h>
-#define nil_device_state_msg  nil_device_state_msg_local
-#define nil_received_msg      nil_received_msg_local
-#else /* CONFIG_NETIF_NIL_BUNDLE */
-#include <nil_remote.h>
-#include <packet/packet_server.h>
 #define nil_device_state_msg  nil_device_state_msg_remote
 #define nil_received_msg      nil_received_msg_remote
-#endif /* CONFIG_NETIF_NIL_BUNDLE */
 #endif

uspace/lib/net/include/nil_remote.h

-              r1882525
+              rf14291b
 #define __NET_NIL_REMOTE_H__
 #include <async.h>
 #include <fibril_synch.h>
 #include <ipc/ipc.h>
+#include <ipc/services.h>
+#include <net/device.h>
+#include <net/packet.h>
 extern int nil_device_state_msg_remote(int, device_id_t, int);

uspace/lib/net/include/packet_remote.h

-              r1882525
+              rf14291b
  */
 /** @addtogroup packet
+/** @addtogroup libnet
  * @{
  */
 #ifndef __NET_PACKET_REMOTE_H__
 #define __NET_PACKET_REMOTE_H__
+#ifndef LIBNET_PACKET_REMOTE_H_
+#define LIBNET_PACKET_REMOTE_H_
+#include <packet/packet.h>
+#include <net/packet.h>
+#include <sys/types.h>
 extern int packet_translate_remote(int, packet_ref, packet_id_t);

uspace/lib/net/include/tl_common.h

-              r1882525
+              rf14291b
 #define __NET_TL_COMMON_H__
 #include <packet/packet.h>
 #include <net_device.h>
 #include <inet.h>
 #include <socket_codes.h>
+#include <net/socket_codes.h>
+#include <net/packet.h>
+#include <net/device.h>
+#include <net/inet.h>
 /** Device packet dimensions.

uspace/lib/net/include/tl_interface.h

-              r1882525
+              rf14291b
 #include <async.h>
 #include <ipc/services.h>
+#include <ipc/tl.h>
+#include <net_messages.h>
+#include <net_device.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <tl_messages.h>
+#include <generic.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <packet_client.h>
 /** @name Transport layer module interface

uspace/lib/net/netif/netif_local.c

-              r1882525
+              rf14291b
 #include <ipc/ipc.h>
 #include <ipc/services.h>
 #include <net_err.h>
+#include <net_messages.h>
 #include <net_modules.h>
 #include <packet/packet.h>
 #include <packet/packet_client.h>
 #include <packet/packet_server.h>
+#include <ipc/netif.h>
+#include <err.h>
+#include <generic.h>
+#include <net/modules.h>
+#include <net/packet.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <adt/measured_strings.h>
 #include <net_device.h>
+#include <net/device.h>
 #include <nil_interface.h>
 #include <netif_local.h>
-#include <netif_messages.h>
 #include <netif_interface.h>
 …
         return ERROR_CODE;
+}
-/** Create bidirectional connection with the network interface module and registers the message receiver.
+ *
- * @param[in] service   The network interface module service.
- * @param[in] device_id The device identifier.
- * @param[in] me        The requesting module service.
- * @param[in] receiver  The message receiver.
+ *
- * @return The phone of the needed service.
- * @return EOK on success.
- * @return Other error codes as defined for the bind_service() function.
+ *
- */
-int netif_bind_service_local(services_t service, device_id_t device_id,
-    services_t me, async_client_conn_t receiver)
+{
-        return EOK;
+}

uspace/lib/net/netif/netif_remote.c

-              r1882525
+              rf14291b
 #include <ipc/services.h>
+#include <ipc/netif.h>
 #include <net_modules.h>
+#include <net/modules.h>
 #include <adt/measured_strings.h>
 #include <packet/packet.h>
 #include <packet/packet_client.h>
 #include <net_device.h>
+#include <net/packet.h>
+#include <packet_client.h>
+#include <net/device.h>
 #include <netif_remote.h>
 #include <netif_messages.h>
+#include <generic.h>
 int netif_get_addr_req_remote(int netif_phone, device_id_t device_id,
 …
+}
+/** Create bidirectional connection with the network interface module and
+ * registers the message receiver.
+ *
+ * @param[in] service   The network interface module service.
+ * @param[in] device_id The device identifier.
+ * @param[in] me        The requesting module service.
+ * @param[in] receiver  The message receiver.
+ *
+ * @return The phone of the needed service.
+ * @return EOK on success.
+ * @return Other error codes as defined for the bind_service() function.
+ *
+ */
 int netif_bind_service_remote(services_t service, device_id_t device_id, services_t me,
     async_client_conn_t receiver)

uspace/lib/net/nil/nil_remote.c

-              r1882525
+              rf14291b
  */
+#include <net_messages.h>
+#include <net_device.h>
+#include <nil_remote.h>
 #include <nil_interface.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <nil_messages.h>
+#include <nil_remote.h>
+#include <generic.h>
+#include <net/device.h>
+#include <net/packet.h>
+#include <packet_client.h>
+#include <ipc/nil.h>
 /** Notify the network interface layer about the device state change.

uspace/lib/net/tl/icmp_client.c

-              r1882525
+              rf14291b
 #include <sys/types.h>
 #include <icmp_codes.h>
+#include <net/icmp_codes.h>
 #include <icmp_client.h>
 #include <packet/packet.h>
 #include <packet/packet_client.h>
+#include <net/packet.h>
+#include <packet_client.h>
 #include <icmp_header.h>

uspace/lib/net/tl/icmp_remote.c

-              r1882525
+              rf14291b
 #include <ipc/ipc.h>
 #include <ipc/services.h>
+#include <ipc/icmp.h>
 #include <sys/types.h>
+#include <net_messages.h>
+#include <net_modules.h>
+#include <net/modules.h>
 #include <icmp_interface.h>
+#include <packet/packet_client.h>
+#include <icmp_messages.h>
+#include <packet_client.h>
 int icmp_destination_unreachable_msg(int icmp_phone, icmp_code_t code, icmp_param_t mtu, packet_t packet){

uspace/lib/net/tl/tl_common.c

-              r1882525
+              rf14291b
  */
+#include <net/socket_codes.h>
+#include <net/in.h>
+#include <net/in6.h>
+#include <net/inet.h>
 #include <async.h>
 #include <ipc/services.h>
+#include <net_err.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <errno.h>
+#include <err.h>
+#include <net/packet.h>
+#include <packet_client.h>
 #include <packet_remote.h>
 #include <net_device.h>
+#include <net/device.h>
 #include <icmp_interface.h>
-#include <in.h>
-#include <in6.h>
-#include <inet.h>
-#include <ip_local.h>
 #include <ip_remote.h>
-#include <socket_codes.h>
-#include <socket_errno.h>
 #include <ip_interface.h>
 #include <tl_interface.h>
 …
 DEVICE_MAP_IMPLEMENT(packet_dimensions, packet_dimension_t);
+int tl_get_address_port(const struct sockaddr * addr, int addrlen, uint16_t * port){
+        const struct sockaddr_in * address_in;
+        const struct sockaddr_in6 * address_in6;
+        if((addrlen <= 0) || ((size_t) addrlen < sizeof(struct sockaddr))){
+                return EINVAL;
+        }
+        switch(addr->sa_family){
+                case AF_INET:
+                        if(addrlen != sizeof(struct sockaddr_in)){
+int
+tl_get_address_port(const struct sockaddr *addr, int addrlen, uint16_t *port)
+{
+        const struct sockaddr_in *address_in;
+        const struct sockaddr_in6 *address_in6;
+        if ((addrlen <= 0) || ((size_t) addrlen < sizeof(struct sockaddr)))
+                return EINVAL;
+        switch (addr->sa_family) {
+        case AF_INET:
+                if (addrlen != sizeof(struct sockaddr_in))
+                        return EINVAL;
+                address_in = (struct sockaddr_in *) addr;
+                *port = ntohs(address_in->sin_port);
+                break;
+        case AF_INET6:
+                if (addrlen != sizeof(struct sockaddr_in6))
                                 return EINVAL;
+                        }
+                        address_in = (struct sockaddr_in *) addr;
+                        *port = ntohs(address_in->sin_port);
+                        break;
+                case AF_INET6:
+                        if(addrlen != sizeof(struct sockaddr_in6)){
+                                return EINVAL;
+                        }
+                        address_in6 = (struct sockaddr_in6 *) addr;
+                        *port = ntohs(address_in6->sin6_port);
+                        break;
+                default:
+                        return EAFNOSUPPORT;
+        }
+                address_in6 = (struct sockaddr_in6 *) addr;
+                *port = ntohs(address_in6->sin6_port);
+                break;
+        default:
+                return EAFNOSUPPORT;
+        }
         return EOK;
+}
 …
                 return EBADMEM;
+        *packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
+        *packet_dimension = packet_dimensions_find(packet_dimensions,
+            device_id);
         if (!*packet_dimension) {
                 /* Ask for and remember them if not found */
 …
+}
+int tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions, device_id_t device_id, size_t content){
+int
+tl_update_ip_packet_dimension(packet_dimensions_ref packet_dimensions,
+    device_id_t device_id, size_t content)
+{
         packet_dimension_ref packet_dimension;
         packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
         if(! packet_dimension){
+        if (!packet_dimension)
                 return ENOENT;
+        }
         packet_dimension->content = content;
+        if(device_id != DEVICE_INVALID_ID){
+                packet_dimension = packet_dimensions_find(packet_dimensions, DEVICE_INVALID_ID);
+                if(packet_dimension){
+                        if(packet_dimension->content >= content){
+        if (device_id != DEVICE_INVALID_ID) {
+                packet_dimension = packet_dimensions_find(packet_dimensions,
+                    DEVICE_INVALID_ID);
+                if (packet_dimension) {
+                        if (packet_dimension->content >= content)
                                 packet_dimension->content = content;
+                        }else{
+                                packet_dimensions_exclude(packet_dimensions, DEVICE_INVALID_ID);
+                        }
+                        else
+                                packet_dimensions_exclude(packet_dimensions,
+                                    DEVICE_INVALID_ID);
+                }
+        }
         return EOK;
+}
+int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port){
+        struct sockaddr_in * address_in;
+        struct sockaddr_in6 * address_in6;
+int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
+{
+        struct sockaddr_in *address_in;
+        struct sockaddr_in6 *address_in6;
         size_t length;
         if(addrlen < 0){
                 return EINVAL;
+        }
+        if (addrlen < 0)
+                return EINVAL;
         length = (size_t) addrlen;
+        if(length < sizeof(struct sockaddr)){
+                return EINVAL;
+        }
+        switch(addr->sa_family){
+                case AF_INET:
+                        if(length != sizeof(struct sockaddr_in)){
+        if (length < sizeof(struct sockaddr))
+                return EINVAL;
+        switch (addr->sa_family) {
+        case AF_INET:
+                if (length != sizeof(struct sockaddr_in))
+                        return EINVAL;
+                address_in = (struct sockaddr_in *) addr;
+                address_in->sin_port = htons(port);
+                return EOK;
+        case AF_INET6:
+                if (length != sizeof(struct sockaddr_in6))
                                 return EINVAL;
+                        }
+                        address_in = (struct sockaddr_in *) addr;
+                        address_in->sin_port = htons(port);
+                        return EOK;
+                case AF_INET6:
+                        if(length != sizeof(struct sockaddr_in6)){
+                                return EINVAL;
+                        }
+                        address_in6 = (struct sockaddr_in6 *) addr;
+                        address_in6->sin6_port = htons(port);
+                        return EOK;
+                default:
+                        return EAFNOSUPPORT;
+        }
+}
+int tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet, services_t error){
+                address_in6 = (struct sockaddr_in6 *) addr;
+                address_in6->sin6_port = htons(port);
+                return EOK;
+        default:
+                return EAFNOSUPPORT;
+        }
+}
+int
+tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t packet,
+    services_t error)
+{
         packet_t next;
         uint8_t * src;
+        uint8_t *src;
         int length;
 …
         length = packet_get_addr(packet, &src, NULL);
+        if((length > 0)
+                && (! error)
+                && (icmp_phone >= 0)
+        // set both addresses to the source one (avoids the source address deletion before setting the destination one)
+                && (packet_set_addr(packet, src, src, (size_t) length) == EOK)){
+        if ((length > 0) && (!error) && (icmp_phone >= 0) &&
+            // set both addresses to the source one (avoids the source address
+            // deletion before setting the destination one)
+            (packet_set_addr(packet, src, src, (size_t) length) == EOK)) {
                 return EOK;
         }else{
+        } else
                 pq_release_remote(packet_phone, packet_get_id(packet));
+        }
         return ENOENT;
+}
+int tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix, const packet_dimension_ref dimension, const struct sockaddr * addr, socklen_t addrlen){
+int
+tl_socket_read_packet_data(int packet_phone, packet_ref packet, size_t prefix,
+    const packet_dimension_ref dimension, const struct sockaddr *addr,
+    socklen_t addrlen)
+{
         ERROR_DECLARE;
 …
         void * data;
         if(! dimension){
                 return EINVAL;
+        }
+        if (!dimension)
+                return EINVAL;
         // get the data length
         if(! async_data_write_receive(&callid, &length)){
                 return EINVAL;
+        }
+        if (!async_data_write_receive(&callid, &length))
+                return EINVAL;
         // get a new packet
+        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix);
+        if(! packet){
+        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len,
+            prefix + dimension->prefix, dimension->suffix);
+        if (!packet)
                 return ENOMEM;
+        }
         // allocate space in the packet
         data = packet_suffix(*packet, length);
         if(! data){
+        if (!data) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ENOMEM;
+        }
         // read the data into the packet
+        if(ERROR_OCCURRED(async_data_write_finalize(callid, data, length))
+        // set the packet destination address
+                || ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen))){
+        if (ERROR_OCCURRED(async_data_write_finalize(callid, data, length)) ||
+            // set the packet destination address
+            ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr,
+            addrlen))) {
                 pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ERROR_CODE;
+        }
         return (int) length;
+}

uspace/lib/packet/Makefile

-              r1882525
+              rf14291b
 USPACE_PREFIX = ../..
 EXTRA_CFLAGS = -Iinclude
 LIBRARY = libsocket
+LIBRARY = libpacket
 SOURCES = \
+        generic/socket_client.c \
+        generic/socket_core.c \
+        generic/socket_parse.c \
+        generic/inet.c \
+        generic/net_modules.c \
+        generic/icmp_common.c \
+        generic/icmp_api.c \
+        packet/packet.c \
+        packet/packet_client.c \
+        packet/packet_server.c \
+        adt/dynamic_fifo.c \
+        adt/measured_strings.c \
+        adt/char_map.c
+        generic/packet_server.c
 include $(USPACE_PREFIX)/Makefile.common

uspace/lib/packet/generic/packet_server.c

-              r1882525
+              rf14291b
 #include <async.h>
 #include <errno.h>
+#include <err.h>
 #include <fibril_synch.h>
 #include <unistd.h>
+#include <sys/mman.h>
 #include <ipc/ipc.h>
+#include <sys/mman.h>
+#include <net_err.h>
+#include <net_messages.h>
+#include <packet/packet.h>
+#include <packet/packet_client.h>
+#include <packet/packet_header.h>
+#include <packet/packet_messages.h>
+#include <packet/packet_server.h>
+#include <ipc/packet.h>
+#include <ipc/net.h>
+#include <net/packet.h>
+#include <net/packet_header.h>
+#include <packet_server.h>
+#include <packet_local.h>
 #define FREE_QUEUES_COUNT       7
 …
         unsigned int count;
 } ps_globals = {
+        .lock = {
+                .counter = 1,
+                .waiters = {
+                        .prev = &ps_globals.lock.waiters,
+                        .next = &ps_globals.lock.waiters,
+                }
+        },
+        .lock = FIBRIL_MUTEX_INITIALIZER(ps_globals.lock),
         .free = {NULL, NULL, NULL, NULL, NULL, NULL, NULL},
         .sizes = {PAGE_SIZE, PAGE_SIZE * 2, PAGE_SIZE * 4, PAGE_SIZE * 8, PAGE_SIZE * 16, PAGE_SIZE * 32, PAGE_SIZE * 64},

Context Navigation

Changeset f14291b in mainline for uspace/lib

Legend:

Download in other formats: