Navigation

Changeset 950:51c15f98a965 in freeDiameter for libfdcore/peers.c


Ignore:
Timestamp:
Feb 21, 2013, 7:57:32 PM (11 years ago)
Author:
Thomas Klausner <tk@giga.or.at>
Branch:
default
Parents:
949:ad5c976e0dc7 (diff), 924:877592751fee (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.
Phase:
public
Message:

merge current version from 1.1 branch (927:877592751fee).

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libfdcore/peers.c

    r917 r950  
    9191
    9292/* Add a new peer entry */
    93 int fd_peer_add ( struct peer_info * info, char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
     93int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
    9494{
    9595        struct fd_peer *p = NULL;

  • libfdcore/peers.c

    r947 r950  
    549549        ev_data->validate = !found;
    550550       
    551         CHECK_FCT_DO( ret = fd_event_send(peer->p_events, FDEVP_CNX_INCOMING, sizeof(ev_data), ev_data), goto out );
     551        CHECK_FCT_DO( ret = fd_event_send(peer->p_events, FDEVP_CNX_INCOMING, sizeof(*ev_data), ev_data), goto out );
    552552       
    553553out:   
Note: See TracChangeset for help on using the changeset viewer.