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

Changeset 5863a95 in mainline for uspace/srv/net/tl/tcp/tcp.c


Ignore:
Timestamp:
2010-12-17T08:59:35Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
58854f2
Parents:
70e5ad5 (diff), 11658b64 (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 development/ changes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/tl/tcp/tcp.c

    r70e5ad5 r5863a95  
    829829        /* Notify the destination socket */
    830830        async_msg_5(socket->phone, NET_SOCKET_RECEIVED,
    831             (ipcarg_t) socket->socket_id,
     831            (sysarg_t) socket->socket_id,
    832832            ((packet_dimension->content < socket_data->data_fragment_size) ?
    833833            packet_dimension->content : socket_data->data_fragment_size), 0, 0,
    834             (ipcarg_t) fragments);
     834            (sysarg_t) fragments);
    835835
    836836        return EOK;
     
    10901090                        /* Notify the destination socket */
    10911091                        async_msg_5(socket->phone, NET_SOCKET_ACCEPTED,
    1092                             (ipcarg_t) listening_socket->socket_id,
     1092                            (sysarg_t) listening_socket->socket_id,
    10931093                            socket_data->data_fragment_size, TCP_HEADER_SIZE,
    1094                             0, (ipcarg_t) socket->socket_id);
     1094                            0, (sysarg_t) socket->socket_id);
    10951095
    10961096                        fibril_rwlock_write_unlock(socket_data->local_lock);
     
    12401240
    12411241        *answer_count = 0;
    1242         switch (IPC_GET_METHOD(*call)) {
     1242        switch (IPC_GET_IMETHOD(*call)) {
    12431243        case NET_TL_RECEIVED:
    12441244//              fibril_rwlock_read_lock(&tcp_globals.lock);
     
    13231323
    13241324                /* Process the call */
    1325                 switch (IPC_GET_METHOD(call)) {
     1325                switch (IPC_GET_IMETHOD(call)) {
    13261326                case IPC_M_PHONE_HUNGUP:
    13271327                        keep_on_going = false;
     
    24812481                 * result.
    24822482                 */
    2483                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
     2483                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
    24842484                    (res == EHANGUP))
    24852485                        return;
Note: See TracChangeset for help on using the changeset viewer.