* Added function CtdlGetDynamicSymbol() for dynamic symbol allocation

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index ed45f720b951e79dd9f204c3eff2cb83aae26ab0..44a98d021bbf27470c04e1e362a7e5a8ecb3d733 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -88,6 +88,29 @@ void master_cleanup(void) {
        }
 
 
+/*
+ * Free any per-session data allocated by modules or whatever
+ */
+void deallocate_user_data(struct CitContext *con)
+{
+       struct CtdlSessData *ptr;
+
+       begin_critical_section(S_SESSION_TABLE);
+       while (con->FirstSessData != NULL) {
+               lprintf(9, "Deallocating user data symbol %ld\n",
+                       con->FirstSessData->sym_id);
+               if (con->FirstSessData->sym_data != NULL)
+                       phree(con->FirstSessData->sym_data);
+               ptr = con->FirstSessData->next;
+               phree(con->FirstSessData);
+               con->FirstSessData = ptr;
+       }
+       end_critical_section(S_SESSION_TABLE);
+}
+
+
+
+
 /*
  * Gracefully terminate the session and thread.
  * (This is called as a cleanup handler by the thread library.)
@@ -115,6 +138,9 @@ void cleanup_stuff(void *arg)
        /* Deallocate any message list we might have in memory */
        if (CC->msglist != NULL) phree(CC->msglist);
 
+       /* Deallocate any user-data attached to this session */
+       deallocate_user_data(CC);
+
        /* Now get rid of the session and context */
        lprintf(7, "cleanup_stuff() calling RemoveContext(%d)\n", CC->cs_pid);
        RemoveContext(CC);
@@ -126,6 +152,73 @@ void cleanup_stuff(void *arg)
        }
 
 
+/*
+ * Get a dynamic symbol number for per-session user data.
+ * This API call should be made only ONCE per symbol per citserver run.
+ */
+int CtdlGetDynamicSymbol() 
+{
+       static unsigned int next_symbol = SYM_MAX;
+       return ++next_symbol;
+}
+
+
+
+/*
+ * Return a pointer to some generic per-session user data.
+ * (This function returns NULL if the requested symbol is not allocated.)
+ *
+ * NOTE: we use critical sections for allocating and de-allocating these,
+ *       but not for locating one.
+ */
+void *CtdlGetUserData(unsigned long requested_sym) 
+{
+       struct CtdlSessData *ptr;
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)
+               if (ptr->sym_id == requested_sym)
+                       return(ptr->sym_data);
+
+       lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n",
+               requested_sym);
+       return NULL;
+}
+
+
+/*
+ * Allocate some generic per-session user data.
+ */
+void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes)
+{
+       struct CtdlSessData *ptr;
+
+       lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym);
+
+       for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next)  {
+               if (ptr->sym_id == requested_sym) {
+                       lprintf(2, "ERROR: CtdlAllocUserData() requested for"
+                               " symbol id %ld already registered\n", 
+                               requested_sym);
+                       return;
+               }
+       }
+
+       ptr = mallok(sizeof(struct CtdlSessData));
+       ptr->sym_id = requested_sym;
+       ptr->sym_data = mallok(num_bytes);
+
+       begin_critical_section(S_SESSION_TABLE);
+       ptr->next = CC->FirstSessData;
+       CC->FirstSessData = ptr;
+       end_critical_section(S_SESSION_TABLE);
+
+       lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym);
+}
+
+
+
+
+
 /*
  * set_wtmpsupp()  -  alter the session listing
  */
@@ -259,15 +352,24 @@ void cmd_time(void)
  */
 static int hostnames_match(const char *realname, const char *testname) {
        struct hostent *he;
+       int retval = 0;
 
        if (!strcasecmp(realname, testname))
                return 1;
 
+#ifdef HAVE_NONREENTRANT_NETDB
+       begin_critical_section(S_NETDB);
+#endif
+
        if ((he = gethostbyname(testname)) != NULL)
                if (!strcasecmp(realname, he->h_name))
-                       return 1;
+                       retval = 1;
+
+#ifdef HAVE_NONREENTRANT_NETDB
+       end_critical_section(S_NETDB);
+#endif
 
-       return 0;
+       return retval;
        }
 
 /*
@@ -309,7 +411,6 @@ void cmd_iden(char *argbuf)
        char desc[256];
        char from_host[256];
        struct in_addr addr;
-       struct hostent *he;
 
        if (num_parms(argbuf)<4) {
                cprintf("%d usage error\n",ERROR);
@@ -333,13 +434,12 @@ void cmd_iden(char *argbuf)
 
        if ((strlen(from_host)>0) && 
           (is_public_client(CC->cs_host))) {
-               if (inet_aton(from_host, &addr) &&
-                   (he = gethostbyaddr((char*)&addr, sizeof addr, AF_INET)) !=
-                   NULL)
-                       strncpy(CC->cs_host,he->h_name,24);
-               else
+               if (inet_aton(from_host, &addr))
+                       locate_host(CC->cs_host, &addr);
+               else {
                        strncpy(CC->cs_host,from_host,24);
-               CC->cs_host[24] = 0;
+                       CC->cs_host[24] = 0;
+                       }
                }
        set_wtmpsupp_to_current_room();
 
@@ -699,7 +799,8 @@ void cmd_scdn(char *argbuf)
 void *context_loop(struct CitContext *con)
 {
        char cmdbuf[256];
-       int num_sessions;
+       int num_sessions, len;
+       struct sockaddr_in sin;
 
        /*
         * Wedge our way into the context table.
@@ -727,10 +828,13 @@ void *context_loop(struct CitContext *con)
        strcpy(CC->cs_room, "(no room)");
        strncpy(CC->cs_host, config.c_fqdn, sizeof CC->cs_host);
        CC->cs_host[sizeof CC->cs_host - 1] = 0;
-       locate_host(CC->cs_host);
+       len = sizeof sin;
+       if (!getpeername(CC->client_socket, (struct sockaddr *) &sin, &len))
+               locate_host(CC->cs_host, &sin.sin_addr);
        CC->cs_flags = 0;
        CC->upload_type = UPL_FILE;
        CC->dl_is_net = 0;
+       CC->FirstSessData = NULL;
 
        num_sessions = session_count();
        CC->nologin = 0;