freeDiameter: libfreeDiameter/sessions.c annotate

annotate libfreeDiameter/sessions.c @ 556:8c9028ec02bf

Preparing for bugfix release 1.0.1

author	Sebastien Decugis <sdecugis@nict.go.jp>
date	Wed, 15 Sep 2010 17:27:07 +0900
parents	9a8b3178a7a7
children	85ab58cc427c

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) *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	3 * Author: Sebastien Decugis <sdecugis@nict.go.jp> *
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	4 * *
258 5df55136361b Updated copyright information Sebastien Decugis <sdecugis@nict.go.jp> parents: 235 diff changeset	5 * Copyright (c) 2010, 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
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	41 #include "libfD.h"
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 */
340 81821e9f6988 Fix issue on session cleanup callback parameters -- thanks Souheil for reporting. Sebastien Decugis <sdecugis@nict.go.jp> parents: 293 diff changeset	71 void (cleanup)(session_state , char ); / The cleanup function to be called for cleaning a state */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	72 };
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 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	75 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	76
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 /* 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	79 struct state {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	80 int eyec; /* Must be SD_EYEC */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	81 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	82 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	83 union {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	84 struct session_handler hdl; / The handler for which this state was registered */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	85 char sid; / For deleted state, the sid of the session it belong to */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	86 };
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 /* 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	90 struct session {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	91 int eyec; /* Eyecatcher, SI_EYEC */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	92
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	93 char * sid; /* The \0-terminated Session-Id */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	94 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	95 struct fd_list chain_h;/* chaining in the hash table of sessions. */
556 8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	96 int rc; /* Reference counter on this object, freed only when it reaches 0. */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	97
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	98 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	99 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	100
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	101 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	102 struct fd_list states; /* Sentinel for the list of states of this session. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	103 };
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	104
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	105 /* 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	106 static struct {
556 8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	107 struct fd_list sentinel; /* sentinel element for this sublist */
8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	108 pthread_rwlock_t rwlock; /* the rwlock for this sublist */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	109 } sess_hash [ 1 << SESS_HASH_SIZE ] ;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	110 #define H_MASK( __hash ) ((__hash) & (( 1 << SESS_HASH_SIZE ) - 1))
556 8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	111 #define H_LIST( _hash ) (&(sess_hash[H_MASK(_hash)].sentinel))
8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	112 #define H_RWLOCK( _hash ) (&(sess_hash[H_MASK(_hash)].rwlock ))
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	113
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	114 /* 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	115 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	116 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	117 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	118
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	119 /* Expiring sessions management */
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	120 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	121 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	122 static pthread_cond_t exp_cond = PTHREAD_COND_INITIALIZER; /* condvar used by the expiry mecahinsm. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	123 static pthread_t exp_thr; /* The expiry thread that handles cleanup of expired sessions */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	124
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	125 /* 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	126 * hash lock > state lock > expiry lock
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	127 * 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	128 * As well, the hash lock cannot be taken while holding a state lock.
556 8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	129 * Never try to take another lock while holding the expiry one.
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	130 */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	131
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	132 /********************************************************************************************************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	133
7 e5af94b04946 Added dispatch module and tests Sebastien Decugis <sdecugis@nict.go.jp> parents: 6 diff changeset	134 /* Initialize a session object. It is not linked now. sid must be already malloc'ed. */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	135 static struct session * new_session(char * sid, size_t sidlen)
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 struct session * sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	138
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	139 TRACE_ENTRY("%p %d", sid, sidlen);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	140 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	141
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	142 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	143 memset(sess, 0, sizeof(struct session));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	144
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	145 sess->eyec = SI_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	146
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	147 sess->sid = sid;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	148 sess->hash = fd_hash(sid, sidlen);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	149 fd_list_init(&sess->chain_h, sess);
556 8c9028ec02bf Preparing for bugfix release 1.0.1 Sebastien Decugis <sdecugis@nict.go.jp> parents: 453 diff changeset	150 sess->rc = 0;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	151
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	152 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	153 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	154 fd_list_init(&sess->expire, 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_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	157 fd_list_init(&sess->states, sess);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	158
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	159 return sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	160 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	161
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	162 /* The expiry thread */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	163 static void * exp_fct(void * arg)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	164 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	165 fd_log_threadname ( "Session/expire" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	166 TRACE_ENTRY( "" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	167
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	168
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	169 do {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	170 struct timespec now;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	171 struct session * first;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	172
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	173 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	174 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	175 again:
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	176 /* 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	177 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	178 /* Just wait for a change or cancelation */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	179 CHECK_POSIX_DO( pthread_cond_wait( &exp_cond, &exp_lock ), break );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	180 /* Restart the loop on wakeup */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	181 goto again;
3 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 /* 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	185 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	186 ASSERT( VALIDATE_SI(first) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	187
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	188 /* Get the current time */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	189 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	190
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	191 /* 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	192 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	193
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	194 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	195 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	196 /* on other error, */ break );
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 /* on wakeup, loop */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	199 goto again;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	200 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	201
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	202 /* 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	203 pthread_cleanup_pop( 0 );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	204 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	205
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	206 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	207
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	208 } while (1);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	209
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	210 TRACE_DEBUG(INFO, "An error occurred in session module! Expiry thread is terminating...");
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	211 ASSERT(0);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	212 return NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	213 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	214
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 /********************************************************************************************************/
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	218
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	219 /* Initialize the session module */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	220 int fd_sess_init(void)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	221 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	222 int i;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	223
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	224 TRACE_ENTRY( "" );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	225
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	226 /* Initialize the global counters */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	227 sid_h = (uint32_t) time(NULL);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	228 sid_l = 0;
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 /* Initialize the hash table */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	231 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	232 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	233 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	234 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	235
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	236 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	237 }
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	238
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	239 /* 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	240 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	241 {
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	242 /* Start session garbage collector (expiry) */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	243 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	244
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	245 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	246 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	247
235 8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	248 /* Terminate */
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	249 void fd_sess_fini(void)
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	250 {
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	251 TRACE_ENTRY("");
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	252 CHECK_FCT_DO( fd_thr_term(&exp_thr), /* continue */ );
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	253 return;
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	254 }
8773740401a5 Centralized signal handlers management in the library Sebastien Decugis <sdecugis@nict.go.jp> parents: 203 diff changeset	255
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	256 /* Create a new handler */
340 81821e9f6988 Fix issue on session cleanup callback parameters -- thanks Souheil for reporting. Sebastien Decugis <sdecugis@nict.go.jp> parents: 293 diff changeset	257 int fd_sess_handler_create_internal ( struct session_handler ** handler, void (cleanup)(session_state state, char * sid) )
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	258 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	259 struct session_handler *new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	260
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	261 TRACE_ENTRY("%p %p", handler, cleanup);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	262
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	263 CHECK_PARAMS( handler && cleanup );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	264
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	265 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	266 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	267
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	268 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	269 new->id = ++hdl_id;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	270 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	271
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	272 new->eyec = SH_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	273 new->cleanup = cleanup;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	274
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	275 *handler = new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	276 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	277 }
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 /* 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	280 * Note that it's better to call this function after all sessions have been deleted... */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	281 int fd_sess_handler_destroy ( struct session_handler ** handler )
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 struct session_handler * del;
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	284 /* 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	285 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	286 int i;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	287
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	288 TRACE_ENTRY("%p", handler);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	289 CHECK_PARAMS( handler && VALIDATE_SH(*handler) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	290
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	291 del = *handler;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	292 *handler = NULL;
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 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	295
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	296 /* 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	297 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	298 struct fd_list * li_si;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	299 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	300
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	301 for (li_si = sess_hash[i].sentinel.next; li_si != &sess_hash[i].sentinel; li_si = li_si->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	302 struct fd_list * li_st;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	303 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	304 CHECK_POSIX( pthread_mutex_lock(&sess->stlock) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	305 for (li_st = sess->states.next; li_st != &sess->states; li_st = li_st->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	306 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	307 /* The list is ordered */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	308 if (st->hdl->id < del->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	309 continue;
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	310 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	311 /* 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	312 fd_list_unlink(&st->chain);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	313 CHECK_MALLOC( st->sid = strdup(sess->sid) );
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	314 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	315 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	316 break;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	317 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	318 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	319 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	320 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	321 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	322
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	323 /* 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	324 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	325 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	326 TRACE_DEBUG(FULL, "Calling cleanup handler for session '%s' and data %p", st->sid, st->state);
340 81821e9f6988 Fix issue on session cleanup callback parameters -- thanks Souheil for reporting. Sebastien Decugis <sdecugis@nict.go.jp> parents: 293 diff changeset	327 (*del->cleanup)(st->state, st->sid);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	328 free(st->sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	329 fd_list_unlink(&st->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	330 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	331 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	332
452 2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	333 /* Free the handler */
2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	334 free(del);
2b36eccbe426 Free unfreed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 403 diff changeset	335
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	336 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	337 }
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
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 /* Create a new session object with the default timeout value, and link it */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	342 int fd_sess_new ( struct session ** session, char * diamId, char * opt, size_t optlen )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	343 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	344 char * sid = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	345 size_t sidlen;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	346 struct session * sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	347 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	348 int found = 0;
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 TRACE_ENTRY("%p %p %p %d", session, diamId, opt, optlen);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	351 CHECK_PARAMS( session && (diamId \|\| opt) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	352
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	353 /* Ok, first create the identifier for the string */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	354 if (diamId == NULL) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	355 /* opt is the full string */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	356 if (optlen) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	357 CHECK_MALLOC( sid = malloc(optlen + 1) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	358 strncpy(sid, opt, optlen);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	359 sid[optlen] = '\0';
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	360 sidlen = optlen;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	361 } else {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	362 CHECK_MALLOC( sid = strdup(opt) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	363 sidlen = strlen(sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	364 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	365 } else {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	366 uint32_t sid_h_cpy;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	367 uint32_t sid_l_cpy;
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	368 /* "<diamId>;<high32>;<low32>[;opt]" */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	369 sidlen = strlen(diamId);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	370 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	371 if (opt)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	372 sidlen += 1 + (optlen ?: strlen(opt)) ;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	373 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	374 CHECK_MALLOC( sid = malloc(sidlen) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	375
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	376 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	377 if ( ++sid_l == 0 ) /* overflow */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	378 ++sid_h;
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	379 sid_h_cpy = sid_h;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	380 sid_l_cpy = sid_l;
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	381 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	382
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	383 if (opt) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	384 if (optlen)
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	385 sidlen = snprintf(sid, sidlen, "%s;%u;%u;%.*s", 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	386 else
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	387 sidlen = snprintf(sid, sidlen, "%s;%u;%u;%s", diamId, sid_h_cpy, sid_l_cpy, opt);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	388 } else {
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	389 sidlen = snprintf(sid, sidlen, "%s;%u;%u", 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	390 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	391 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	392
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	393 /* Initialize the session object now, to spend less time inside locked section later.
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	394 * Cons: we malloc then free if there is already a session with same SID; we could malloc later to avoid this. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	395 CHECK_MALLOC( sess = new_session(sid, sidlen) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	396
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	397 /* Now find the place to add this object in the hash table. */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	398 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	399 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(sess->hash) );
536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	400
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	401 for (li = H_LIST(sess->hash)->next; li != H_LIST(sess->hash); li = li->next) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	402 int cmp;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	403 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	404
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	405 /* The list is ordered by hash and sid (in case of collisions) */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	406 if (s->hash < sess->hash)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	407 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	408 if (s->hash > sess->hash)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	409 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	410
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	411 cmp = strcasecmp(s->sid, sess->sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	412 if (cmp < 0)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	413 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	414 if (cmp > 0)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	415 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	416
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	417 /* 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	418 found = 1;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	419 *session = s;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	420 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	421 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	422
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	423 /* If the session did not exist, we can link it in global tables */
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	424 if (!found) {
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	425 fd_list_insert_before(li, &sess->chain_h); /* hash table */
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 /* We must also insert in the expiry list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	428 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	429 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	430
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	431 /* Find the position in that list. We take it in reverse order */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	432 for (li = exp_sentinel.prev; li != &exp_sentinel; li = li->prev) {
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 if (TS_IS_INFERIOR( &s->timeout, &sess->timeout ) )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	435 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	436 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	437 fd_list_insert_after( li, &sess->expire );
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	438
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	439 /* We added a new expiring element, we must signal */
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	440 if (li == &exp_sentinel) {
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	441 CHECK_POSIX( pthread_cond_signal(&exp_cond) );
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	442 }
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	443
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	444 #if 0
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	445 if (TRACE_BOOL(ANNOYING)) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	446 TRACE_DEBUG(FULL, "-- Updated session expiry list --");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	447 for (li = exp_sentinel.next; li != &exp_sentinel; li = li->next) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	448 struct session * s = (struct session *)(li->o);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	449 fd_sess_dump(FULL, s);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	450 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	451 TRACE_DEBUG(FULL, "-- end of expiry list --");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	452 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	453 #endif
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	454
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	455 /* We're done */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	456 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	457 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	458 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	459
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	460 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	461 CHECK_POSIX( pthread_mutex_unlock( H_LOCK(sess->hash) ) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	462
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	463 /* If a session already existed, we must destroy the new element */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	464 if (found) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	465 CHECK_FCT( fd_sess_destroy( &sess ) ); /* we could avoid locking this time for optimization */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	466 return EALREADY;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	467 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	468
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	469 *session = sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	470 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	471 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	472
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	473 /* Find or create a session */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	474 int fd_sess_fromsid ( char * sid, size_t len, struct session ** session, int * new)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	475 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	476 int ret;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	477
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	478 TRACE_ENTRY("%p %d %p %p", sid, len, session, new);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	479 CHECK_PARAMS( sid && session );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	480
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	481 /* All the work is done in sess_new */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	482 ret = fd_sess_new ( session, NULL, sid, len );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	483 switch (ret) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	484 case 0:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	485 case EALREADY:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	486 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	487
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	488 default:
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	489 CHECK_FCT(ret);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	490 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	491
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	492 if (new)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	493 *new = ret ? 0 : 1;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	494
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	495 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	496 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	497
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	498 /* Get the sid of a session */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	499 int fd_sess_getsid ( struct session * session, char ** sid )
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	500 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	501 TRACE_ENTRY("%p %p", session, sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	502
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	503 CHECK_PARAMS( VALIDATE_SI(session) && sid );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	504
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	505 *sid = session->sid;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	506
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	507 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	508 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	509
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	510 /* 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	511 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	512 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	513 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	514
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	515 TRACE_ENTRY("%p %p", session, timeout);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	516 CHECK_PARAMS( VALIDATE_SI(session) && timeout );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	517
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	518 /* 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	519 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	520 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	521
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	522 /* Update the timeout */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	523 fd_list_unlink(&session->expire);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	524 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	525
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	526 /* 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	527 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	528 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	529
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	530 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	531 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	532
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	533 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	534 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	535 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	536
14 14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	537 /* 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	538 if (session->expire.prev == &exp_sentinel) {
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	539 CHECK_POSIX( pthread_cond_signal(&exp_cond) );
14cf6daf716d Some progress on peers module Sebastien Decugis <sdecugis@nict.go.jp> parents: 7 diff changeset	540 }
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	541
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	542 #if 0
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	543 if (TRACE_BOOL(ANNOYING)) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	544 TRACE_DEBUG(FULL, "-- Updated session expiry list --");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	545 for (li = exp_sentinel.next; li != &exp_sentinel; li = li->next) {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	546 struct session * s = (struct session *)(li->o);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	547 fd_sess_dump(FULL, s);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	548 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	549 TRACE_DEBUG(FULL, "-- end of expiry list --");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	550 }
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	551 #endif
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	552
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	553 /* We're done */
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	554 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	555 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	556
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	557 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	558 }
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 /* Destroy a session immediatly */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	561 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	562 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	563 struct session * sess;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	564
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	565 TRACE_ENTRY("%p", session);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	566 CHECK_PARAMS( session && VALIDATE_SI(*session) );
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 sess = *session;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	569 *session = NULL;
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 /* Unlink and invalidate */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	572 CHECK_FCT( 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	573 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(sess->hash) );
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	574 CHECK_FCT( pthread_mutex_lock( &exp_lock ) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	575 fd_list_unlink( &sess->chain_h );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	576 fd_list_unlink( &sess->expire ); /* no need to signal the condition here */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	577 sess->eyec = 0xdead;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	578 CHECK_FCT( pthread_mutex_unlock( &exp_lock ) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	579 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	580 CHECK_FCT( pthread_mutex_unlock( H_LOCK(sess->hash) ) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	581
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	582 /* Now destroy all states associated -- we don't take the lock since nobody can access this session anymore (in theory) */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	583 while (!FD_IS_LIST_EMPTY(&sess->states)) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	584 struct state * st = (struct state *)(sess->states.next->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	585 fd_list_unlink(&st->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	586 TRACE_DEBUG(FULL, "Calling handler %p cleanup for state registered with session '%s'", st->hdl, sess->sid);
340 81821e9f6988 Fix issue on session cleanup callback parameters -- thanks Souheil for reporting. Sebastien Decugis <sdecugis@nict.go.jp> parents: 293 diff changeset	587 (*st->hdl->cleanup)(st->state, sess->sid);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	588 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	589 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	590
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	591 /* Finally, destroy the session itself */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	592 free(sess->sid);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	593 free(sess);
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 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	596 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	597
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	598 /* 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	599 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	600 {
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	601 struct session * sess;
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	602 uint32_t 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	603
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	604 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	605 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	606
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	607 sess = *session;
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	608 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	609 *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	610
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	611 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	612 pthread_cleanup_push( fd_cleanup_mutex, H_LOCK(sess->hash) );
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	613 CHECK_POSIX( pthread_mutex_lock( &exp_lock ) );
6 b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	614 if (FD_IS_LIST_EMPTY(&sess->states)) {
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	615 fd_list_unlink( &sess->chain_h );
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	616 fd_list_unlink( &sess->expire );
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	617 sess->eyec = 0xdead;
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	618 free(sess->sid);
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	619 free(sess);
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	620 }
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	621 CHECK_POSIX( pthread_mutex_unlock( &exp_lock ) );
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	622 pthread_cleanup_pop(0);
293 ec67c5096eeb Fix small issue with access to freed memory Sebastien Decugis <sdecugis@nict.go.jp> parents: 291 diff changeset	623 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	624
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	625 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	626 }
b0d377c79d80 Progress on dispatch API spec; added fd_sess_reclaim function and test Sebastien Decugis <sdecugis@nict.go.jp> parents: 5 diff changeset	627
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	628 /* 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	629 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	630 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	631 struct state *new;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	632 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	633 int already = 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	634
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	635 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	636 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	637
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	638 /* Lock the session state list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	639 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	640 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	641
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	642 /* Create the new state object */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	643 CHECK_MALLOC(new = malloc(sizeof(struct state)) );
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	644 memset(new, 0, sizeof(struct state));
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	645
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	646 new->eyec = SD_EYEC;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	647 new->state= *state;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	648 fd_list_init(&new->chain, new);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	649 new->hdl = handler;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	650
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	651 /* 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	652 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	653 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	654 /* 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	655 if (st->hdl->id < handler->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	656 continue;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	657
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	658 if (st->hdl->id == handler->id) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	659 TRACE_DEBUG(INFO, "A state was already stored for session '%s' and handler '%p', at location %p", session->sid, st->hdl, st->state);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	660 already = 1;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	661 }
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 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	664 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	665
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	666 if (!already) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	667 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	668 *state = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	669 } else {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	670 free(new);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	671 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	672
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	673 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	674 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	675
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	676 return already ? EALREADY : 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	677 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	678
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	679 /* 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	680 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	681 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	682 struct fd_list * li;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	683 struct state * st = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	684
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	685 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	686 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	687
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	688 *state = NULL;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	689
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	690 /* Lock the session state list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	691 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	692 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	693
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	694 /* find the state in the list */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	695 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	696 st = (struct state *)(li->o);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	697
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	698 /* 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	699 if (st->hdl->id > handler->id)
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	700 break;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	701 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	702
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	703 /* If we found the state */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	704 if (st && (st->hdl == handler)) {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	705 fd_list_unlink(&st->chain);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	706 *state = st->state;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	707 free(st);
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	708 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	709
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	710 pthread_cleanup_pop(0);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	711 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	712
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	713 return 0;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	714 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	715
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	716 /* For the messages module */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	717 int fd_sess_fromsid_msg ( unsigned char * sid, size_t len, struct session ** session, int * new)
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	718 {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	719 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	720 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	721
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	722 /* Get the session object */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	723 CHECK_FCT( fd_sess_fromsid ( (char *) sid, len, session, new) );
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	724
291 2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	725 /* Increase count */
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	726 CHECK_FCT( fd_sess_ref_msg ( *session ) );
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	727
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	728 /* Done */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	729 return 0;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	730 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	731
291 2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	732 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	733 {
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	734 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	735 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	736
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	737 /* 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	738 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	739 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	740 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	741
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	742 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	743 }
2d3a799ad29c Cache the session pointer in answers when it was present in queries Sebastien Decugis <sdecugis@nict.go.jp> parents: 258 diff changeset	744
85 e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	745 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	746 {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	747 int reclaim;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	748
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	749 TRACE_ENTRY("%p", session);
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	750 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	751
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	752 /* Update the msg refcount */
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	753 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	754 reclaim = (*session)->msg_cnt;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	755 (*session)->msg_cnt = reclaim - 1;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	756 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	757
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	758 if (reclaim == 1) {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	759 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	760 } else {
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	761 *session = NULL;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	762 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	763 return 0;
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	764 }
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	765
e5fcd672caff Added new function to retrieve messages sessions easily Sebastien Decugis <sdecugis@nict.go.jp> parents: 14 diff changeset	766
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	767
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	768 /* Dump functions */
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	769 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	770 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	771 struct fd_list * li;
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	772 char buf[30];
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	773 struct tm tm;
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	774
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	775 if (!TRACE_BOOL(level))
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	776 return;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	777
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	778 fd_log_debug("\t %*s -- Session @%p --\n", level, "", session);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	779 if (!VALIDATE_SI(session)) {
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	780 fd_log_debug("\t %*s Invalid session object\n", level, "");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	781 } else {
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	782
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	783 fd_log_debug("\t %*s sid '%s', hash %x\n", level, "", session->sid, session->hash);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	784
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	785 strftime(buf, sizeof(buf), "%D,%T", localtime_r( &session->timeout.tv_sec , &tm ));
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	786 fd_log_debug("\t %*s timeout %s.%09ld\n", level, "", buf, session->timeout.tv_nsec);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	787
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	788 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	789 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	790 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	791 struct state * st = (struct state *)(li->o);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	792 fd_log_debug("\t %*s handler %d registered data %p\n", level, "", st->hdl->id, st->state);
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	793 }
203 536b1dde8761 Some cleanups in the cnxctx module Sebastien Decugis <sdecugis@nict.go.jp> parents: 136 diff changeset	794 pthread_cleanup_pop(0);
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	795 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	796 }
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	797 fd_log_debug("\t %*s -- end of session @%p --\n", level, "", session);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	798 }
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	799
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	800 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	801 {
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	802 if (!TRACE_BOOL(level))
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	803 return;
ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	804
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	805 fd_log_debug("\t %*s -- Handler @%p --\n", level, "", handler);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	806 if (!VALIDATE_SH(handler)) {
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	807 fd_log_debug("\t %*s Invalid session handler object\n", level, "");
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	808 } else {
c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	809 fd_log_debug("\t %*s id %d, cleanup %p\n", level, "", handler->id, handler->cleanup);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	810 }
5 c2d2729e3603 Completed new session module tests; some bugs fixed Sebastien Decugis <sdecugis@nict.go.jp> parents: 4 diff changeset	811 fd_log_debug("\t %*s -- end of handler @%p --\n", level, "", handler);
3 ef303f1078ab Progress; added session module; testsess to be completed Sebastien Decugis <sdecugis@nict.go.jp> parents: diff changeset	812 }

Mercurial > hg > freeDiameter

annotate libfreeDiameter/sessions.c @ 556:8c9028ec02bf