Changeset 7a68fe5 in mainline for uspace/srv/net/tl/tcp/tcp.c

Timestamp:

2011-10-10T06:58:55Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

2ea6392

Parents:

e68c834 (diff), 80099c19 (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 with mainline

File:

• uspace/srv/net/tl/tcp/tcp.c (modified) (10 diffs)

uspace/srv/net/tl/tcp/tcp.c

@@ -169 +169 @@
 static int tcp_release_after_timeout(void *);
 
-static int tcp_process_packet(device_id_t, packet_t *, services_t);
+static int tcp_process_packet(nic_device_id_t, packet_t *, services_t);
 static int tcp_connect_core(socket_core_t *, socket_cores_t *,
     struct sockaddr *, socklen_t);
@@ -177 +177 @@
     size_t);
 static packet_t *tcp_get_packets_to_send(socket_core_t *, tcp_socket_data_t *);
-static void tcp_send_packets(device_id_t, packet_t *);
+static void tcp_send_packets(nic_device_id_t, packet_t *);
 
 static void tcp_process_acknowledgement(socket_core_t *, tcp_socket_data_t *,
@@ -205 +205 @@
 static void tcp_queue_received_end_of_data(socket_core_t *socket);
 
-static int tcp_received_msg(device_id_t, packet_t *, services_t, services_t);
+static int tcp_received_msg(nic_device_id_t, packet_t *, services_t, services_t);
 static int tcp_process_client_messages(async_sess_t *, ipc_callid_t,
     ipc_call_t);
@@ -220 +220 @@
 tcp_globals_t tcp_globals;
 
-int tcp_received_msg(device_id_t device_id, packet_t *packet,
+int tcp_received_msg(nic_device_id_t device_id, packet_t *packet,
     services_t receiver, services_t error)
 {
@@ -238 +238 @@
 }
 
-int tcp_process_packet(device_id_t device_id, packet_t *packet, services_t error)
+int tcp_process_packet(nic_device_id_t device_id, packet_t *packet, services_t error)
 {
         size_t length;
@@ -1251 +1251 @@
         bzero(socket_data, sizeof(*socket_data));
         socket_data->state = TCP_SOCKET_INITIAL;
-        socket_data->device_id = DEVICE_INVALID_ID;
+        socket_data->device_id = NIC_DEVICE_INVALID_ID;
         socket_data->window = NET_DEFAULT_TCP_WINDOW;
         socket_data->treshold = socket_data->window;
@@ -1335 +1335 @@
                         }
                         if (tl_get_ip_packet_dimension(tcp_globals.ip_sess,
-                            &tcp_globals.dimensions, DEVICE_INVALID_ID,
+                            &tcp_globals.dimensions, NIC_DEVICE_INVALID_ID,
                             &packet_dimension) == EOK) {
                                 SOCKET_SET_DATA_FRAGMENT_SIZE(answer,
@@ -1651 +1651 @@
         /* Sent packet? */
         packet = pq_find(socket_data->outgoing, sequence_number);
-        printf("retransmit %d\n", packet_get_id(packet));
         if (packet) {
                 pq_get_order(packet, NULL, &data_length);
@@ -1790 +1789 @@
 
                         /* Send the packet */
-                        printf("connecting %d\n", packet_get_id(packet));
                         tcp_send_packets(socket_data->device_id, packet);
 
@@ -2004 +2002 @@
 }
 
-void tcp_send_packets(device_id_t device_id, packet_t *packet)
+void tcp_send_packets(nic_device_id_t device_id, packet_t *packet)
 {
         packet_t *next;