Changeset 97c7682 in mainline for uspace/lib/net/tl/socket_core.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:

• uspace/lib/net/tl/socket_core.c (modified) (4 diffs)

uspace/lib/net/tl/socket_core.c

@@ -36 +36 @@
 
 #include <socket_core.h>
-#include <packet_client.h>
-#include <packet_remote.h>
 #include <net/socket_codes.h>
 #include <net/in.h>
 #include <net/inet.h>
-#include <net/packet.h>
-#include <net/modules.h>
 #include <stdint.h>
 #include <stdlib.h>
@@ -92 +88 @@
         }
         
-        /* Release all received packets */
-        int packet_id;
-        while ((packet_id = dyn_fifo_pop(&socket->received)) >= 0)
-                pq_release_remote(sess, packet_id);
-        
-        dyn_fifo_destroy(&socket->received);
         dyn_fifo_destroy(&socket->accepted);
         
@@ -448 +438 @@
         socket->key_length = 0;
         socket->specific_data = specific_data;
-        rc = dyn_fifo_initialize(&socket->received, SOCKET_INITIAL_RECEIVED_SIZE);
+        
+        rc = dyn_fifo_initialize(&socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE);
         if (rc != EOK) {
                 free(socket);
                 return rc;
         }
-        
-        rc = dyn_fifo_initialize(&socket->accepted, SOCKET_INITIAL_ACCEPTED_SIZE);
-        if (rc != EOK) {
-                dyn_fifo_destroy(&socket->received);
-                free(socket);
-                return rc;
-        }
         socket->socket_id = *socket_id;
         rc = socket_cores_add(local_sockets, socket->socket_id, socket);
         if (rc < 0) {
-                dyn_fifo_destroy(&socket->received);
                 dyn_fifo_destroy(&socket->accepted);
                 free(socket);
@@ -506 +489 @@
         socket_destroy_core(sess, socket, local_sockets, global_sockets,
             socket_release);
-        
-        return EOK;
-}
-
-/** Replies the packet or the packet queue data to the application via the
- * socket.
- *
- * Uses the current message processing fibril.
- *
- * @param[in] packet    The packet to be transfered.
- * @param[out] length   The total data length.
- * @return              EOK on success.
- * @return              EBADMEM if the length parameter is NULL.
- * @return              ENOMEM if there is not enough memory left.
- * @return              Other error codes as defined for the data_reply()
- *                      function.
- */
-int socket_reply_packets(packet_t *packet, size_t *length)
-{
-        packet_t *next_packet;
-        size_t fragments;
-        size_t *lengths;
-        size_t index;
-        int rc;
-
-        if (!length)
-                return EBADMEM;
-
-        next_packet = pq_next(packet);
-        if (!next_packet) {
-                /* Write all if only one fragment */
-                rc = data_reply(packet_get_data(packet),
-                    packet_get_data_length(packet));
-                if (rc != EOK)
-                        return rc;
-                /* Store the total length */
-                *length = packet_get_data_length(packet);
-        } else {
-                /* Count the packet fragments */
-                fragments = 1;
-                next_packet = pq_next(packet);
-                while ((next_packet = pq_next(next_packet)))
-                        ++fragments;
-                
-                /* Compute and store the fragment lengths */
-                lengths = (size_t *) malloc(sizeof(size_t) * fragments +
-                    sizeof(size_t));
-                if (!lengths)
-                        return ENOMEM;
-                
-                lengths[0] = packet_get_data_length(packet);
-                lengths[fragments] = lengths[0];
-                next_packet = pq_next(packet);
-                
-                for (index = 1; index < fragments; ++index) {
-                        lengths[index] = packet_get_data_length(next_packet);
-                        lengths[fragments] += lengths[index];
-                        next_packet = pq_next(packet);
-                }
-                
-                /* Write the fragment lengths */
-                rc = data_reply(lengths, sizeof(int) * (fragments + 1));
-                if (rc != EOK) {
-                        free(lengths);
-                        return rc;
-                }
-                next_packet = packet;
-                
-                /* Write the fragments */
-                for (index = 0; index < fragments; ++index) {
-                        rc = data_reply(packet_get_data(next_packet),
-                            lengths[index]);
-                        if (rc != EOK) {
-                                free(lengths);
-                                return rc;
-                        }
-                        next_packet = pq_next(next_packet);
-                }
-                
-                /* Store the total length */
-                *length = lengths[fragments];
-                free(lengths);
-        }
         
         return EOK;