Changes in trunk/src/sh_database.c [18:30]

File:

• trunk/src/sh_database.c (modified) (9 diffs)

trunk/src/sh_database.c

@@ -40 +40 @@
 #include "sh_error.h"
 #include "sh_utils.h"
-
-extern int safe_logger (int signal, int method, pid_t thepid);
 
 #undef  FIL__
@@ -227 +225 @@
 typedef unsigned char uint8;
 
-typedef struct
-{
-        uint32 h[4];
-        uint32 data[16];
-        uint8  offset;
-        uint32  nblocks;
-        int  count;
+typedef struct md5_ctx
+{
+  uint32 A;
+  uint32 B;
+  uint32 C;
+  uint32 D;
+
+  uint32 total[2];
+  uint32 buflen;
+  char buffer[128];
 } md5Param;
-
 
 
@@ -253 +253 @@
 static int  sh_persistent_dbconn = S_TRUE;
 
-int sh_database_use_persistent (char * str)
+int sh_database_use_persistent (const char * str)
 {
   return sh_util_flagval (str, &sh_persistent_dbconn);
 }
 
-static int insert_value (char * ptr, char * str)
+static int insert_value (char * ptr, const char * str)
 {
   if (!ptr || !str)
@@ -276 +276 @@
   
 
-int sh_database_set_database (char * str)
+int sh_database_set_database (const char * str)
 {
   return insert_value (db_name, str);
 }
-int sh_database_set_table (char * str)
+int sh_database_set_table (const char * str)
 {
   return insert_value (db_table, str);
 }
-int sh_database_set_host (char * str)
+int sh_database_set_host (const char * str)
 {
   return insert_value (db_host, str);
 }
-int sh_database_set_user (char * str)
+int sh_database_set_user (const char * str)
 {
   return insert_value (db_user, str);
 }
-int sh_database_set_password (char * str)
+int sh_database_set_password (const char * str)
 {
   return insert_value (db_password, str);
@@ -568 +568 @@
  oracle_doconnect:
 
-  if (!getenv("ORACLE_HOME")) 
+  if (!getenv("ORACLE_HOME")) /* flawfinder: ignore */
     {
       sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGEN,
@@ -1194 +1194 @@
         }
     }
-#if 0
-  /* apparently slower, see gyule.7 */
-  len = (long) strlen(val);
-
-  if ((val[0] != '\0') && (*size > 2))
-    {
-      if (flag == 1) 
-        {
-          *end = ',';  ++end;
-          *end = '\''; ++end; (*size) -= 2; 
-          *end = '\0';
-        
-          if ((long) *size > (len+2))
-            {
-              (void) sl_strlcat(end, val, (size_t) *size);
-              end   += len; (*size) -= len;
-              *end = '\''; ++end;  (*size) -= 1; 
-            }
-          *end = '\0'; 
-        }
-      else
-        {
-          *end = ',';  ++end; (*size) -= 1;
-          *end = '\0';
-        
-          if ((long) *size > (len+1))
-            {
-              (void) sl_strlcat(end, val, (size_t) *size);
-              end   += len; (*size) -= len;
-            }
-          *end = '\0';
-        }
-    }
-#endif
+
   return end;
 }
@@ -1482 +1449 @@
 }
 
-int sh_database_add_to_hash  (char * str)
+int sh_database_add_to_hash  (const char * str)
 {
   int i;
@@ -1692 +1659 @@
 static int enter_wrapper = 1;
 
-int set_enter_wrapper (char * str)
+int set_enter_wrapper (const char * str)
 {
   return sh_util_flagval(str, &enter_wrapper);
 }
 
+/* recursively enter linked list of messages into database, last first
+ */
+int sh_database_insert_rec (dbins * curr, unsigned int depth)
+{
+  long    id = 0;
+  dbins * prev;
+
+  SL_ENTER(_("sh_database_insert_rec"));
+
+  if (curr->next)
+    {
+      prev = curr->next;
+      sl_strlcpy(prev->host, curr->host, 64);
+      id = sh_database_insert_rec (curr->next, (depth + 1));
+    }
+
+  if (id != 0)                       /* this is a server wrapper          */
+    {
+      if (enter_wrapper != 0)
+        {
+          id = sh_database_entry (curr, id);
+        }
+    }
+  else
+    {
+      /*
+       * id = -1 is the client message; log_ref will be NULL 
+       */
+      if (depth > 0)                  /* this is a client message         */
+        id = sh_database_entry (curr, -1);
+      else                            /* this is a generic server message */
+        id = sh_database_entry (curr, 0);
+    }
+
+  SH_FREE(curr);
+
+  SL_RETURN(id, _("sh_database_insert"));
+}
+
 int sh_database_insert (char * message)
 {
   dbins * db_entry;
-  dbins * prev;
-  dbins * curr;
-  long    id = 0;
-#ifdef HOST_SWITCH
-  char  * temp[64];
-#endif
 
   SL_ENTER(_("sh_database_insert"));
@@ -1716 +1716 @@
   (void) sh_database_parse (message, db_entry);
 
-  /* Enter the list into the database. Actually, the list can only have
-   * two entries at most.
-   */
-  curr = db_entry;
-  if (curr->next)
-    {
-      prev = curr->next;
-#ifdef HOST_SWITCH
-      strncpy(temp, prev->host,       64);
+  /* recursively enter the linked list into the database
+   */
+  (void) sh_database_insert_rec (db_entry, 0);
+
+  SL_RETURN(0, _("sh_database_insert"));
+}
+
 #endif
-      strncpy(prev->host, curr->host, 64);
-#ifdef HOST_SWITCH
-      strncpy(curr->host, temp,       64);
-#endif
-      id = sh_database_entry (prev, -1);
-      SH_FREE(prev);
-    }
-
-  if (id != 0)                       /* this is a server wrapper          */
-    {
-      if (enter_wrapper != 0)
-        (void) sh_database_entry (curr, id);
-    }
-  else                                /* this is a generic server message */
-    {
-      (void) sh_database_entry (curr, 0);
-    }
-  SH_FREE(curr);
-
-  SL_RETURN(0, _("sh_database_insert"));
-}
-
-#endif