Changeset 961:d95cd3ca9e8d in freeDiameter for libfdcore/peers.c

Timestamp:

Mar 7, 2013, 4:09:54 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Parents:

960:f39fa6cd86e0 (diff), 933:04f590da5821 (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 latest 1.1 branch (one commit post 1.1.6)

Files:

• libfdcore/peers.c (modified) (1 diff)
• libfdcore/peers.c (modified) (2 diffs)

libfdcore/peers.c

@@ -91 +91 @@
 
 /* Add a new peer entry */
-int fd_peer_add ( struct peer_info * info, char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
+int fd_peer_add ( struct peer_info * info, const char * orig_dbg, void (*cb)(struct peer_info *, void *), void * cb_data )
 {
         struct fd_peer *p = NULL;

libfdcore/peers.c

@@ -3 +3 @@
 * Author: Sebastien Decugis <sdecugis@freediameter.net>                                                  *
 *                                                                                                        *
-* Copyright (c) 2012, WIDE Project and NICT                                                              *
+* Copyright (c) 2013, WIDE Project and NICT                                                              *
 * All rights reserved.                                                                                   *
 *                                                                                                        *
@@ -515 +515 @@
                 peer->p_flags.pf_delete = 1;
                 
+#ifndef DISABLE_PEER_EXPIRY
                 /* Set this peer to expire on inactivity */
                 peer->p_hdr.info.config.pic_flags.exp   = PI_EXP_INACTIVE;
                 peer->p_hdr.info.config.pic_lft         = 3600; /* 1 hour without any message 
                 -- RFC3539 states that this must not be inferior to BRINGDOWN_INTERVAL = 5 minutes */
+                
                 CHECK_FCT_DO( ret = fd_p_expi_update( peer ), goto out );
-
+#endif /* DISABLE_PEER_EXPIRY */
                 
                 /* Insert the new peer in the list (the PSM will take care of setting the expiry after validation) */