Ignore:
Timestamp:
Oct 23, 2009, 3:41:36 AM (12 years ago)
Author:
charles
Message:

(trunk) trunk's just been too stable lately. #2119: reload settings.json on SIGHUP

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libtransmission/net.c

    r8889 r9387  
    304304        return -EINVAL;
    305305
    306     s = tr_fdSocketCreate( domains[addr->type], SOCK_STREAM );
     306    s = tr_fdSocketCreate( session, domains[addr->type], SOCK_STREAM );
    307307    if( s < 0 )
    308308        return -1;
    309309
    310310    if( evutil_make_socket_nonblocking( s ) < 0 ) {
    311         tr_netClose( s );
     311        tr_netClose( session, s );
    312312        return -1;
    313313    }
     
    340340                    s, tr_ntop_non_ts( addr ), (int)port, tmperrno,
    341341                    tr_strerror( tmperrno ) );
    342         tr_netClose( s );
     342        tr_netClose( session, s );
    343343        s = -tmperrno;
    344344    }
     
    437437
    438438int
    439 tr_netAccept( tr_session  * session UNUSED,
     439tr_netAccept( tr_session  * session,
    440440              int           b,
    441441              tr_address  * addr,
    442442              tr_port     * port )
    443443{
    444     int fd = tr_fdSocketAccept( b, addr, port );
     444    int fd = tr_fdSocketAccept( session, b, addr, port );
    445445
    446446    if( fd>=0 && evutil_make_socket_nonblocking(fd)<0 ) {
    447         tr_netClose( fd );
     447        tr_netClose( session, fd );
    448448        fd = -1;
    449449    }
     
    453453
    454454void
    455 tr_netClose( int s )
    456 {
    457     tr_fdSocketClose( s );
    458 }
     455tr_netClose( tr_session * session, int s )
     456{
     457    tr_fdSocketClose( session, s );
     458}
Note: See TracChangeset for help on using the changeset viewer.