freeDiameter: libfdproto/sessions.c annotate

annotate libfdproto/sessions.c @ 1027:0117a7746b21

Fix a number of errors and warnings introduced/highlighted by recent commits

author	Sebastien Decugis <sdecugis@freediameter.net>
date	Mon, 15 Apr 2013 15:17:07 +0800
parents	b90cb4c07160
children	7d7266115a34

rev	line source
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	1 /*********************************************************************************************************
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	2 * Software License Agreement (BSD License) *
740 4a9f08d6b6ba Updated my mail address Sebastien Decugis <sdecugis@nict.go.jp> parents: 706 diff changeset	3 * Author: Sebastien Decugis <sdecugis@freediameter.net> *
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	4 * *
928 5053f1abcf5d Updated copyright information Sebastien Decugis <sdecugis@freediameter.net> parents: 924 diff changeset	5 * Copyright (c) 2013, WIDE Project and NICT *
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	6 * All rights reserved. *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	7 * *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	8 * Redistribution and use of this software in source and binary forms, with or without modification, are *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	9 * permitted provided that the following conditions are met: *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	10 * *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	11 * * Redistributions of source code must retain the above *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	12 * copyright notice, this list of conditions and the *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	13 * following disclaimer. *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	14 * *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	15 * * Redistributions in binary form must reproduce the above *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	16 * copyright notice, this list of conditions and the *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	17 * following disclaimer in the documentation and/or other *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	18 * materials provided with the distribution. *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	19 * *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	20 * * Neither the name of the WIDE Project or NICT nor the *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	21 * names of its contributors may be used to endorse or *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	22 * promote products derived from this software without *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	23 * specific prior written permission of WIDE Project and *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	24 * NICT. *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	25 * *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	26 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	27 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	28 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	29 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	30 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	31 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	32 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	33 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	34 *********************************************************************************************************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	35
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	36 /* Sessions module.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	37 *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	38 * Basic functionalities to help implementing User sessions state machines from RFC3588.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	39 */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	40
658 f198d16fa7f4 Initial commit for 1.1.0: Sebastien Decugis <sdecugis@nict.go.jp> parents: 639 diff changeset	41 #include "fdproto-internal.h"
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	42
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	43 /********************* Parameters ********************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	44
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	45 /* Size of the hash table containing the session objects (pow of 2. ex: 6 => 2^6 = 64). must be between 0 and 31. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	46 #ifndef SESS_HASH_SIZE
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	47 #define SESS_HASH_SIZE 6
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	48 #endif /* SESS_HASH_SIZE */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	49
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	50 /* Default lifetime of a session, in seconds. (31 days = 2678400 seconds) */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	51 #ifndef SESS_DEFAULT_LIFETIME
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	52 #define SESS_DEFAULT_LIFETIME 2678400
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	53 #endif /* SESS_DEFAULT_LIFETIME */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	54
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	55 /******************** /Parameters ********************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	56
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	57 /* Eyescatchers definitions */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	58 #define SH_EYEC 0x53554AD1
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	59 #define SD_EYEC 0x5355D474
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	60 #define SI_EYEC 0x53551D
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	61
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	62 /* Macro to check an object is valid */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	63 #define VALIDATE_SH( _obj ) ( ((_obj) != NULL) && ( ((struct session_handler *)(_obj))->eyec == SH_EYEC) )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	64 #define VALIDATE_SI( _obj ) ( ((_obj) != NULL) && ( ((struct session *)(_obj))->eyec == SI_EYEC) )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	65
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	66
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	67 /* Handlers registered by users of the session module */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	68 struct session_handler {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	69 int eyec; /* An eye catcher also used to ensure the object is valid, must be SH_EYEC */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	70 int id; /* A unique integer to identify this handler */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	71 void (cleanup)(session_state , os0_t, void ); / The cleanup function to be called for cleaning a state */
639 95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	72 void opaque; / a value that is passed as is to the cleanup callback */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	73 };
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	74
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	75 static int hdl_id = 0; /* A global counter to initialize the id field */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	76 static pthread_mutex_t hdl_lock = PTHREAD_MUTEX_INITIALIZER; /* lock to protect hdl_id; we could use atomic operations otherwise (less portable) */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	77
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	78
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	79 /* Data structures linked from the sessions, containing the applications states */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	80 struct state {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	81 int eyec; /* Must be SD_EYEC */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	82 session_state state; / The state registered by the application, never NULL (or the whole object is deleted) */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	83 struct fd_list chain; /* Chaining in the list of session's states ordered by hdl->id */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	84 union {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	85 struct session_handler hdl; / The handler for which this state was registered */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	86 os0_t sid; /* For deleted state, the sid of the session it belong to */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	87 };
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	88 };
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	89
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	90 /* Session object, one for each value of Session-Id AVP */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	91 struct session {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	92 int eyec; /* Eyecatcher, SI_EYEC */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	93
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	94 os0_t sid; /* The \0-terminated Session-Id */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	95 size_t sidlen; /* cached length of sid */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	96 uint32_t hash; /* computed hash of sid */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	97 struct fd_list chain_h;/* chaining in the hash table of sessions. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	98
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	99 struct timespec timeout;/* Timeout date for the session */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	100 struct fd_list expire; /* List of expiring sessions, ordered by timeouts. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	101
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	102 pthread_mutex_t stlock; /* A lock to protect the list of states associated with this session */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	103 struct fd_list states; /* Sentinel for the list of states of this session. */
557 85ab58cc427c Committed this by error Sebastien Decugis <sdecugis@nict.go.jp> parents: 556 diff changeset	104 int msg_cnt;/* Reference counter for the messages pointing to this session */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	105 int is_destroyed; /* boolean telling if fd_sess_detroy has been called on this */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	106 };
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	107
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	108 /* Sessions hash table, to allow fast sid to session retrieval */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	109 static struct {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	110 struct fd_list sentinel; /* sentinel element for this sublist. The sublist is ordered by hash value, then fd_os_cmp(sid). */
557 85ab58cc427c Committed this by error Sebastien Decugis <sdecugis@nict.go.jp> parents: 556 diff changeset	111 pthread_mutex_t lock; /* the mutex for this sublist -- we might probably change it to rwlock for a little optimization */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	112 } sess_hash [ 1 << SESS_HASH_SIZE ] ;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	113 #define H_MASK( __hash ) ((__hash) & (( 1 << SESS_HASH_SIZE ) - 1))
557 85ab58cc427c Committed this by error Sebastien Decugis <sdecugis@nict.go.jp> parents: 556 diff changeset	114 #define H_LIST( _hash ) (&(sess_hash[H_MASK(_hash)].sentinel))
85ab58cc427c Committed this by error Sebastien Decugis <sdecugis@nict.go.jp> parents: 556 diff changeset	115 #define H_LOCK( _hash ) (&(sess_hash[H_MASK(_hash)].lock ))
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	116
778 003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	117 static uint32_t sess_cnt = 0; /* counts all active session (that are in the expiry list) */
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	118
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	119 /* The following are used to generate sid values that are eternaly unique */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	120 static uint32_t sid_h; /* initialized to the current time in fd_sess_init */
7 e5af94b04946 Added dispatch module and tests Sebastien Decugis <sdecugis@nict.go.jp> parents: 6 diff changeset	121 static uint32_t sid_l; /* incremented each time a session id is created */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	122 static pthread_mutex_t sid_lock = PTHREAD_MUTEX_INITIALIZER;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	123
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	124 /* Expiring sessions management */
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	125 static struct fd_list exp_sentinel = FD_LIST_INITIALIZER(exp_sentinel); /* list of sessions ordered by their timeout date */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	126 static pthread_mutex_t exp_lock = PTHREAD_MUTEX_INITIALIZER; /* lock protecting the list. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	127 static pthread_cond_t exp_cond = PTHREAD_COND_INITIALIZER; /* condvar used by the expiry mecahinsm. */
686 f83d9878bf66 Fixed in case of termination of several modules (before initialization completed) Sebastien Decugis <sdecugis@nict.go.jp> parents: 662 diff changeset	128 static pthread_t exp_thr = (pthread_t)NULL; /* The expiry thread that handles cleanup of expired sessions */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	129
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	130 /* Hierarchy of the locks, to avoid deadlocks:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	131 * hash lock > state lock > expiry lock
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	132 * i.e. state lock can be taken while holding the hash lock, but not while holding the expiry lock.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	133 * As well, the hash lock cannot be taken while holding a state lock.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	134 */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	135
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	136 /********************************************************************************************************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	137
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	138 /* Initialize a session object. It is not linked now. sid must be already malloc'ed. The hash has already been computed. */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	139 static struct session * new_session(os0_t sid, size_t sidlen, uint32_t hash)
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	140 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	141 struct session * sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	142
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	143 TRACE_ENTRY("%p %zd", sid, sidlen);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	144 CHECK_PARAMS_DO( sid && sidlen, return NULL );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	145
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	146 CHECK_MALLOC_DO( sess = malloc(sizeof(struct session)), return NULL );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	147 memset(sess, 0, sizeof(struct session));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	148
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	149 sess->eyec = SI_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	150
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	151 sess->sid = sid;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	152 sess->sidlen = sidlen;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	153 sess->hash = hash;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	154 fd_list_init(&sess->chain_h, sess);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	155
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	156 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &sess->timeout), return NULL );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	157 sess->timeout.tv_sec += SESS_DEFAULT_LIFETIME;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	158 fd_list_init(&sess->expire, sess);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	159
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	160 CHECK_POSIX_DO( pthread_mutex_init(&sess->stlock, NULL), return NULL );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	161 fd_list_init(&sess->states, sess);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	162
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	163 return sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	164 }
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	165
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	166 /* destroy the session object. It should really be already unlinked... */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	167 static void del_session(struct session * s)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	168 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	169 ASSERT(FD_IS_LIST_EMPTY(&s->states));
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	170 free(s->sid);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	171 fd_list_unlink(&s->chain_h);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	172 fd_list_unlink(&s->expire);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	173 CHECK_POSIX_DO( pthread_mutex_destroy(&s->stlock), /* continue */ );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	174 free(s);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	175 }
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	176
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	177 /* The expiry thread */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	178 static void * exp_fct(void * arg)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	179 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	180 fd_log_threadname ( "Session/expire" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	181 TRACE_ENTRY( "" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	182
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	183
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	184 do {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	185 struct timespec now;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	186 struct session * first;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	187
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	188 CHECK_POSIX_DO( pthread_mutex_lock(&exp_lock), break );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	189 pthread_cleanup_push( fd_cleanup_mutex, &exp_lock );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	190 again:
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	191 /* Check if there are expiring sessions available */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	192 if (FD_IS_LIST_EMPTY(&exp_sentinel)) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	193 /* Just wait for a change or cancelation */
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	194 CHECK_POSIX_DO( pthread_cond_wait( &exp_cond, &exp_lock ), break /* this might not pop the cleanup handler, but since we ASSERT(0), it is not the big issue... */ );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	195 /* Restart the loop on wakeup */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	196 goto again;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	197 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	198
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	199 /* Get the pointer to the session that expires first */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	200 first = (struct session *)(exp_sentinel.next->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	201 ASSERT( VALIDATE_SI(first) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	202
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	203 /* Get the current time */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	204 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &now), break );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	205
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	206 /* If first session is not expired, we just wait until it happens */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	207 if ( TS_IS_INFERIOR( &now, &first->timeout ) ) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	208
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	209 CHECK_POSIX_DO2( pthread_cond_timedwait( &exp_cond, &exp_lock, &first->timeout ),
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	210 ETIMEDOUT, /* ETIMEDOUT is a normal error, continue */,
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	211 /* on other error, */ break );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	212
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	213 /* on wakeup, loop */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	214 goto again;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	215 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	216
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	217 /* Now, the first session in the list is expired; destroy it */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	218 pthread_cleanup_pop( 0 );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	219 CHECK_POSIX_DO( pthread_mutex_unlock(&exp_lock), break );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	220
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	221 CHECK_FCT_DO( fd_sess_destroy( &first ), break );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	222
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	223 } while (1);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	224
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	225 TRACE_DEBUG(INFO, "A system error occurred in session module! Expiry thread is terminating...");
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	226 ASSERT(0);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	227 return NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	228 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	229
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	230
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	231
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	232 /********************************************************************************************************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	233
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	234 /* Initialize the session module */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	235 int fd_sess_init(void)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	236 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	237 int i;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	238
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	239 TRACE_ENTRY( "" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	240
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	241 /* Initialize the global counters */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	242 sid_h = (uint32_t) time(NULL);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	243 sid_l = 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	244
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	245 /* Initialize the hash table */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	246 for (i = 0; i < sizeof(sess_hash) / sizeof(sess_hash[0]); i++) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	247 fd_list_init( &sess_hash[i].sentinel, NULL );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	248 CHECK_POSIX( pthread_mutex_init(&sess_hash[i].lock, NULL) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	249 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	250
453 9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	251 return 0;
9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	252 }
9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	253
9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	254 /* Run this when initializations are complete. */
9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	255 int fd_sess_start(void)
9a8b3178a7a7 Postpone the creation of session expiry thread to allow some global variables to be set (debug level, etc) Sebastien Decugis <sdecugis@nict.go.jp> parents: 452 diff changeset	256 {
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	257 /* Start session garbage collector (expiry) */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	258 CHECK_POSIX( pthread_create(&exp_thr, NULL, exp_fct, NULL) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	259
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	260 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	261 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	262
235 8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	263 /* Terminate */
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	264 void fd_sess_fini(void)
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	265 {
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	266 TRACE_ENTRY("");
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	267 CHECK_FCT_DO( fd_thr_term(&exp_thr), /* continue */ );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	268
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	269 /* Destroy all sessions in the hash table, and the hash table itself? -- How to do it without a race condition ? */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	270
235 8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	271 return;
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	272 }
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	273
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	274 /* Create a new handler */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	275 int fd_sess_handler_create_internal ( struct session_handler ** handler, void (cleanup)(session_state , os0_t, void ), void opaque )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	276 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	277 struct session_handler *new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	278
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	279 TRACE_ENTRY("%p %p", handler, cleanup);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	280
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	281 CHECK_PARAMS( handler && cleanup );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	282
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	283 CHECK_MALLOC( new = malloc(sizeof(struct session_handler)) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	284 memset(new, 0, sizeof(struct session_handler));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	285
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	286 CHECK_POSIX( pthread_mutex_lock(&hdl_lock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	287 new->id = ++hdl_id;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	288 CHECK_POSIX( pthread_mutex_unlock(&hdl_lock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	289
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	290 new->eyec = SH_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	291 new->cleanup = cleanup;
639 95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	292 new->opaque = opaque;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	293
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	294 *handler = new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	295 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	296 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	297
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	298 /* Destroy a handler, and all states attached to this handler. This operation is very slow but we don't care since it's rarely used.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	299 * Note that it's better to call this function after all sessions have been deleted... */
639 95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	300 int fd_sess_handler_destroy ( struct session_handler handler, void opaque )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	301 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	302 struct session_handler * del;
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	303 /* place to save the list of states to be cleaned up. We do it after finding them to avoid deadlocks. the "o" field becomes a copy of the sid. */
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	304 struct fd_list deleted_states = FD_LIST_INITIALIZER( deleted_states );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	305 int i;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	306
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	307 TRACE_ENTRY("%p", handler);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	308 CHECK_PARAMS( handler && VALIDATE_SH(*handler) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	309
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	310 del = *handler;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	311 *handler = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	312
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	313 del->eyec = 0xdead; /* The handler is not valid anymore for any other operation */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	314
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	315 /* Now find all sessions with data registered for this handler, and move this data to the deleted_states list. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	316 for (i = 0; i < sizeof(sess_hash) / sizeof(sess_hash[0]); i++) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	317 struct fd_list * li_si;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	318 CHECK_POSIX( pthread_mutex_lock(&sess_hash[i].lock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	319
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	320 for (li_si = sess_hash[i].sentinel.next; li_si != &sess_hash[i].sentinel; li_si = li_si->next) { /* for each session in the hash line */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	321 struct fd_list * li_st;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	322 struct session * sess = (struct session *)(li_si->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	323 CHECK_POSIX( pthread_mutex_lock(&sess->stlock) );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	324 for (li_st = sess->states.next; li_st != &sess->states; li_st = li_st->next) { /* for each state in this session */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	325 struct state * st = (struct state *)(li_st->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	326 /* The list is ordered */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	327 if (st->hdl->id < del->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	328 continue;
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	329 if (st->hdl->id == del->id) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	330 /* This state belongs to the handler we are deleting, move the item to the deleted_states list */
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	331 fd_list_unlink(&st->chain);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	332 st->sid = sess->sid;
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	333 fd_list_insert_before(&deleted_states, &st->chain);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	334 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	335 break;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	336 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	337 CHECK_POSIX( pthread_mutex_unlock(&sess->stlock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	338 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	339 CHECK_POSIX( pthread_mutex_unlock(&sess_hash[i].lock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	340 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	341
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	342 /* Now, delete all states after calling their cleanup handler */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	343 while (!FD_IS_LIST_EMPTY(&deleted_states)) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	344 struct state * st = (struct state *)(deleted_states.next->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	345 TRACE_DEBUG(FULL, "Calling cleanup handler for session '%s' and data %p", st->sid, st->state);
639 95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	346 (*del->cleanup)(st->state, st->sid, del->opaque);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	347 fd_list_unlink(&st->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	348 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	349 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	350
639 95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	351 if (opaque)
95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	352 *opaque = del->opaque;
95a784729cac Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number. Sebastien Decugis <sdecugis@nict.go.jp> parents: 557 diff changeset	353
452 2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	354 /* Free the handler */
2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	355 free(del);
2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	356
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	357 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	358 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	359
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	360
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	361
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	362 /* Create a new session object with the default timeout value, and link it. The refcount is increased by 1, whether the session existed or not */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	363 int fd_sess_new ( struct session ** session, DiamId_t diamid, size_t diamidlen, uint8_t * opt, size_t optlen )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	364 {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	365 os0_t sid = NULL;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	366 size_t sidlen;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	367 uint32_t hash;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	368 struct session * sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	369 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	370 int found = 0;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	371 int ret = 0;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	372
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	373 TRACE_ENTRY("%p %p %zd %p %zd", session, diamid, diamidlen, opt, optlen);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	374 CHECK_PARAMS( session && (diamid \|\| opt) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	375
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	376 if (diamid) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	377 if (!diamidlen) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	378 diamidlen = strlen(diamid);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	379 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	380 /* We check if the string is a valid DiameterIdentity */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	381 CHECK_PARAMS( fd_os_is_valid_DiameterIdentity((uint8_t *)diamid, diamidlen) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	382 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	383 diamidlen = 0;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	384 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	385 if (opt) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	386 if (!optlen) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	387 optlen = strlen((char *)opt);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	388 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	389 CHECK_PARAMS( fd_os_is_valid_os0(opt, optlen) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	390 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	391 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	392 optlen = 0;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	393 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	394
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	395 /* Ok, first create the identifier for the string */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	396 if (diamid == NULL) {
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	397 /* opt is the full string */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	398 CHECK_MALLOC( sid = os0dup(opt, optlen) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	399 sidlen = optlen;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	400 } else {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	401 uint32_t sid_h_cpy;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	402 uint32_t sid_l_cpy;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	403 /* "<diamId>;<high32>;<low32>[;opt]" */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	404 sidlen = diamidlen;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	405 sidlen += 22; /* max size of ';<high32>;<low32>' */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	406 if (opt)
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	407 sidlen += 1 + optlen; /* ';opt' */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	408 sidlen++; /* space for the final \0 also */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	409 CHECK_MALLOC( sid = malloc(sidlen) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	410
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	411 CHECK_POSIX( pthread_mutex_lock(&sid_lock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	412 if ( ++sid_l == 0 ) /* overflow */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	413 ++sid_h;
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	414 sid_h_cpy = sid_h;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	415 sid_l_cpy = sid_l;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	416 CHECK_POSIX( pthread_mutex_unlock(&sid_lock) );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	417
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	418 if (opt) {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	419 sidlen = snprintf((char)sid, sidlen, "%.s;%u;%u;%.*s", (int)diamidlen, diamid, sid_h_cpy, sid_l_cpy, (int)optlen, opt);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	420 } else {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	421 sidlen = snprintf((char)sid, sidlen, "%.s;%u;%u", (int)diamidlen, diamid, sid_h_cpy, sid_l_cpy);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	422 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	423 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	424
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	425 hash = fd_os_hash(sid, sidlen);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	426
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	427 /* Now find the place to add this object in the hash table. */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	428 CHECK_POSIX( pthread_mutex_lock( H_LOCK(hash) ) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	429 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(hash) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	430
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	431 for (li = H_LIST(hash)->next; li != H_LIST(hash); li = li->next) {
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	432 int cmp;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	433 struct session * s = (struct session *)(li->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	434
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	435 /* The list is ordered by hash and sid (in case of collisions) */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	436 if (s->hash < hash)
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	437 continue;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	438 if (s->hash > hash)
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	439 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	440
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	441 cmp = fd_os_cmp(s->sid, s->sidlen, sid, sidlen);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	442 if (cmp < 0)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	443 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	444 if (cmp > 0)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	445 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	446
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	447 /* A session with the same sid was already in the hash table */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	448 found = 1;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	449 *session = s;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	450 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	451 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	452
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	453 /* If the session did not exist, we can create it & link it in global tables */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	454 if (!found) {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	455 CHECK_MALLOC_DO(sess = new_session(sid, sidlen, hash),
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	456 {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	457 ret = ENOMEM;
785 e780452c6b55 Fix possible memory leaks Sebastien Decugis <sdecugis@nict.go.jp> parents: 778 diff changeset	458 free(sid);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	459 goto out;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	460 } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	461
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	462 fd_list_insert_before(li, &sess->chain_h); /* hash table */
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	463 sess->msg_cnt++;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	464 } else {
785 e780452c6b55 Fix possible memory leaks Sebastien Decugis <sdecugis@nict.go.jp> parents: 778 diff changeset	465 free(sid);
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	466
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	467 CHECK_POSIX( pthread_mutex_lock(&(*session)->stlock) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	468 (*session)->msg_cnt++;
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	469 CHECK_POSIX( pthread_mutex_unlock(&(*session)->stlock) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	470
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	471 /* it was found: was it previously destroyed? */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	472 if ((*session)->is_destroyed == 0) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	473 ret = EALREADY;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	474 goto out;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	475 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	476 /* the session was marked destroyed, let's re-activate it. */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	477 sess = *session;
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	478 sess->is_destroyed = 0;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	479
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	480 /* update the expiry time */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	481 CHECK_SYS_DO( clock_gettime(CLOCK_REALTIME, &sess->timeout), { ASSERT(0); } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	482 sess->timeout.tv_sec += SESS_DEFAULT_LIFETIME;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	483 }
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	484 }
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	485
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	486 /* We must insert in the expiry list */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	487 CHECK_POSIX( pthread_mutex_lock( &exp_lock ) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	488 pthread_cleanup_push( fd_cleanup_mutex, &exp_lock );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	489
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	490 /* Find the position in that list. We take it in reverse order */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	491 for (li = exp_sentinel.prev; li != &exp_sentinel; li = li->prev) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	492 struct session * s = (struct session *)(li->o);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	493 if (TS_IS_INFERIOR( &s->timeout, &sess->timeout ) )
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	494 break;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	495 }
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	496 fd_list_insert_after( li, &sess->expire );
778 003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	497 sess_cnt++;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	498
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	499 /* We added a new expiring element, we must signal */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	500 if (li == &exp_sentinel) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	501 CHECK_POSIX_DO( pthread_cond_signal(&exp_cond), { ASSERT(0); } ); /* if it fails, we might not pop the cleanup handlers, but this should not happen -- and we'd have a serious problem otherwise */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	502 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	503
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	504 /* We're done with the locked part */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	505 pthread_cleanup_pop(0);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	506 CHECK_POSIX_DO( pthread_mutex_unlock( &exp_lock ), { ASSERT(0); } ); /* if it fails, we might not pop the cleanup handler, but this should not happen -- and we'd have a serious problem otherwise */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	507
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	508 out:
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	509 ;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	510 pthread_cleanup_pop(0);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	511 CHECK_POSIX( pthread_mutex_unlock( H_LOCK(hash) ) );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	512
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	513 if (ret) /* in case of error */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	514 return ret;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	515
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	516 *session = sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	517 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	518 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	519
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	520 /* Find or create a session -- the msg refcount is increased */
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	521 int fd_sess_fromsid_msg ( uint8_t * sid, size_t len, struct session ** session, int * new)
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	522 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	523 int ret;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	524
1027 0117a7746b21 Fix a number of errors and warnings introduced/highlighted by recent commits Sebastien Decugis <sdecugis@freediameter.net> parents: 979 diff changeset	525 TRACE_ENTRY("%p %zd %p %p", sid, len, session, new);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	526 CHECK_PARAMS( sid && session );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	527
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	528 if (!fd_os_is_valid_os0(sid,len)) {
1027 0117a7746b21 Fix a number of errors and warnings introduced/highlighted by recent commits Sebastien Decugis <sdecugis@freediameter.net> parents: 979 diff changeset	529 TRACE_DEBUG(INFO, "Warning: a Session-Id value contains \\0 chars... (len:%zd, begin:'%.*s') => Debug messages may be truncated.", len, (int)len, sid);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	530 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	531
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	532 /* All the work is done in sess_new */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	533 ret = fd_sess_new ( session, NULL, 0, sid, len );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	534 switch (ret) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	535 case 0:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	536 case EALREADY:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	537 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	538
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	539 default:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	540 CHECK_FCT(ret);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	541 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	542
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	543 if (new)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	544 *new = ret ? 0 : 1;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	545
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	546 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	547 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	548
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	549 /* Get the sid of a session */
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	550 int fd_sess_getsid ( struct session * session, os0_t * sid, size_t * sidlen )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	551 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	552 TRACE_ENTRY("%p %p", session, sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	553
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	554 CHECK_PARAMS( VALIDATE_SI(session) && sid );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	555
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	556 *sid = session->sid;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	557 if (sidlen)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	558 *sidlen = session->sidlen;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	559
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	560 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	561 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	562
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	563 /* Change the timeout value of a session */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	564 int fd_sess_settimeout( struct session * session, const struct timespec * timeout )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	565 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	566 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	567
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	568 TRACE_ENTRY("%p %p", session, timeout);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	569 CHECK_PARAMS( VALIDATE_SI(session) && timeout );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	570
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	571 /* Lock -- do we need to lock the hash table as well? I don't think so... */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	572 CHECK_POSIX( pthread_mutex_lock( &exp_lock ) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	573 pthread_cleanup_push( fd_cleanup_mutex, &exp_lock );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	574
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	575 /* Update the timeout */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	576 fd_list_unlink(&session->expire);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	577 memcpy(&session->timeout, timeout, sizeof(struct timespec));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	578
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	579 /* Find the new position in expire list. We take it in normal order */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	580 for (li = exp_sentinel.next; li != &exp_sentinel; li = li->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	581 struct session * s = (struct session *)(li->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	582
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	583 if (TS_IS_INFERIOR( &s->timeout, &session->timeout ) )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	584 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	585
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	586 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	587 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	588 fd_list_insert_before( li, &session->expire );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	589
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	590 /* We added a new expiring element, we must signal if it was in first position */
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	591 if (session->expire.prev == &exp_sentinel) {
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	592 CHECK_POSIX_DO( pthread_cond_signal(&exp_cond), { ASSERT(0); /* so that we don't have a pending cancellation handler */ } );
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	593 }
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	594
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	595 /* We're done */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	596 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	597 CHECK_POSIX( pthread_mutex_unlock( &exp_lock ) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	598
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	599 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	600 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	601
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	602 /* Destroy the states associated to a session, and mark it destroyed. */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	603 int fd_sess_destroy ( struct session ** session )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	604 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	605 struct session * sess;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	606 int destroy_now;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	607 os0_t sid;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	608 int ret = 0;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	609
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	610 /* place to save the list of states to be cleaned up. We do it after finding them to avoid deadlocks. the "o" field becomes a copy of the sid. */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	611 struct fd_list deleted_states = FD_LIST_INITIALIZER( deleted_states );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	612
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	613 TRACE_ENTRY("%p", session);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	614 CHECK_PARAMS( session && VALIDATE_SI(*session) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	615
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	616 sess = *session;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	617 *session = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	618
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	619 /* Lock the hash line */
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	620 CHECK_POSIX( pthread_mutex_lock( H_LOCK(sess->hash) ) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	621 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(sess->hash) );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	622
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	623 /* Unlink from the expiry list */
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	624 CHECK_POSIX_DO( pthread_mutex_lock( &exp_lock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
778 003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	625 if (!FD_IS_LIST_EMPTY(&sess->expire)) {
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	626 sess_cnt--;
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	627 fd_list_unlink( &sess->expire ); /* no need to signal the condition here */
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	628 }
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	629 CHECK_POSIX_DO( pthread_mutex_unlock( &exp_lock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	630
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	631 /* Now move all states associated to this session into deleted_states */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	632 CHECK_POSIX_DO( pthread_mutex_lock( &sess->stlock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	633 while (!FD_IS_LIST_EMPTY(&sess->states)) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	634 struct state * st = (struct state *)(sess->states.next->o);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	635 fd_list_unlink(&st->chain);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	636 fd_list_insert_before(&deleted_states, &st->chain);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	637 }
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	638 CHECK_POSIX_DO( pthread_mutex_unlock( &sess->stlock ), { ASSERT(0); /* otherwise cleanup handler is not pop'd */ } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	639
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	640 /* Mark the session as destroyed */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	641 destroy_now = (sess->msg_cnt == 0);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	642 if (destroy_now) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	643 fd_list_unlink( &sess->chain_h );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	644 sid = sess->sid;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	645 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	646 sess->is_destroyed = 1;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	647 CHECK_MALLOC_DO( sid = os0dup(sess->sid, sess->sidlen), ret = ENOMEM );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	648 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	649 pthread_cleanup_pop(0);
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	650 CHECK_POSIX( pthread_mutex_unlock( H_LOCK(sess->hash) ) );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	651
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	652 if (ret)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	653 return ret;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	654
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	655 /* Now, really delete the states */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	656 while (!FD_IS_LIST_EMPTY(&deleted_states)) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	657 struct state * st = (struct state *)(deleted_states.next->o);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	658 fd_list_unlink(&st->chain);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	659 TRACE_DEBUG(FULL, "Calling handler %p cleanup for state %p registered with session '%s'", st->hdl, st, sid);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	660 (*st->hdl->cleanup)(st->state, sid, st->hdl->opaque);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	661 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	662 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	663
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	664 /* Finally, destroy the session itself, if it is not referrenced by any message anymore */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	665 if (destroy_now) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	666 del_session(sess);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	667 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	668 free(sid);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	669 }
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	670
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	671 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	672 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	673
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	674 /* Destroy a session if it is not used */
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	675 int fd_sess_reclaim ( struct session ** session )
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	676 {
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	677 struct session * sess;
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	678 uint32_t hash;
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	679 int destroy_now = 0;
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	680
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	681 TRACE_ENTRY("%p", session);
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	682 CHECK_PARAMS( session && VALIDATE_SI(*session) );
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	683
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	684 sess = *session;
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	685 hash = sess->hash;
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	686 *session = NULL;
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	687
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	688 CHECK_POSIX( pthread_mutex_lock( H_LOCK(hash) ) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	689 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(hash) );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	690 CHECK_POSIX_DO( pthread_mutex_lock( &sess->stlock ), { ASSERT(0); /* otherwise, cleanup not poped on FreeBSD */ } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	691 pthread_cleanup_push( fd_cleanup_mutex, &sess->stlock );
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	692 CHECK_POSIX_DO( pthread_mutex_lock( &exp_lock ), { ASSERT(0); /* otherwise, cleanup not poped on FreeBSD */ } );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	693
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	694 /* We only do something if the states list is empty */
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	695 if (FD_IS_LIST_EMPTY(&sess->states)) {
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	696 /* In this case, we do as in destroy */
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	697 fd_list_unlink( &sess->expire );
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	698 destroy_now = (sess->msg_cnt == 0);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	699 if (destroy_now) {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	700 fd_list_unlink(&sess->chain_h);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	701 } else {
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	702 /* just mark it as destroyed, it will be freed when the last message stops referencing it */
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	703 sess->is_destroyed = 1;
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	704 }
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	705 }
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	706
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	707 CHECK_POSIX_DO( pthread_mutex_unlock( &exp_lock ), { ASSERT(0); /* otherwise, cleanup not poped on FreeBSD */ } );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	708 pthread_cleanup_pop(0);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	709 CHECK_POSIX_DO( pthread_mutex_unlock( &sess->stlock ), { ASSERT(0); /* otherwise, cleanup not poped on FreeBSD */ } );
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	710 pthread_cleanup_pop(0);
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	711 CHECK_POSIX( pthread_mutex_unlock( H_LOCK(hash) ) );
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	712
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	713 if (destroy_now)
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	714 del_session(sess);
4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	715
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	716 return 0;
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	717 }
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	718
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	719 /* Save a state information with a session */
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	720 int fd_sess_state_store_internal ( struct session_handler * handler, struct session * session, session_state ** state )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	721 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	722 struct state *new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	723 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	724 int already = 0;
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	725 int ret = 0;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	726
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	727 TRACE_ENTRY("%p %p %p", handler, session, state);
706 4ffbc9f1e922 Large UNTESTED commit with the following changes: Sebastien Decugis <sdecugis@nict.go.jp> parents: 691 diff changeset	728 CHECK_PARAMS( handler && VALIDATE_SH(handler) && session && VALIDATE_SI(session) && (!session->is_destroyed) && state );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	729
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	730 /* Lock the session state list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	731 CHECK_POSIX( pthread_mutex_lock(&session->stlock) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	732 pthread_cleanup_push( fd_cleanup_mutex, &session->stlock );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	733
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	734 /* Create the new state object */
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	735 CHECK_MALLOC_DO(new = malloc(sizeof(struct state)), { ret = ENOMEM; goto out; } );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	736 memset(new, 0, sizeof(struct state));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	737
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	738 new->eyec = SD_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	739 new->state= *state;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	740 fd_list_init(&new->chain, new);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	741 new->hdl = handler;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	742
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	743 /* find place for this state in the list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	744 for (li = session->states.next; li != &session->states; li = li->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	745 struct state * st = (struct state *)(li->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	746 /* The list is ordered by handler's id */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	747 if (st->hdl->id < handler->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	748 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	749
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	750 if (st->hdl->id == handler->id) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	751 TRACE_DEBUG(INFO, "A state was already stored for session '%s' and handler '%p', at location %p", session->sid, st->hdl, st->state);
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	752 already = EALREADY;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	753 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	754
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	755 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	756 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	757
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	758 if (!already) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	759 fd_list_insert_before(li, &new->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	760 *state = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	761 } else {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	762 free(new);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	763 }
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	764 out:
78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	765 ;
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	766 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	767 CHECK_POSIX( pthread_mutex_unlock(&session->stlock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	768
691 78b665400097 Cleanup all pthread_cleanup_push / pop pairs so that pop is always called after push, or ASSERT(0) is some grave errors Sebastien Decugis <sdecugis@nict.go.jp> parents: 686 diff changeset	769 return ret ?: already;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	770 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	771
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	772 /* Get the data back */
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	773 int fd_sess_state_retrieve_internal ( struct session_handler * handler, struct session * session, session_state ** state )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	774 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	775 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	776 struct state * st = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	777
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	778 TRACE_ENTRY("%p %p %p", handler, session, state);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	779 CHECK_PARAMS( handler && VALIDATE_SH(handler) && session && VALIDATE_SI(session) && state );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	780
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	781 *state = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	782
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	783 /* Lock the session state list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	784 CHECK_POSIX( pthread_mutex_lock(&session->stlock) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	785 pthread_cleanup_push( fd_cleanup_mutex, &session->stlock );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	786
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	787 /* find the state in the list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	788 for (li = session->states.next; li != &session->states; li = li->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	789 st = (struct state *)(li->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	790
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	791 /* The list is ordered by handler's id */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	792 if (st->hdl->id > handler->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	793 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	794 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	795
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	796 /* If we found the state */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	797 if (st && (st->hdl == handler)) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	798 fd_list_unlink(&st->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	799 *state = st->state;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	800 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	801 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	802
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	803 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	804 CHECK_POSIX( pthread_mutex_unlock(&session->stlock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	805
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	806 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	807 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	808
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	809 /* For the messages module */
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	810 int fd_sess_fromsid ( uint8_t * sid, size_t len, struct session ** session, int * new)
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	811 {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	812 TRACE_ENTRY("%p %zd %p %p", sid, len, session, new);
102 69e2b33ee817 Removed stupid check Sebastien Decugis <sdecugis@nict.go.jp> parents: 85 diff changeset	813 CHECK_PARAMS( sid && len && session );
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	814
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	815 /* Get the session object */
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	816 CHECK_FCT( fd_sess_fromsid_msg ( sid, len, session, new) );
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	817
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	818 /* Decrease the refcount */
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	819 CHECK_POSIX( pthread_mutex_lock(&(*session)->stlock) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	820 (session)->msg_cnt--; / was increased in fd_sess_new */
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	821 CHECK_POSIX( pthread_mutex_unlock(&(*session)->stlock) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	822
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	823 /* Done */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	824 return 0;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	825 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	826
291 2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	827 int fd_sess_ref_msg ( struct session * session )
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	828 {
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	829 TRACE_ENTRY("%p", session);
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	830 CHECK_PARAMS( VALIDATE_SI(session) );
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	831
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	832 /* Update the msg refcount */
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	833 CHECK_POSIX( pthread_mutex_lock(&session->stlock) );
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	834 session->msg_cnt++;
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	835 CHECK_POSIX( pthread_mutex_unlock(&session->stlock) );
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	836
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	837 return 0;
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	838 }
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	839
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	840 int fd_sess_reclaim_msg ( struct session ** session )
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	841 {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	842 int reclaim;
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	843 uint32_t hash;
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	844
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	845 TRACE_ENTRY("%p", session);
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	846 CHECK_PARAMS( session && VALIDATE_SI(*session) );
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	847
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	848 /* Lock the hash line to avoid possibility that session is freed while we are reclaiming */
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	849 hash = (*session)->hash;
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	850 CHECK_POSIX( pthread_mutex_lock( H_LOCK(hash)) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	851 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(hash) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	852
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	853 /* Update the msg refcount */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	854 CHECK_POSIX( pthread_mutex_lock(&(*session)->stlock) );
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	855 reclaim = (*session)->msg_cnt;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	856 (*session)->msg_cnt = reclaim - 1;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	857 CHECK_POSIX( pthread_mutex_unlock(&(*session)->stlock) );
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	858
924 877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	859 /* Ok, now unlock the hash line */
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	860 pthread_cleanup_pop( 0 );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	861 CHECK_POSIX( pthread_mutex_unlock( H_LOCK(hash) ) );
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	862
877592751fee Fix (tentative) for invalid handling of sessions fast creation/destruction as pointed by Yusuke Okura -- http://lists.freediameter.net/pipermail/help/2013-February/000584.html and http://lists.freediameter.net/pipermail/help/2013-February/000589.html -- Thank you very much Sebastien Decugis <sdecugis@freediameter.net> parents: 788 diff changeset	863 /* and reclaim if no message references the session anymore */
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	864 if (reclaim == 1) {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	865 CHECK_FCT(fd_sess_reclaim ( session ));
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	866 } else {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	867 *session = NULL;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	868 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	869 return 0;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	870 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	871
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	872
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	873
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	874 /* Dump functions */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	875 void fd_sess_dump(int level, struct session * session)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	876 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	877 struct fd_list * li;
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	878 char buf[30];
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	879 struct tm tm;
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	880
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	881 if (!TRACE_BOOL(level))
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	882 return;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	883
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	884 fd_log_debug("\t %*s -- Session @%p --", level, "", session);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	885 if (!VALIDATE_SI(session)) {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	886 fd_log_debug("\t %*s Invalid session object", level, "");
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	887 } else {
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	888
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	889 fd_log_debug("\t %*s sid '%s'(%zd), hash %x, msg %d, destroyed %d", level, "", session->sid, session->sidlen, session->hash, session->msg_cnt, session->is_destroyed);
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	890
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	891 strftime(buf, sizeof(buf), "%D,%T", localtime_r( &session->timeout.tv_sec , &tm ));
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	892 fd_log_debug("\t %*s timeout %s.%09ld", level, "", buf, session->timeout.tv_nsec);
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	893
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	894 CHECK_POSIX_DO( pthread_mutex_lock(&session->stlock), /* ignore */ );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	895 pthread_cleanup_push( fd_cleanup_mutex, &session->stlock );
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	896 for (li = session->states.next; li != &session->states; li = li->next) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	897 struct state * st = (struct state *)(li->o);
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	898 fd_log_debug("\t %*s handler %d registered data %p", level, "", st->hdl->id, st->state);
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	899 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	900 pthread_cleanup_pop(0);
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	901 CHECK_POSIX_DO( pthread_mutex_unlock(&session->stlock), /* ignore */ );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	902 }
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	903 fd_log_debug("\t %*s -- end of session @%p --", level, "", session);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	904 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	905
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	906 void fd_sess_dump_hdl(int level, struct session_handler * handler)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	907 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	908 if (!TRACE_BOOL(level))
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	909 return;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	910
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	911 fd_log_debug("\t %*s -- Handler @%p --", level, "", handler);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	912 if (!VALIDATE_SH(handler)) {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	913 fd_log_debug("\t %*s Invalid session handler object", level, "");
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	914 } else {
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	915 fd_log_debug("\t %*s id %d, cleanup %p, opaque %p", level, "", handler->id, handler->cleanup, handler->opaque);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	916 }
974 2091bf698fb1 Remove newlines from fd_log_debug, TRACE_DEBUG, TRACE_ERROR, and TRACE_DEBUG_ERROR Thomas Klausner <tk@giga.or.at> parents: 928 diff changeset	917 fd_log_debug("\t %*s -- end of handler @%p --", level, "", handler);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	918 }
778 003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	919
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	920 int fd_sess_getcount(uint32_t *cnt)
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	921 {
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	922 CHECK_PARAMS(cnt);
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	923 CHECK_POSIX( pthread_mutex_lock( &exp_lock ) );
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	924 *cnt = sess_cnt;
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	925 CHECK_POSIX( pthread_mutex_unlock( &exp_lock ) );
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	926 return 0;
003df4a9ade2 Added two new interfaces on Zach requests http://lists.freediameter.net/pipermail/help/2012-January/000312.html and http://lists.freediameter.net/pipermail/help/2012-January/000311.html Sebastien Decugis <sdecugis@nict.go.jp> parents: 740 diff changeset	927 }

Mercurial > hg > freeDiameter

annotate libfdproto/sessions.c @ 1027:0117a7746b21