--- libaitsess/src/aitsess.c	2012/02/10 16:54:37	1.3.2.4
+++ libaitsess/src/aitsess.c	2012/02/10 22:46:41	1.3.2.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitsess.c,v 1.3.2.4 2012/02/10 16:54:37 misho Exp $
+* $Id: aitsess.c,v 1.3.2.6 2012/02/10 22:46:41 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -116,8 +116,9 @@ sess_initSession(int id, const char *csFName, ait_sess
 		}
 	}
 	memset(*Sess, 0, sizeof(ait_sess_t));
+	strlcpy((*Sess)->name, csFName, sizeof (*Sess)->name);
 
-	h = open(csFName, O_WRONLY | O_CREAT | O_EXCL, MEM_MODE);
+	h = open((*Sess)->name, O_WRONLY | O_CREAT | O_EXCL, MEM_MODE);
 	if (h == -1) {
 		if (errno != EEXIST) {
 			LOGERR;
@@ -125,7 +126,7 @@ sess_initSession(int id, const char *csFName, ait_sess
 			return -1;
 		}
 		/* If key file exist, session already connected */
-		h = open(csFName, O_RDONLY);
+		h = open((*Sess)->name, O_RDONLY);
 		if (h == -1) {
 			LOGERR;
 			free(*Sess);
@@ -215,12 +216,12 @@ sess_initSession(int id, const char *csFName, ait_sess
 /*
  * sess_freeSession() Free allocated memory for session item and delete session file if present name
  *
- * @csFName = Session filename for delete, if NULL nothing delete
  * @Sess = Session item
+ * @delFile = !=0 delete session file or =0 keep session
  * return: none
 */
 void
-sess_freeSession(const char *csFName, ait_sess_t ** __restrict Sess)
+sess_freeSession(ait_sess_t ** __restrict Sess, int delFile)
 {
 	if (!Sess)
 		return;
@@ -228,8 +229,8 @@ sess_freeSession(const char *csFName, ait_sess_t ** __
 	memset(&(*Sess)->sess, 0, sizeof (*Sess)->sess);
 
 	(*Sess)->type = SHARED_UNKNOWN;
-	if (csFName)
-		unlink(csFName);
+	if (delFile && *(*Sess)->name)
+		unlink((*Sess)->name);
 	if (*Sess)
 		free(*Sess);
 	*Sess = NULL;
@@ -239,7 +240,6 @@ sess_freeSession(const char *csFName, ait_sess_t ** __
 /*
  * map_createSession() MMAP Created session and allocated resources
  *
- * @csFName = Session name for identified
  * @nSeed = Seed for securing key, if =-1 must add ready for use key
  * @nSize = Allocated shared memory size in bytes
  * @Sess = Session item
@@ -247,17 +247,17 @@ sess_freeSession(const char *csFName, ait_sess_t ** __
  * return: 0 Ok successful, -1 error: not allocated resources
 */
 int
-map_createSession(const char *csFName, int nSeed, long nSize, ait_sess_t * __restrict Sess, ...)
+map_createSession(int nSeed, long nSize, ait_sess_t * __restrict Sess, ...)
 {
 	char szSName[2][FILENAME_MAX];
 	va_list lst;
 
-	if (!Sess)
+	if (!Sess || !*Sess->name)
 		return -1;
 
 	if (nSeed != -1) {
 		/* genkey */
-		Sess->key = ftok(csFName, nSeed);
+		Sess->key = ftok(Sess->name, nSeed);
 		if (Sess->key == -1) {
 			LOGERR;
 			return -1;
@@ -272,13 +272,13 @@ map_createSession(const char *csFName, int nSeed, long
 	/* build semaphore & shared memory name */
 	memset(szSName, 0, sizeof szSName);
 	snprintf(szSName[0], MAX_SEMNAME, "/%X.ANS", (u_int) Sess->key);
-	snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", csFName, (u_int) Sess->key);
+	snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", Sess->name, (u_int) Sess->key);
 
 	/* create semaphore & add 1 */
 	Sess->id.sid = sem_open(szSName[0], O_CREAT, MEM_MODE);
 	if (Sess->id.sid == SEM_FAILED) {
 		LOGERR;
-		map_destroySession(csFName, Sess);
+		map_destroySession(Sess);
 		return -1;
 	}
 	/* if is new shared memory session, init sempahore with 1 */
@@ -289,14 +289,14 @@ map_createSession(const char *csFName, int nSeed, long
 	Sess->mem.fd = open(szSName[1], O_RDWR | O_CREAT, MEM_MODE);
 	if (Sess->mem.fd == -1) {
 		LOGERR;
-		map_destroySession(csFName, Sess);
+		map_destroySession(Sess);
 		return -1;
 	}
 	/* if is new shared memory session, fill file with zeros */
 	if (!Sess->zcpy) {
 		if (lseek(Sess->mem.fd, nSize - 1, SEEK_SET) == -1) {
 			LOGERR;
-			map_destroySession(csFName, Sess);
+			map_destroySession(Sess);
 			return -1;
 		} else
 			write(Sess->mem.fd, "", 1);
@@ -310,12 +310,11 @@ map_createSession(const char *csFName, int nSeed, long
 /*
  * map_destroySession() MMAP free shared resources
  *
- * @csFName = Session name for delete
  * @Sess = Session item
  * return: none
 */
 void
-map_destroySession(const char *csFName, ait_sess_t * __restrict Sess)
+map_destroySession(ait_sess_t * __restrict Sess)
 {
 	char szSName[2][FILENAME_MAX];
 
@@ -324,7 +323,7 @@ map_destroySession(const char *csFName, ait_sess_t * _
 
 	memset(szSName, 0, sizeof szSName);
 	snprintf(szSName[0], MAX_SEMNAME, "/%X.ANS", (u_int) Sess->key);
-	snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", csFName, (u_int) Sess->key);
+	snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", Sess->name, (u_int) Sess->key);
 
 	if (Sess->id.sid != SEM_FAILED) {
 		sem_close(Sess->id.sid);
@@ -341,7 +340,6 @@ map_destroySession(const char *csFName, ait_sess_t * _
 /*
  * ipc_createSession() IPC Created session and allocated resources
  *
- * @csFName = Session name for identified
  * @nSeed = Seed for securing key, if =-1 must add ready for use key
  * @nSize = Allocated shared memory size in bytes
  * @Sess = Session item
@@ -349,17 +347,17 @@ map_destroySession(const char *csFName, ait_sess_t * _
  * return: 0 Ok successful, -1 error: not allocated resources
  */
 int
-ipc_createSession(const char *csFName, int nSeed, long nSize, ait_sess_t * __restrict Sess, ...)
+ipc_createSession(int nSeed, long nSize, ait_sess_t * __restrict Sess, ...)
 {
 	union semun sems;
 	va_list lst;
 
-	if (!Sess)
+	if (!Sess || !*Sess->name)
 		return -1;
 
 	if (nSeed != -1) {
 		/* genkey */
-		Sess->key = ftok(csFName, nSeed);
+		Sess->key = ftok(Sess->name, nSeed);
 		if (Sess->key == -1) {
 			LOGERR;
 			return -1;
@@ -375,7 +373,7 @@ ipc_createSession(const char *csFName, int nSeed, long
 	Sess->id.semid = semget(Sess->key, 1, MEM_MODE | IPC_CREAT);
 	if (Sess->id.semid == -1) {
 		LOGERR;
-		ipc_destroySession(csFName, Sess);
+		ipc_destroySession(Sess);
 		return -1;
 	}
 	/* if is new shared memory session, init sempahore with 1 */
@@ -383,7 +381,7 @@ ipc_createSession(const char *csFName, int nSeed, long
 		sems.val = 1;
 		if (semctl(Sess->id.semid, 0, SETVAL, sems) == -1) {
 			LOGERR;
-			ipc_destroySession(csFName, Sess);
+			ipc_destroySession(Sess);
 			return -1;
 		}
 	}
@@ -392,7 +390,7 @@ ipc_createSession(const char *csFName, int nSeed, long
 	Sess->mem.shmid = shmget(Sess->key, nSize, MEM_MODE | IPC_CREAT);
 	if (Sess->mem.shmid == -1) {
 		LOGERR;
-		ipc_destroySession(csFName, Sess);
+		ipc_destroySession(Sess);
 		return -1;
 	} else
 		Sess->eom = nSize;
@@ -403,12 +401,11 @@ ipc_createSession(const char *csFName, int nSeed, long
 /*
  * ipc_destroySession() IPC free shared resources
  *
- * @csFName = Session name for delete
  * @Sess = Session item
  * return: none
  */
 void
-ipc_destroySession(const char *csFName, ait_sess_t * __restrict Sess)
+ipc_destroySession(ait_sess_t * __restrict Sess)
 {
 	union semun sems;
 	struct shmid_ds ds;