Changes in uspace/lib/net/tl/tl_common.c [609243f4:28a3e74] in mainline

File:

• uspace/lib/net/tl/tl_common.c (modified) (14 diffs)

uspace/lib/net/tl/tl_common.c

@@ -43 +43 @@
 #include <ip_interface.h>
 #include <tl_remote.h>
+
 #include <net/socket_codes.h>
 #include <net/in.h>
@@ -49 +50 @@
 #include <net/device.h>
 #include <net/packet.h>
+
 #include <async.h>
 #include <ipc/services.h>
@@ -105 +107 @@
  * The reply is cached then.
  *
- * @param[in]  sess              IP module session.
- * @param[in]  packet_dimensions Packet dimensions cache.
- * @param[in]  device_id         Device identifier.
- * @param[out] packet_dimension  IP packet dimensions.
- *
- * @return EOK on success.
- * @return EBADMEM if the packet_dimension parameter is NULL.
- * @return ENOMEM if there is not enough memory left.
- * @return EINVAL if the packet_dimensions cache is not valid.
- * @return Other codes as defined for the ip_packet_size_req()
- *         function.
- *
- */
-int tl_get_ip_packet_dimension(async_sess_t *sess,
-    packet_dimensions_t *packet_dimensions, nic_device_id_t device_id,
+ * @param[in] ip_phone  The IP moduel phone for (semi)remote calls.
+ * @param[in] packet_dimensions The packet dimensions cache.
+ * @param[in] device_id The device identifier.
+ * @param[out] packet_dimension The IP packet dimensions.
+ * @return              EOK on success.
+ * @return              EBADMEM if the packet_dimension parameter is NULL.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              EINVAL if the packet_dimensions cache is not valid.
+ * @return              Other codes as defined for the ip_packet_size_req()
+ *                      function.
+ */
+int
+tl_get_ip_packet_dimension(int ip_phone,
+    packet_dimensions_t *packet_dimensions, device_id_t device_id,
     packet_dimension_t **packet_dimension)
 {
+        int rc;
+        
         if (!packet_dimension)
                 return EBADMEM;
@@ -130 +133 @@
                 /* Ask for and remember them if not found */
                 *packet_dimension = malloc(sizeof(**packet_dimension));
-                if (!*packet_dimension)
+                if(!*packet_dimension)
                         return ENOMEM;
                 
-                int rc = ip_packet_size_req(sess, device_id, *packet_dimension);
+                rc = ip_packet_size_req(ip_phone, device_id, *packet_dimension);
                 if (rc != EOK) {
                         free(*packet_dimension);
@@ -160 +163 @@
 int
 tl_update_ip_packet_dimension(packet_dimensions_t *packet_dimensions,
-    nic_device_id_t device_id, size_t content)
+    device_id_t device_id, size_t content)
 {
         packet_dimension_t *packet_dimension;
@@ -170 +173 @@
         packet_dimension->content = content;
 
-        if (device_id != NIC_DEVICE_INVALID_ID) {
+        if (device_id != DEVICE_INVALID_ID) {
                 packet_dimension = packet_dimensions_find(packet_dimensions,
-                    NIC_DEVICE_INVALID_ID);
+                    DEVICE_INVALID_ID);
 
                 if (packet_dimension) {
@@ -179 +182 @@
                         else
                                 packet_dimensions_exclude(packet_dimensions,
-                                    NIC_DEVICE_INVALID_ID, free);
+                                    DEVICE_INVALID_ID, free);
                 }
         }
@@ -233 +236 @@
 /** Prepares the packet for ICMP error notification.
  *
- * Keep the first packet and release all the others.
- * Release all the packets on error.
- *
- * @param[in] packet_sess Packet server module session.
- * @param[in] icmp_sess   ICMP module phone.
- * @param[in] packet      Packet to be send.
- * @param[in] error       Packet error reporting service. Prefixes the
- *                        received packet.
- *
- * @return EOK on success.
- * @return ENOENT if no packet may be sent.
- *
- */
-int tl_prepare_icmp_packet(async_sess_t *packet_sess, async_sess_t *icmp_sess,
-    packet_t *packet, services_t error)
-{
+ * Keeps the first packet and releases all the others.
+ * Releases all the packets on error.
+ *
+ * @param[in] packet_phone The packet server module phone.
+ * @param[in] icmp_phone The ICMP module phone.
+ * @param[in] packet    The packet to be send.
+ * @param[in] error     The packet error reporting service. Prefixes the
+ *                      received packet.
+ * @return              EOK on success.
+ * @return              ENOENT if no packet may be sent.
+ */
+int
+tl_prepare_icmp_packet(int packet_phone, int icmp_phone, packet_t *packet,
+    services_t error)
+{
+        packet_t *next;
+        uint8_t *src;
+        int length;
+
         /* Detach the first packet and release the others */
-        packet_t *next = pq_detach(packet);
+        next = pq_detach(packet);
         if (next)
-                pq_release_remote(packet_sess, packet_get_id(next));
-        
-        uint8_t *src;
-        int length = packet_get_addr(packet, &src, NULL);
-        if ((length > 0) && (!error) && (icmp_sess) &&
+                pq_release_remote(packet_phone, packet_get_id(next));
+        
+        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
@@ -264 +269 @@
                 return EOK;
         } else
-                pq_release_remote(packet_sess, packet_get_id(packet));
-        
+                pq_release_remote(packet_phone, packet_get_id(packet));
+
         return ENOENT;
 }
@@ -271 +276 @@
 /** Receives data from the socket into a packet.
  *
- * @param[in]  sess      Packet server module session.
- * @param[out] packet    New created packet.
- * @param[in]  prefix    Reserved packet data prefix length.
- * @param[in]  dimension Packet dimension.
- * @param[in]  addr      Destination address.
- * @param[in]  addrlen   Address length.
- *
- * @return Number of bytes received.
- * @return EINVAL if the client does not send data.
- * @return ENOMEM if there is not enough memory left.
- * @return Other error codes as defined for the
- *         async_data_read_finalize() function.
- *
- */
-int tl_socket_read_packet_data(async_sess_t *sess, packet_t **packet,
-    size_t prefix, const packet_dimension_t *dimension,
-    const struct sockaddr *addr, socklen_t addrlen)
+ * @param[in] packet_phone The packet server module phone.
+ * @param[out] packet   The new created packet.
+ * @param[in] prefix    Reserved packet data prefix length.
+ * @param[in] dimension The packet dimension.
+ * @param[in] addr      The destination address.
+ * @param[in] addrlen   The address length.
+ * @return              Number of bytes received.
+ * @return              EINVAL if the client does not send data.
+ * @return              ENOMEM if there is not enough memory left.
+ * @return              Other error codes as defined for the
+ *                      async_data_read_finalize() function.
+ */
+int
+tl_socket_read_packet_data(int packet_phone, packet_t **packet, size_t prefix,
+    const packet_dimension_t *dimension, const struct sockaddr *addr,
+    socklen_t addrlen)
 {
         ipc_callid_t callid;
@@ -302 +306 @@
 
         /* Get a new packet */
-        *packet = packet_get_4_remote(sess, length, dimension->addr_len,
+        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len,
             prefix + dimension->prefix, dimension->suffix);
         if (!packet)
@@ -310 +314 @@
         data = packet_suffix(*packet, length);
         if (!data) {
-                pq_release_remote(sess, packet_get_id(*packet));
+                pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ENOMEM;
         }
@@ -317 +321 @@
         rc = async_data_write_finalize(callid, data, length);
         if (rc != EOK) {
-                pq_release_remote(sess, packet_get_id(*packet));
+                pq_release_remote(packet_phone, packet_get_id(*packet));
                 return rc;
         }
@@ -324 +328 @@
         rc = packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen);
         if (rc != EOK) {
-                pq_release_remote(sess, packet_get_id(*packet));
+                pq_release_remote(packet_phone, packet_get_id(*packet));
                 return rc;
         }