--- libaitsess/src/aitsess.c 2012/02/10 17:14:21 1.3.2.5 +++ libaitsess/src/aitsess.c 2012/02/28 13:00:24 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitsess.c,v 1.3.2.5 2012/02/10 17:14:21 misho Exp $ +* $Id: aitsess.c,v 1.5 2012/02/28 13:00:24 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -142,25 +142,25 @@ sess_initSession(int id, const char *csFName, ait_sess if (!strncmp(szStr, "IPC@", 4) && id == SHARED_IPC) { ret = 1; - (*Sess)->sess.create = ipc_createSession; - (*Sess)->sess.destroy = ipc_destroySession; - (*Sess)->sess.attach = ipc_attachSession; - (*Sess)->sess.detach = ipc_detachSession; - (*Sess)->sess.notSem = ipc_notSemaphore; - (*Sess)->sess.isSemOK = ipc_isSemaphoreOK; - (*Sess)->sess.incSem = ipc_incSemaphore; - (*Sess)->sess.decSem = ipc_decSemaphore; + (*Sess)->sess.create = (int (*)(int, long, void*, ...)) ipc_createSession; + (*Sess)->sess.destroy = (void (*)(void*)) ipc_destroySession; + (*Sess)->sess.attach = (void* (*)(void*, void*)) ipc_attachSession; + (*Sess)->sess.detach = (void (*)(void*)) ipc_detachSession; + (*Sess)->sess.notSem = (void (*)(void*)) ipc_notSemaphore; + (*Sess)->sess.isSemOK = (int (*)(void*)) ipc_isSemaphoreOK; + (*Sess)->sess.incSem = (int (*)(void*)) ipc_incSemaphore; + (*Sess)->sess.decSem = (int (*)(void*)) ipc_decSemaphore; } else if (!strncmp(szStr, "MAP@", 4) && id == SHARED_MAP) { ret = 1; - (*Sess)->sess.create = map_createSession; - (*Sess)->sess.destroy = map_destroySession; - (*Sess)->sess.attach = map_attachSession; - (*Sess)->sess.detach = map_detachSession; - (*Sess)->sess.notSem = map_notSemaphore; - (*Sess)->sess.isSemOK = map_isSemaphoreOK; - (*Sess)->sess.incSem = map_incSemaphore; - (*Sess)->sess.decSem = map_decSemaphore; + (*Sess)->sess.create = (int (*)(int, long, void*, ...)) map_createSession; + (*Sess)->sess.destroy = (void (*)(void*)) map_destroySession; + (*Sess)->sess.attach = (void* (*)(void*, void*)) map_attachSession; + (*Sess)->sess.detach = (void (*)(void*)) map_detachSession; + (*Sess)->sess.notSem = (void (*)(void*)) map_notSemaphore; + (*Sess)->sess.isSemOK = (int (*)(void*)) map_isSemaphoreOK; + (*Sess)->sess.incSem = (int (*)(void*)) map_incSemaphore; + (*Sess)->sess.decSem = (int (*)(void*)) map_decSemaphore; } else { sess_SetErr(EPROTONOSUPPORT, "Session type not supported or wrong session type"); @@ -174,25 +174,25 @@ sess_initSession(int id, const char *csFName, ait_sess if (id == SHARED_IPC) { strlcpy(szStr, "IPC@", sizeof szStr); - (*Sess)->sess.create = ipc_createSession; - (*Sess)->sess.destroy = ipc_destroySession; - (*Sess)->sess.attach = ipc_attachSession; - (*Sess)->sess.detach = ipc_detachSession; - (*Sess)->sess.notSem = ipc_notSemaphore; - (*Sess)->sess.isSemOK = ipc_isSemaphoreOK; - (*Sess)->sess.incSem = ipc_incSemaphore; - (*Sess)->sess.decSem = ipc_decSemaphore; + (*Sess)->sess.create = (int (*)(int, long, void*, ...)) ipc_createSession; + (*Sess)->sess.destroy = (void (*)(void*)) ipc_destroySession; + (*Sess)->sess.attach = (void* (*)(void*, void*)) ipc_attachSession; + (*Sess)->sess.detach = (void (*)(void*)) ipc_detachSession; + (*Sess)->sess.notSem = (void (*)(void*)) ipc_notSemaphore; + (*Sess)->sess.isSemOK = (int (*)(void*)) ipc_isSemaphoreOK; + (*Sess)->sess.incSem = (int (*)(void*)) ipc_incSemaphore; + (*Sess)->sess.decSem = (int (*)(void*)) ipc_decSemaphore; } else if (id == SHARED_MAP) { strlcpy(szStr, "MAP@", sizeof szStr); - (*Sess)->sess.create = map_createSession; - (*Sess)->sess.destroy = map_destroySession; - (*Sess)->sess.attach = map_attachSession; - (*Sess)->sess.detach = map_detachSession; - (*Sess)->sess.notSem = map_notSemaphore; - (*Sess)->sess.isSemOK = map_isSemaphoreOK; - (*Sess)->sess.incSem = map_incSemaphore; - (*Sess)->sess.decSem = map_decSemaphore; + (*Sess)->sess.create = (int (*)(int, long, void*, ...)) map_createSession; + (*Sess)->sess.destroy = (void (*)(void*)) map_destroySession; + (*Sess)->sess.attach = (void* (*)(void*, void*)) map_attachSession; + (*Sess)->sess.detach = (void (*)(void*)) map_detachSession; + (*Sess)->sess.notSem = (void (*)(void*)) map_notSemaphore; + (*Sess)->sess.isSemOK = (int (*)(void*)) map_isSemaphoreOK; + (*Sess)->sess.incSem = (int (*)(void*)) map_incSemaphore; + (*Sess)->sess.decSem = (int (*)(void*)) map_decSemaphore; } else { sess_SetErr(EINVAL, "Session type must be specified"); close(h); @@ -216,23 +216,25 @@ 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 * return: none */ void -sess_freeSession(const char *csFName, ait_sess_t ** __restrict Sess) +sess_freeSession(ait_sess_t ** __restrict Sess) { - if (!Sess) + if (!Sess || !(*Sess)) return; + if ((*Sess)->addr) + DETACH_MEMORY(*Sess); + + /* memset(&(*Sess)->sess, 0, sizeof (*Sess)->sess); (*Sess)->type = SHARED_UNKNOWN; - if (csFName && (*Sess)->name) - unlink((*Sess)->name); - if (*Sess) - free(*Sess); + */ + + free(*Sess); *Sess = NULL; } @@ -240,7 +242,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 @@ -248,17 +249,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; @@ -273,13 +274,17 @@ 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); +#ifdef HAVE_SHM_OPEN + snprintf(szSName[1], FILENAME_MAX, "/%s-%x.ANM", Sess->name, (u_int) Sess->key); +#else + snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", Sess->name, (u_int) Sess->key); +#endif /* 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 */ @@ -287,21 +292,33 @@ map_createSession(const char *csFName, int nSeed, long sem_post(Sess->id.sid); /* create file for shared memory storage */ +#ifdef HAVE_SHM_OPEN + Sess->mem.fd = shm_open(szSName[1], O_RDWR | O_CREAT, MEM_MODE); +#else Sess->mem.fd = open(szSName[1], O_RDWR | O_CREAT, MEM_MODE); +#endif 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) { +#ifdef HAVE_SHM_OPEN + if (ftruncate(Sess->mem.fd, nSize) == -1) { + LOGERR; + map_destroySession(Sess); + return -1; + } +#else + /* if is new shared memory session, fill file with zeros */ 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); lseek(Sess->mem.fd, 0, SEEK_SET); +#endif } Sess->eom = nSize; @@ -311,21 +328,24 @@ 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]; - if (!Sess || sess_isAttached(Sess)) + if (!Sess || sess_isAttached(Sess) || !*Sess->name) return; 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); +#ifdef HAVE_SHM_UNLINK + snprintf(szSName[1], FILENAME_MAX, "/%s-%x.ANM", Sess->name, (u_int) Sess->key); +#else + snprintf(szSName[1], FILENAME_MAX, "%s-%x.ANM", Sess->name, (u_int) Sess->key); +#endif if (Sess->id.sid != SEM_FAILED) { sem_close(Sess->id.sid); @@ -333,8 +353,14 @@ map_destroySession(const char *csFName, ait_sess_t * _ } if (Sess->mem.fd > 2) { close(Sess->mem.fd); +#ifdef HAVE_SHM_UNLINK + shm_unlink(szSName[1]); +#else unlink(szSName[1]); +#endif } + unlink(Sess->name); + memset(Sess->name, 0, sizeof Sess->name); Sess->eom ^= Sess->eom; Sess->key ^= Sess->key; } @@ -342,7 +368,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 @@ -350,17 +375,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; @@ -376,7 +401,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 */ @@ -384,7 +409,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; } } @@ -393,7 +418,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; @@ -404,12 +429,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; @@ -421,6 +445,8 @@ ipc_destroySession(const char *csFName, ait_sess_t * _ semctl(Sess->id.semid, 0, IPC_RMID, &sems); if (Sess->mem.shmid != -1) shmctl(Sess->mem.shmid, IPC_RMID, &ds); + unlink(Sess->name); + memset(Sess->name, 0, sizeof Sess->name); Sess->eom ^= Sess->eom; Sess->key ^= Sess->key; }