Changeset 6a44ee4 in mainline for uspace/lib/net/generic/packet_client.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (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/generic/packet_client.c (modified) (2 diffs)

uspace/lib/net/generic/packet_client.c

@@ -247 +247 @@
 }
 
-/** Returns the packet copy.
- *
- * Copies the addresses, data, order and metric values.
- * Does not copy the queue placement.
- *
- * @param[in] phone     The packet server module phone.
- * @param[in] packet    The original packet.
- * @return              The packet copy.
- * @return              NULL on error.
- */
-packet_t *packet_get_copy(int phone, packet_t *packet)
-{
-        packet_t *copy;
-        uint8_t * src = NULL;
-        uint8_t * dest = NULL;
-        size_t addrlen;
-
-        if (!packet_is_valid(packet))
-                return NULL;
-
+/** Return the packet copy.
+ *
+ * Copy the addresses, data, order and metric values.
+ * Queue placement is not copied.
+ *
+ * @param[in] sess   Packet server module session.
+ * @param[in] packet Original packet.
+ *
+ * @return Packet copy.
+ * @return NULL on error.
+ *
+ */
+packet_t *packet_get_copy(async_sess_t *sess, packet_t *packet)
+{
+        if (!packet_is_valid(packet))
+                return NULL;
+        
         /* Get a new packet */
-        copy = packet_get_4_remote(phone, PACKET_DATA_LENGTH(packet),
+        packet_t *copy = packet_get_4_remote(sess, PACKET_DATA_LENGTH(packet),
             PACKET_MAX_ADDRESS_LENGTH(packet), packet->max_prefix,
             PACKET_MIN_SUFFIX(packet));
+        
         if (!copy)
                 return NULL;
-
+        
         /* Get addresses */
-        addrlen = packet_get_addr(packet, &src, &dest);
+        uint8_t *src = NULL;
+        uint8_t *dest = NULL;
+        size_t addrlen = packet_get_addr(packet, &src, &dest);
+        
         /* Copy data */
         if ((packet_copy_data(copy, packet_get_data(packet),
@@ -286 +287 @@
                 return copy;
         } else {
-                pq_release_remote(phone, copy->packet_id);
+                pq_release_remote(sess, copy->packet_id);
                 return NULL;
         }