Changeset f4f866c in mainline for uspace/lib/net/tl/tl_common.c

Timestamp:

2010-04-23T21:42:26Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6c39a907

Parents:

38aaacc2 (diff), 80badbe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

uspace/lib/net/tl/tl_common.c

@@ -42 +42 @@
 #include <packet/packet.h>
 #include <packet/packet_client.h>
+#include <packet_remote.h>
 #include <net_device.h>
 #include <icmp_interface.h>
@@ -47 +48 @@
 #include <in6.h>
 #include <inet.h>
-#include <ip_interface.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>
 #include <tl_common.h>
 
@@ -82 +86 @@
 }
 
-int tl_get_ip_packet_dimension(int ip_phone, packet_dimensions_ref packet_dimensions, device_id_t device_id, packet_dimension_ref * packet_dimension){
+/** Get IP packet dimensions.
+ *
+ * Try to search a cache and query the IP module if not found.
+ * The reply is cached then.
+ *
+ * @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_ref packet_dimensions, device_id_t device_id,
+    packet_dimension_ref *packet_dimension)
+{
         ERROR_DECLARE;
-
-        if(! packet_dimension){
+        
+        if (!packet_dimension)
                 return EBADMEM;
-        }
-
+        
         *packet_dimension = packet_dimensions_find(packet_dimensions, device_id);
-        if(! * packet_dimension){
-                // ask for and remember them if not found
-                *packet_dimension = malloc(sizeof(** packet_dimension));
-                if(! * packet_dimension){
+        if (!*packet_dimension) {
+                /* Ask for and remember them if not found */
+                *packet_dimension = malloc(sizeof(**packet_dimension));
+                if(!*packet_dimension)
                         return ENOMEM;
-                }
-                if(ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id, * packet_dimension))){
+                
+                if (ERROR_OCCURRED(ip_packet_size_req(ip_phone, device_id,
+                    *packet_dimension))) {
                         free(*packet_dimension);
                         return ERROR_CODE;
                 }
-                ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id, * packet_dimension);
-                if(ERROR_CODE < 0){
+                
+                ERROR_CODE = packet_dimensions_add(packet_dimensions, device_id,
+                    *packet_dimension);
+                if (ERROR_CODE < 0) {
                         free(*packet_dimension);
                         return ERROR_CODE;
                 }
         }
+        
         return EOK;
 }
@@ -169 +196 @@
         // detach the first packet and release the others
         next = pq_detach(packet);
-        if(next){
-                pq_release(packet_phone, packet_get_id(next));
-        }
+        if (next)
+                pq_release_remote(packet_phone, packet_get_id(next));
+        
         length = packet_get_addr(packet, &src, NULL);
         if((length > 0)
@@ -180 +207 @@
                 return EOK;
         }else{
-                pq_release(packet_phone, packet_get_id(packet));
+                pq_release_remote(packet_phone, packet_get_id(packet));
         }
         return ENOENT;
@@ -200 +227 @@
         }
         // get a new packet
-        *packet = packet_get_4(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix);
+        *packet = packet_get_4_remote(packet_phone, length, dimension->addr_len, prefix + dimension->prefix, dimension->suffix);
         if(! packet){
                 return ENOMEM;
@@ -207 +234 @@
         data = packet_suffix(*packet, length);
         if(! data){
-                pq_release(packet_phone, packet_get_id(*packet));
+                pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ENOMEM;
         }
@@ -214 +241 @@
         // set the packet destination address
                 || ERROR_OCCURRED(packet_set_addr(*packet, NULL, (uint8_t *) addr, addrlen))){
-                pq_release(packet_phone, packet_get_id(*packet));
+                pq_release_remote(packet_phone, packet_get_id(*packet));
                 return ERROR_CODE;
         }