Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 097967b in mainline


Ignore:
Timestamp:
2010-12-28T12:00:46Z (11 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
c41834a, eaef141
Parents:
e64e40b (diff), 86f6121 (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 more TCP fixes.

Location:
uspace
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/generic/net/socket_client.c

    re64e40b r097967b  
    10231023        if (fragments == 0) {
    10241024                /* No more data, other side has closed the connection. */
     1025                fibril_mutex_unlock(&socket->receive_lock);
     1026                fibril_rwlock_read_unlock(&socket_globals.lock);
    10251027                return 0;
    10261028        }
  • uspace/srv/net/tl/tcp/tcp.c

    re64e40b r097967b  
    769769        }
    770770
    771         if (header->finalize)
    772                 socket_data->next_incoming += 1;
    773 
    774771        /* If next in sequence is an incoming FIN */
    775772        if (socket_data->next_incoming == socket_data->fin_incoming) {
     
    22472244
    22482245                tcp_prepare_operation_header(socket, socket_data, header, 0, 0);
    2249                 rc = tcp_queue_packet(socket, socket_data, packet, 0);
     2246                rc = tcp_queue_packet(socket, socket_data, packet, total_length);
    22502247                if (rc != EOK)
    22512248                        return rc;
Note: See TracChangeset for help on using the changeset viewer.