masqmail-0.2: src/queue.c annotate

masqmail-0.2

annotate src/queue.c @ 179:ec3fe72a3e99

Fixed an important bug with folded headers! g_strconcat() returns a *copy* of the string, but hdr->value still pointed to the old header (which probably was a memory leak, too). If the folded part had been quite small it was likely that the new string was at the same position as the old one, thus making everything go well. But if pretty long headers were folded several times it was likely that the new string was allocated somewhere else in memory, thus breaking things. In result mails to lots of recipients (folded header) were frequently only sent to the ones in the first line. Sorry for the inconvenience.

author	meillo@marmaro.de
date	Fri, 03 Jun 2011 09:52:17 +0200
parents	a80ebfa16cd5
children

rev	line source
meillo@0	1 /* MasqMail
meillo@0	2 Copyright (C) 1999-2001 Oliver Kurth
meillo@174	3 Copyright (C) 2010 markus schnalke <meillo@marmaro.de>
meillo@0	4
meillo@0	5 This program is free software; you can redistribute it and/or modify
meillo@0	6 it under the terms of the GNU General Public License as published by
meillo@0	7 the Free Software Foundation; either version 2 of the License, or
meillo@0	8 (at your option) any later version.
meillo@0	9
meillo@0	10 This program is distributed in the hope that it will be useful,
meillo@0	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
meillo@0	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
meillo@0	13 GNU General Public License for more details.
meillo@0	14
meillo@0	15 You should have received a copy of the GNU General Public License
meillo@0	16 along with this program; if not, write to the Free Software
meillo@0	17 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
meillo@0	18 */
meillo@0	19
meillo@0	20 #include <sys/stat.h>
meillo@0	21 #include <glob.h>
meillo@0	22
meillo@15	23 #include "masqmail.h"
meillo@15	24
meillo@10	25 static void
meillo@10	26 mix_arr(int *buf, int len)
meillo@0	27 {
meillo@10	28 int i;
meillo@0	29
meillo@10	30 for (i = 0; i < len; i++)
meillo@10	31 buf[i] = i;
meillo@10	32 for (i = 0; i < len - 1; i++) {
meillo@10	33 int j = (int) ((float) (len - i) * ((float) rand()) / (RAND_MAX + 1.0));
meillo@10	34 int tmp;
meillo@0	35
meillo@10	36 if (i != j) {
meillo@10	37 tmp = buf[i];
meillo@10	38 buf[i] = buf[j];
meillo@10	39 buf[j] = tmp;
meillo@10	40 }
meillo@10	41 }
meillo@0	42 }
meillo@0	43
meillo@10	44 GList*
meillo@10	45 read_queue(gboolean do_readdata)
meillo@0	46 {
meillo@10	47 GList *msg_list = NULL;
meillo@10	48 glob_t gl;
meillo@10	49 gchar *pattern;
meillo@10	50 int i, *idx_arr;
meillo@0	51
meillo@38	52 /* Escaping the question marks prevents them from being
meillo@38	53 interpreted as trigraphs */
meillo@38	54 pattern = g_strdup_printf("%s/input/?????\?-??\?-?\?-H", conf.spool_dir);
meillo@10	55 gl.gl_offs = 0;
meillo@10	56 glob(pattern, 0, NULL, &gl);
meillo@0	57
meillo@10	58 g_free(pattern);
meillo@0	59
meillo@10	60 DEBUG(4) {
meillo@10	61 int i;
meillo@10	62 for (i = 0; i < gl.gl_pathc; i++) {
meillo@10	63 debugf("spoolfile: %s\n", gl.gl_pathv[i]);
meillo@10	64 }
meillo@10	65 }
meillo@0	66
meillo@10	67 idx_arr = g_malloc(sizeof(int) * gl.gl_pathc);
meillo@10	68 mix_arr(idx_arr, gl.gl_pathc);
meillo@0	69
meillo@10	70 for (i = 0; i < gl.gl_pathc; i++) {
meillo@10	71 gchar *uid;
meillo@0	72
meillo@10	73 /* copy 13 chars, offset spooldir path + 7 chars for /input/ */
meillo@10	74 /* uid length = 6 chars + '-' + 3 chars + '-' + 2 = 13 chars */
meillo@10	75 uid = g_strndup(&(gl.gl_pathv[idx_arr[i]][strlen(conf.spool_dir) + 7]), 13);
meillo@0	76
meillo@10	77 DEBUG(5) debugf("uid: %s\n", uid);
meillo@0	78
meillo@10	79 msg_list = g_list_append(msg_list, msg_spool_read(uid, do_readdata));
meillo@0	80
meillo@10	81 DEBUG(5) debugf("after read spool file for %s\n", uid);
meillo@0	82
meillo@10	83 g_free(uid);
meillo@10	84 }
meillo@10	85 return msg_list;
meillo@0	86 }
meillo@0	87
meillo@10	88 gboolean
meillo@10	89 queue_run()
meillo@0	90 {
meillo@10	91 GList *msg_list;
meillo@10	92 gboolean ok = TRUE;
meillo@0	93
meillo@10	94 logwrite(LOG_NOTICE, "Starting queue run.\n");
meillo@0	95
meillo@10	96 msg_list = read_queue(FALSE);
meillo@0	97
meillo@10	98 if (msg_list != NULL) {
meillo@10	99 ok = deliver_msg_list(msg_list, DLVR_ALL);
meillo@10	100 destroy_msg_list(msg_list);
meillo@114	101 logwrite(LOG_NOTICE, " deliver_msg_list()=%d.\n", ok);
meillo@10	102 }
meillo@10	103 logwrite(LOG_NOTICE, "Finished queue run.\n");
meillo@0	104
meillo@10	105 return ok;
meillo@0	106 }
meillo@0	107
meillo@10	108 gboolean
meillo@10	109 queue_run_online()
meillo@0	110 {
meillo@10	111 GList *msg_list = read_queue(FALSE);
meillo@10	112 gboolean ok = TRUE;
meillo@0	113
meillo@10	114 logwrite(LOG_NOTICE, "Starting online queue run.\n");
meillo@10	115 if (msg_list != NULL) {
meillo@10	116 ok = deliver_msg_list(msg_list, DLVR_ONLINE);
meillo@10	117 destroy_msg_list(msg_list);
meillo@10	118 }
meillo@10	119 logwrite(LOG_NOTICE, "Finished online queue run.\n");
meillo@0	120
meillo@10	121 return ok;
meillo@0	122 }
meillo@0	123
meillo@10	124 static gchar*
meillo@10	125 format_difftime(double secs)
meillo@0	126 {
meillo@10	127 if (secs > 86400)
meillo@10	128 return g_strdup_printf("%.1fd", secs / 86400);
meillo@10	129 else if (secs > 3600)
meillo@10	130 return g_strdup_printf("%.1fh", secs / 3600);
meillo@10	131 else if (secs > 60)
meillo@10	132 return g_strdup_printf("%.1fm", secs / 60);
meillo@10	133 else
meillo@10	134 return g_strdup_printf("%.0fs", secs);
meillo@10	135 }
meillo@0	136
meillo@10	137 void
meillo@10	138 queue_list()
meillo@0	139 {
meillo@10	140 GList *msg_list;
meillo@10	141 GList *msg_node;
meillo@0	142
meillo@10	143 msg_list = read_queue(FALSE);
meillo@0	144
meillo@82	145 if (msg_list == NULL) {
meillo@82	146 printf("mail queue is empty.\n");
meillo@82	147 return;
meillo@82	148 }
meillo@0	149
meillo@82	150 foreach(msg_list, msg_node) {
meillo@82	151 message msg = (message ) (msg_node->data);
meillo@82	152 GList *rcpt_node;
meillo@82	153 gchar *size_str = NULL;
meillo@82	154 gchar *time_str = NULL;
meillo@82	155 gchar *host_str = NULL;
meillo@82	156 gchar *ident_str = NULL;
meillo@0	157
meillo@82	158 if (msg->data_size >= 0)
meillo@82	159 size_str = g_strdup_printf(" size=%d", msg->data_size);
meillo@82	160 if (msg->received_time > 0) {
meillo@82	161 gchar *tmp_str;
meillo@82	162 time_str = g_strdup_printf(" age=%s", tmp_str = format_difftime(difftime(time(NULL), msg->received_time)));
meillo@82	163 g_free(tmp_str);
meillo@82	164 }
meillo@82	165 if (msg->received_host != NULL)
meillo@82	166 host_str = g_strdup_printf(" host=%s", msg->received_host);
meillo@82	167 if (msg->ident != NULL)
meillo@82	168 ident_str = g_strdup_printf(" ident=%s", msg->ident);
meillo@0	169
meillo@82	170 printf("%s <= %s%s%s%s%s\n", msg->uid, addr_string(msg->return_path), size_str ? size_str : "",
meillo@82	171 time_str ? time_str : "", host_str ? host_str : "", ident_str ? ident_str : "");
meillo@0	172
meillo@82	173 if (size_str)
meillo@82	174 g_free(size_str);
meillo@82	175 if (time_str)
meillo@82	176 g_free(time_str);
meillo@82	177 if (host_str)
meillo@82	178 g_free(host_str);
meillo@82	179 if (ident_str)
meillo@82	180 g_free(ident_str);
meillo@10	181
meillo@82	182 foreach(msg->rcpt_list, rcpt_node) {
meillo@82	183 address rcpt = (address ) (rcpt_node->data);
meillo@82	184
meillo@82	185 printf(" %s %s\n", addr_is_delivered(rcpt) ? "=>" : (addr_is_failed(rcpt) ? "!=" : "=="), addr_string(rcpt));
meillo@10	186 }
meillo@82	187 g_free(msg);
meillo@82	188 }
meillo@10	189 }
meillo@10	190
meillo@10	191 gboolean
meillo@10	192 queue_delete(gchar * uid)
meillo@0	193 {
meillo@10	194 gboolean hdr_ok = TRUE;
meillo@10	195 gboolean dat_ok = TRUE;
meillo@10	196 gchar *hdr_name = g_strdup_printf("%s/input/%s-H", conf.spool_dir, uid);
meillo@10	197 gchar *dat_name = g_strdup_printf("%s/input/%s-D", conf.spool_dir, uid);
meillo@10	198 struct stat stat_buf;
meillo@0	199
meillo@82	200 if (!spool_lock(uid)) {
meillo@10	201 fprintf(stderr, "message %s is locked.\n", uid);
meillo@10	202 return FALSE;
meillo@10	203 }
meillo@0	204
meillo@82	205 if (stat(hdr_name, &stat_buf) == 0) {
meillo@82	206 if (unlink(hdr_name) != 0) {
meillo@82	207 fprintf(stderr, "could not unlink %s: %s\n", hdr_name, strerror(errno));
meillo@82	208 hdr_ok = FALSE;
meillo@82	209 }
meillo@82	210 } else {
meillo@82	211 fprintf(stderr, "could not stat file %s: %s\n", hdr_name, strerror(errno));
meillo@82	212 hdr_ok = FALSE;
meillo@82	213 }
meillo@82	214 if (stat(dat_name, &stat_buf) == 0) {
meillo@82	215 if (unlink(dat_name) != 0) {
meillo@82	216 fprintf(stderr, "could not unlink %s: %s\n", dat_name, strerror(errno));
meillo@82	217 dat_ok = FALSE;
meillo@82	218 }
meillo@82	219 } else {
meillo@82	220 fprintf(stderr, "could not stat file %s: %s\n", dat_name, strerror(errno));
meillo@82	221 dat_ok = FALSE;
meillo@82	222 }
meillo@82	223 printf("message %s deleted\n", uid);
meillo@82	224
meillo@82	225 spool_unlock(uid);
meillo@82	226
meillo@10	227 return (dat_ok && hdr_ok);
meillo@0	228 }