Style cleanup

[citadel.git] / citadel / modules / smtp / smtpqueue.h

diff --git a/citadel/modules/smtp/smtpqueue.h b/citadel/modules/smtp/smtpqueue.h
index d0543518925f4c5c0be4eda17118ae3aebef4efa..12b2ad387f1591e32f56996ea0411c211107d2f6 100644 (file)
--- a/citadel/modules/smtp/smtpqueue.h
+++ b/citadel/modules/smtp/smtpqueue.h
@@ -1,20 +1,26 @@
+/*
+ *
+ * Copyright (c) 1998-2012 by the citadel.org team
+ *
+ *  This program is open source software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
 /*****************************************************************************/
 /*               SMTP CLIENT (Queue Management) STUFF                        */
 /*****************************************************************************/
 
-typedef struct ParsedURL ParsedURL;
-struct ParsedURL {
-       StrBuf *URL;
-       unsigned Port;
-       const char *User;
-       const char *Pass;
-       const char *LocalPart;
-       int IsIP;
-       int af;
-       struct hostent *HEnt;
-       struct in6_addr Addr;
-       ParsedURL *Next;
-};
 
 
 #define MaxAttempts 15
@@ -34,7 +40,7 @@ typedef struct _mailq_entry {
         * 2 = Delivery was successful
         * 4 = A transient error was experienced ... try again later
         * 5 = Delivery to this address failed permanently.  The error message
-         *     should be placed in the fourth field so that a bounce message may
+        *     should be placed in the fourth field so that a bounce message may
         *     be generated.
         */
 
@@ -48,18 +54,22 @@ typedef struct queueitem {
        long Submitted;
        int FailNow;
        HashList *MailQEntries;
-       MailQEntry *Current; /* copy of the currently parsed item in the MailQEntries list; if null add a new one. */
+/* copy of the currently parsed item in the MailQEntries list;
+ * if null add a new one.
+ */
+       MailQEntry *Current;
        DeliveryAttempt LastAttempt;
        long ActiveDeliveries;
        StrBuf *EnvelopeFrom;
        StrBuf *BounceTo;
        ParsedURL *URL;
+       ParsedURL *FallBackHost;
 } OneQueItem;
+
 typedef void (*QItemHandler)(OneQueItem *Item, StrBuf *Line, const char **Pos);
 
-int DecreaseQReference(OneQueItem *MyQItem);
-void RemoveQItem(OneQueItem *MyQItem);
-int CountActiveQueueEntries(OneQueItem *MyQItem);
+int     DecreaseQReference(OneQueItem *MyQItem);
+void    RemoveQItem(OneQueItem *MyQItem);
+int     CountActiveQueueEntries(OneQueItem *MyQItem);
 StrBuf *SerializeQueueItem(OneQueItem *MyQItem);
-
-void smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt);
+void    smtpq_do_bounce(OneQueItem *MyQItem, StrBuf *OMsgTxt);