{
CitContext *ccptr;
time_t now;
- int session_to_kill;
int killed = 0;
int longrunners = 0;
now = time(NULL);
- session_to_kill = 0;
begin_critical_section(S_SESSION_TABLE);
for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) {
- if ( (ccptr!=CC)
- && (config.c_sleeping > 0)
- && (now - (ccptr->lastcmd) > config.c_sleeping) ) {
+ if (
+ (ccptr != CC)
+ && (config.c_sleeping > 0)
+ && (now - (ccptr->lastcmd) > config.c_sleeping)
+ ) {
if (!ccptr->dont_term) {
ccptr->kill_me = KILLME_IDLE;
++killed;
}
- else
- longrunners ++;
+ else {
+ ++longrunners;
+ }
}
}
end_critical_section(S_SESSION_TABLE);
if (killed > 0)
syslog(LOG_INFO, "Scheduled %d idle sessions for termination\n", killed);
if (longrunners > 0)
- syslog(LOG_INFO, "Didn't terminate %d protected idle sessions;\n", killed);
+ syslog(LOG_INFO, "Didn't terminate %d protected idle sessions", longrunners);
}
void RemoveContext (CitContext *con)
{
const char *c;
- if (con==NULL) {
- syslog(LOG_ERR, "WARNING: RemoveContext() called with NULL!\n");
+ if (con == NULL) {
+ syslog(LOG_ERR, "WARNING: RemoveContext() called with NULL!");
return;
}
c = con->ServiceName;
- if (c == NULL)
+ if (c == NULL) {
c = "WTF?";
- syslog(LOG_DEBUG, "RemoveContext(%s) session %d\n", c, con->cs_pid);
- cit_backtrace ();
+ }
+ syslog(LOG_DEBUG, "RemoveContext(%s) session %d", c, con->cs_pid);
+ cit_backtrace();
/* Run any cleanup routines registered by loadable modules.
* Note: We have to "become_session()" because the cleanup functions
client_close(); /* If the client is still connected, blow 'em away. */
become_session(NULL);
- syslog(LOG_NOTICE, "[%3d] Session ended.\n", con->cs_pid);
+ syslog(LOG_NOTICE, "[%3d] Session ended.", con->cs_pid);
+
+ /*
+ * If the client is still connected, blow 'em away.
+ * if the socket is 0 or -1, its already gone or was never there.
+ */
+ if (con->client_socket > 0)
+ {
+ syslog(LOG_NOTICE, "Closing socket %d", con->client_socket);
+ close(con->client_socket);
+ }
/* If using AUTHMODE_LDAP, free the DN */
if (con->ldap_dn) {
free(con->cached_msglist);
}
- syslog(LOG_DEBUG, "Done with RemoveContext()\n");
+ syslog(LOG_DEBUG, "Done with RemoveContext()");
}
rem = ptr->next;
--num_sessions;
- syslog(LOG_DEBUG, "context_cleanup(): Purging session #%d %s\n", ptr->cs_pid, ptr->ServiceName);
+ syslog(LOG_DEBUG, "context_cleanup(): purging session %d\n", ptr->cs_pid);
RemoveContext(ptr);
free (ptr);
ptr = rem;