Changeset 226 for trunk/src

Timestamp:

Apr 18, 2009, 5:55:37 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #151 (incorrect hostname insertion into db when relaying).

Location:

trunk/src

Files:

• sh_database.c (modified) (3 diffs)
• sh_utils.c (modified) (2 diffs)

trunk/src/sh_database.c

@@ -1766 +1766 @@
 /* recursively enter linked list of messages into database, last first
  */
-long sh_database_insert_rec (dbins * curr, int depth)
+long sh_database_insert_rec (dbins * curr, int depth, char * host)
 {
   unsigned long    id = 0;
-  dbins * prev;
 
   SL_ENTER(_("sh_database_insert_rec"));
@@ -1775 +1774 @@
   if (curr->next)
     {
+      /*
       prev = curr->next;
       sl_strlcpy(prev->host, curr->host, 64);
       id = sh_database_insert_rec (curr->next, (depth + 1));
-    }
+      */
+      ++depth;
+      id = sh_database_insert_rec (curr->next, depth, curr->host);
+    }
+
+  if (host) 
+    sl_strlcpy(curr->host, host, 64);
 
   if (id != 0)                       /* this is a server wrapper          */
@@ -1818 +1824 @@
   /* recursively enter the linked list into the database
    */
-  (void) sh_database_insert_rec (db_entry, 0);
+  (void) sh_database_insert_rec (db_entry, 0, NULL);
 
   SL_RETURN(0, _("sh_database_insert"));

trunk/src/sh_utils.c

@@ -2107 +2107 @@
 
   
-size_t sh_util_base64_enc (unsigned char * out, const unsigned char * instr, 
+size_t sh_util_base64_enc (unsigned char * out, 
+                           const unsigned char * instr, 
                            size_t lin)
 {
@@ -2171 +2172 @@
 }
 
-size_t sh_util_base64_dec (unsigned char *out, const unsigned char *in, 
+size_t sh_util_base64_dec (unsigned char *out, 
+                           const unsigned char *in, 
                            size_t lin)
 {