Changes in uspace/lib/net/il/ip_remote.c [46d4d9f:14f1db0] in mainline

File:

• uspace/lib/net/il/ip_remote.c (modified) (13 diffs)

uspace/lib/net/il/ip_remote.c

@@ -27 +27 @@
  */
 
-/** @addtogroup libnet
+/** @addtogroup ip
  * @{
  */
@@ -40 +40 @@
  */
 
+#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 <ip_interface.h>
-#include <packet_client.h>
-#include <generic.h>
-
-#include <ipc/services.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.
@@ -57 +56 @@
  * The target network is routed using this device.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
- * @param[in] address   The target network address.
- * @param[in] netmask   The target network mask.
- * @param[in] gateway   The target network gateway. Not used if zero.
+ * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] address   The target network address.
+ * @param[in] netmask   The target network mask.
+ * @param[in] gateway   The target network gateway. Not used if zero.
+ *
  */
 int ip_add_route_req_remote(int ip_phone, device_id_t device_id,
@@ -71 +71 @@
 }
 
-/** Creates bidirectional connection with the ip module service and registers
- * the message receiver.
- *
- * @param[in] service   The IP module service.
- * @param[in] protocol  The transport layer protocol.
- * @param[in] me        The requesting module service.
- * @param[in] receiver  The message receiver. Used for remote connection.
- * @return              The phone of the needed service.
- * @return              EOK on success.
- * @return              Other error codes as defined for the bind_service()
- *                      function.
- */
 int ip_bind_service(services_t service, int protocol, services_t me,
-    async_client_conn_t receiver)
+    async_client_conn_t receiver, tl_received_msg_t tl_received_msg)
 {
         return (int) bind_service(service, (ipcarg_t) protocol, me, service,
@@ -90 +78 @@
 }
 
-/** Connects to the IP module.
- *
- * @param service       The IP module service. Ignored parameter.
- * @return              The IP module phone on success.
- */
 int ip_connect_module(services_t service)
 {
@@ -105 +88 @@
  * If the device uses ARP registers also the new ARP device.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The new device identifier.
- * @param[in] netif     The underlying device network interface layer service.
- * @return              EOK on success.
- * @return              ENOMEM if there is not enough memory left.
- * @return              EINVAL if the device configuration is invalid.
- * @return              ENOTSUP if the device uses IPv6.
- * @return              ENOTSUP if the device uses DHCP.
- * @return              Other error codes as defined for the
- *                      net_get_device_conf_req() function.
- * @return              Other error codes as defined for the arp_device_req()
- *                      function.
+ * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
+ * @param[in] device_id The new device identifier.
+ * @param[in] netif     The underlying device network interface layer service.
+ *
+ * @return EOK on success.
+ * @return ENOMEM if there is not enough memory left.
+ * @return EINVAL if the device configuration is invalid.
+ * @return ENOTSUP if the device uses IPv6.
+ * @return ENOTSUP if the device uses DHCP.
+ * @return Other error codes as defined for the net_get_device_conf_req()
+ *         function.
+ * @return Other error codes as defined for the arp_device_req() function.
+ *
  */
 int ip_device_req_remote(int ip_phone, device_id_t device_id,
@@ -125 +109 @@
 }
 
-/** Return the device identifier and the IP pseudo header based on the
- * destination address.
- *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] protocol  The transport protocol.
- * @param[in] destination The destination address.
- * @param[in] addrlen   The destination address length.
- * @param[out] device_id The device identifier.
- * @param[out] header   The constructed IP pseudo header.
- * @param[out] headerlen The IP pseudo header length.
+/** Return the device identifier and the IP pseudo header based on the destination address.
+ *
+ * @param[in]  ip_phone    The IP module phone used for (semi)remote calls.
+ * @param[in]  protocol    The transport protocol.
+ * @param[in]  destination The destination address.
+ * @param[in]  addrlen     The destination address length.
+ * @param[out] device_id   The device identifier.
+ * @param[out] header      The constructed IP pseudo header.
+ * @param[out] headerlen   The IP pseudo header length.
  *
  */
@@ -141 +124 @@
     device_id_t *device_id, void **header, size_t *headerlen)
 {
-        if (!destination || (addrlen == 0))
+        if ((!destination) || (addrlen == 0))
                 return EINVAL;
         
-        if (!device_id || !header || !headerlen)
+        if ((!device_id) || (header) || (headerlen))
                 return EBADMEM;
         
@@ -153 +136 @@
             (ipcarg_t) protocol, &answer);
         
-        if ((async_data_write_start(ip_phone, destination, addrlen) == EOK) &&
-            (async_data_read_start(ip_phone, headerlen,
-            sizeof(*headerlen)) == EOK) && (*headerlen > 0)) {
+        if ((async_data_write_start(ip_phone, destination, addrlen) == EOK)
+            && (async_data_read_start(ip_phone, headerlen, sizeof(*headerlen)) == EOK)
+            && (*headerlen > 0)) {
                 *header = malloc(*headerlen);
                 if (*header) {
-                        if (async_data_read_start(ip_phone, *header,
-                            *headerlen) != EOK)
+                        if (async_data_read_start(ip_phone, *header, *headerlen) != EOK)
                                 free(*header);
                 }
@@ -167 +149 @@
         async_wait_for(message_id, &result);
         
-        if ((result != EOK) && *header)
+        if ((result != EOK) && (*header))
                 free(*header);
         else
@@ -177 +159 @@
 /** Return the device packet dimension for sending.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
+ * @param[in]  ip_phone         The IP module phone used for (semi)remote calls.
+ * @param[in]  device_id        The device identifier.
  * @param[out] packet_dimension The packet dimension.
- * @return              EOK on success.
- * @return              ENOENT if there is no such device.
- * @return              Other error codes as defined for the
- *                      generic_packet_size_req_remote() function.
+ *
+ * @return EOK on success.
+ * @return ENOENT if there is no such device.
+ * @return Other error codes as defined for the
+ *         generic_packet_size_req_remote() function.
+ *
  */
 int ip_packet_size_req_remote(int ip_phone, device_id_t device_id,
-    packet_dimension_t *packet_dimension)
-{
-        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
-            device_id, packet_dimension);
+    packet_dimension_ref packet_dimension)
+{
+        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE, device_id,
+            packet_dimension);
 }
 
 /** Notify the IP module about the received error notification packet.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
- * @param[in] packet    The received packet or the received packet queue.
- * @param[in] target    The target internetwork module service to be
- *                      delivered to.
- * @param[in] error     The packet error reporting service. Prefixes the
- *                      received packet.
- * @return              EOK on success.
+ * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] packet    The received packet or the received packet queue.
+ * @param[in] target    The target internetwork module service to be
+ *                      delivered to.
+ * @param[in] error     The packet error reporting service. Prefixes the
+ *                      received packet.
+ *
+ * @return EOK on success.
+ *
  */
 int ip_received_error_msg_remote(int ip_phone, device_id_t device_id,
-    packet_t *packet, services_t target, services_t error)
+    packet_t packet, services_t target, services_t error)
 {
         return generic_received_msg_remote(ip_phone, NET_IP_RECEIVED_ERROR,
@@ -214 +200 @@
  * The packets may get fragmented if needed.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
- * @param[in] packet    The packet fragments as a packet queue. All the
- *                      packets have to have the same destination address.
- * @param[in] sender    The sending module service.
- * @param[in] error     The packet error reporting service. Prefixes the
- *                      received packet.
- * @return              EOK on success.
- * @return              Other error codes as defined for the generic_send_msg()
- *                      function.
- */
-int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t *packet,
+ * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] packet    The packet fragments as a packet queue. All the
+ *                      packets have to have the same destination address.
+ * @param[in] sender    The sending module service.
+ * @param[in] error     The packet error reporting service. Prefixes the
+ *                      received packet.
+ *
+ * @return EOK on success.
+ * @return Other error codes as defined for the generic_send_msg() function.
+ *
+ */
+int ip_send_msg_remote(int ip_phone, device_id_t device_id, packet_t packet,
     services_t sender, services_t error)
 {
@@ -236 +223 @@
  * This gateway is used if no other route is found.
  *
- * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
- * @param[in] device_id The device identifier.
- * @param[in] gateway   The default gateway.
+ * @param[in] ip_phone  The IP module phone used for (semi)remote calls.
+ * @param[in] device_id The device identifier.
+ * @param[in] gateway   The default gateway.
+ *
  */
 int ip_set_gateway_req_remote(int ip_phone, device_id_t device_id,