Mercurial > masqmail

comparison src/queue.c @ 10:26e34ae9a3e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed indention and line wrapping to a more consistent style
author meillo@marmaro.de
date Mon, 27 Oct 2008 16:23:10 +0100
parents 08114f7dcc23
children f671821d8222
comparison
equal deleted inserted replaced
9:31cc8a89cb74 10:26e34ae9a3e3
19 #include "masqmail.h" 19 #include "masqmail.h"
20 20
21 #include <sys/stat.h> 21 #include <sys/stat.h>
22 #include <glob.h> 22 #include <glob.h>
23 23
24 static 24 static void
25 void mix_arr(int *buf, int len) 25 mix_arr(int *buf, int len)
26 { 26 {
27 int i; 27 int i;
28 28
29 for(i = 0; i < len; i++) 29 for (i = 0; i < len; i++)
30 buf[i] = i; 30 buf[i] = i;
31 for(i = 0; i < len-1; i++){ 31 for (i = 0; i < len - 1; i++) {
32 int j = (int)((float)(len-i) * ((float)rand())/(RAND_MAX + 1.0)); 32 int j = (int) ((float) (len - i) * ((float) rand()) / (RAND_MAX + 1.0));
33 int tmp; 33 int tmp;
34 34
35 if(i != j){ 35 if (i != j) {
36 tmp = buf[i]; buf[i] = buf[j]; buf[j] = tmp; 36 tmp = buf[i];
37 } 37 buf[i] = buf[j];
38 } 38 buf[j] = tmp;
39 } 39 }
40 40 }
41 GList *read_queue(gboolean do_readdata) 41 }
42 { 42
43 GList *msg_list = NULL; 43 GList*
44 glob_t gl; 44 read_queue(gboolean do_readdata)
45 gchar *pattern; 45 {
46 int i, *idx_arr; 46 GList *msg_list = NULL;
47 47 glob_t gl;
48 pattern = g_strdup_printf("%s/input/??????-???-??-H", conf.spool_dir); 48 gchar *pattern;
49 gl.gl_offs = 0; 49 int i, *idx_arr;
50 glob(pattern, 0, NULL, &gl); 50
51 51 pattern = g_strdup_printf("%s/input/??????-???-??-H", conf.spool_dir);
52 g_free(pattern); 52 gl.gl_offs = 0;
53 53 glob(pattern, 0, NULL, &gl);
54 DEBUG(4){ 54
55 int i; 55 g_free(pattern);
56 for(i = 0; i < gl.gl_pathc; i++){ 56
57 debugf("spoolfile: %s\n", gl.gl_pathv[i]); 57 DEBUG(4) {
58 } 58 int i;
59 } 59 for (i = 0; i < gl.gl_pathc; i++) {
60 60 debugf("spoolfile: %s\n", gl.gl_pathv[i]);
61 idx_arr = g_malloc(sizeof(int) * gl.gl_pathc); 61 }
62 mix_arr(idx_arr, gl.gl_pathc); 62 }
63 63
64 for(i = 0; i < gl.gl_pathc; i++){ 64 idx_arr = g_malloc(sizeof(int) * gl.gl_pathc);
65 gchar *uid; 65 mix_arr(idx_arr, gl.gl_pathc);
66 66
67 /* copy 13 chars, offset spooldir path + 7 chars for /input/ */ 67 for (i = 0; i < gl.gl_pathc; i++) {
68 /* uid length = 6 chars + '-' + 3 chars + '-' + 2 = 13 chars */ 68 gchar *uid;
69 uid = g_strndup(&(gl.gl_pathv[idx_arr[i]][strlen(conf.spool_dir) + 7]), 13); 69
70 70 /* copy 13 chars, offset spooldir path + 7 chars for /input/ */
71 DEBUG(5) debugf("uid: %s\n", uid); 71 /* uid length = 6 chars + '-' + 3 chars + '-' + 2 = 13 chars */
72 72 uid = g_strndup(&(gl.gl_pathv[idx_arr[i]][strlen(conf.spool_dir) + 7]), 13);
73 msg_list = g_list_append(msg_list, msg_spool_read(uid, do_readdata)); 73
74 74 DEBUG(5) debugf("uid: %s\n", uid);
75 DEBUG(5) debugf("after read spool file for %s\n", uid); 75
76 76 msg_list = g_list_append(msg_list, msg_spool_read(uid, do_readdata));
77 g_free(uid); 77
78 } 78 DEBUG(5) debugf("after read spool file for %s\n", uid);
79 return msg_list; 79
80 } 80 g_free(uid);
81 81 }
82 gboolean queue_run() 82 return msg_list;
83 { 83 }
84 GList *msg_list; 84
85 gboolean ok = TRUE; 85 gboolean
86 86 queue_run()
87 logwrite(LOG_NOTICE, "Starting queue run.\n"); 87 {
88 88 GList *msg_list;
89 msg_list = read_queue(FALSE); 89 gboolean ok = TRUE;
90 90
91 if(msg_list != NULL){ 91 logwrite(LOG_NOTICE, "Starting queue run.\n");
92 ok = deliver_msg_list(msg_list, DLVR_ALL); 92
93 destroy_msg_list(msg_list); 93 msg_list = read_queue(FALSE);
94 } 94
95 logwrite(LOG_NOTICE, "Finished queue run.\n"); 95 if (msg_list != NULL) {
96 96 ok = deliver_msg_list(msg_list, DLVR_ALL);
97 return ok; 97 destroy_msg_list(msg_list);
98 } 98 }
99 99 logwrite(LOG_NOTICE, "Finished queue run.\n");
100 gboolean queue_run_online() 100
101 { 101 return ok;
102 GList *msg_list = read_queue(FALSE); 102 }
103 gboolean ok = TRUE; 103
104 104 gboolean
105 logwrite(LOG_NOTICE, "Starting online queue run.\n"); 105 queue_run_online()
106 if(msg_list != NULL){ 106 {
107 ok = deliver_msg_list(msg_list, DLVR_ONLINE); 107 GList *msg_list = read_queue(FALSE);
108 destroy_msg_list(msg_list); 108 gboolean ok = TRUE;
109 } 109
110 logwrite(LOG_NOTICE, "Finished online queue run.\n"); 110 logwrite(LOG_NOTICE, "Starting online queue run.\n");
111 111 if (msg_list != NULL) {
112 return ok; 112 ok = deliver_msg_list(msg_list, DLVR_ONLINE);
113 } 113 destroy_msg_list(msg_list);
114 114 }
115 static 115 logwrite(LOG_NOTICE, "Finished online queue run.\n");
116 gchar *format_difftime(double secs) 116
117 { 117 return ok;
118 if(secs > 86400) 118 }
119 return g_strdup_printf("%.1fd", secs/86400); 119
120 else if(secs > 3600) 120 static gchar*
121 return g_strdup_printf("%.1fh", secs/3600); 121 format_difftime(double secs)
122 else if(secs > 60) 122 {
123 return g_strdup_printf("%.1fm", secs/60); 123 if (secs > 86400)
124 else 124 return g_strdup_printf("%.1fd", secs / 86400);
125 return g_strdup_printf("%.0fs", secs); 125 else if (secs > 3600)
126 } 126 return g_strdup_printf("%.1fh", secs / 3600);
127 127 else if (secs > 60)
128 void queue_list() 128 return g_strdup_printf("%.1fm", secs / 60);
129 { 129 else
130 GList *msg_list; 130 return g_strdup_printf("%.0fs", secs);
131 GList *msg_node; 131 }
132 132
133 msg_list = read_queue(FALSE); 133 void
134 134 queue_list()
135 if(msg_list != NULL){ 135 {
136 foreach(msg_list, msg_node){ 136 GList *msg_list;
137 message *msg = (message *)(msg_node->data); 137 GList *msg_node;
138 GList *rcpt_node; 138
139 gchar *size_str = NULL; 139 msg_list = read_queue(FALSE);
140 gchar *time_str = NULL; 140
141 gchar *host_str = NULL; 141 if (msg_list != NULL) {
142 gchar *ident_str = NULL; 142 foreach(msg_list, msg_node) {
143 143 message *msg = (message *) (msg_node->data);
144 if(msg->data_size >= 0) 144 GList *rcpt_node;
145 size_str = g_strdup_printf(" size=%d", msg->data_size); 145 gchar *size_str = NULL;
146 if(msg->received_time > 0){ 146 gchar *time_str = NULL;
147 gchar *tmp_str; 147 gchar *host_str = NULL;
148 time_str = 148 gchar *ident_str = NULL;
149 g_strdup_printf(" age=%s", 149
150 tmp_str = format_difftime(difftime(time(NULL), 150 if (msg->data_size >= 0)
151 msg->received_time))); 151 size_str = g_strdup_printf(" size=%d", msg->data_size);
152 g_free(tmp_str); 152 if (msg->received_time > 0) {
153 } 153 gchar *tmp_str;
154 if(msg->received_host != NULL) 154 time_str = g_strdup_printf(" age=%s", tmp_str = format_difftime(difftime(time(NULL), msg->received_time)));
155 host_str = g_strdup_printf(" host=%s", msg->received_host); 155 g_free(tmp_str);
156 if(msg->ident != NULL) 156 }
157 ident_str = g_strdup_printf(" ident=%s", msg->ident); 157 if (msg->received_host != NULL)
158 158 host_str = g_strdup_printf(" host=%s", msg->received_host);
159 printf("%s <= %s%s%s%s%s\n", msg->uid, 159 if (msg->ident != NULL)
160 addr_string(msg->return_path), 160 ident_str = g_strdup_printf(" ident=%s", msg->ident);
161 size_str ? size_str : "", 161
162 time_str ? time_str : "", 162 printf("%s <= %s%s%s%s%s\n", msg->uid, addr_string(msg->return_path), size_str ? size_str : "",
163 host_str ? host_str : "", 163 time_str ? time_str : "", host_str ? host_str : "", ident_str ? ident_str : "");
164 ident_str ? ident_str : "" 164
165 ); 165 if (size_str)
166 166 g_free(size_str);
167 if(size_str) g_free(size_str); 167 if (time_str)
168 if(time_str) g_free(time_str); 168 g_free(time_str);
169 if(host_str) g_free(host_str); 169 if (host_str)
170 if(ident_str) g_free(ident_str); 170 g_free(host_str);
171 171 if (ident_str)
172 foreach(msg->rcpt_list, rcpt_node){ 172 g_free(ident_str);
173 address *rcpt = (address *)(rcpt_node->data); 173
174 174 foreach(msg->rcpt_list, rcpt_node) {
175 printf(" %s %s\n", 175 address *rcpt = (address *) (rcpt_node->data);
176 addr_is_delivered(rcpt) ? "=>" : (addr_is_failed(rcpt) ? "!=" : "=="), 176
177 addr_string(rcpt)); 177 printf(" %s %s\n", addr_is_delivered(rcpt) ? "=>" : (addr_is_failed(rcpt) ? "!=" : "=="), addr_string(rcpt));
178 } 178 }
179 g_free(msg); 179 g_free(msg);
180 } 180 }
181 }else 181 } else
182 printf("mail queue is empty.\n"); 182 printf("mail queue is empty.\n");
183 } 183 }
184 184
185 gboolean queue_delete(gchar *uid) 185 gboolean
186 { 186 queue_delete(gchar * uid)
187 gboolean hdr_ok = TRUE; 187 {
188 gboolean dat_ok = TRUE; 188 gboolean hdr_ok = TRUE;
189 gchar *hdr_name = g_strdup_printf("%s/input/%s-H", conf.spool_dir, uid); 189 gboolean dat_ok = TRUE;
190 gchar *dat_name = g_strdup_printf("%s/input/%s-D", conf.spool_dir, uid); 190 gchar *hdr_name = g_strdup_printf("%s/input/%s-H", conf.spool_dir, uid);
191 struct stat stat_buf; 191 gchar *dat_name = g_strdup_printf("%s/input/%s-D", conf.spool_dir, uid);
192 192 struct stat stat_buf;
193 if(spool_lock(uid)){ 193
194 194 if (spool_lock(uid)) {
195 if(stat(hdr_name, &stat_buf) == 0){ 195
196 if(unlink(hdr_name) != 0){ 196 if (stat(hdr_name, &stat_buf) == 0) {
197 fprintf(stderr, "could not unlink %s: %s\n", hdr_name, strerror(errno)); 197 if (unlink(hdr_name) != 0) {
198 hdr_ok = FALSE; 198 fprintf(stderr, "could not unlink %s: %s\n", hdr_name, strerror(errno));
199 } 199 hdr_ok = FALSE;
200 }else{ 200 }
201 fprintf(stderr, "could not stat file %s: %s\n", hdr_name, strerror(errno)); 201 } else {
202 hdr_ok = FALSE; 202 fprintf(stderr, "could not stat file %s: %s\n", hdr_name, strerror(errno));
203 } 203 hdr_ok = FALSE;
204 if(stat(dat_name, &stat_buf) == 0){ 204 }
205 if(unlink(dat_name) != 0){ 205 if (stat(dat_name, &stat_buf) == 0) {
206 fprintf(stderr, "could not unlink %s: %s\n", dat_name, strerror(errno)); 206 if (unlink(dat_name) != 0) {
207 dat_ok = FALSE; 207 fprintf(stderr, "could not unlink %s: %s\n", dat_name, strerror(errno));
208 } 208 dat_ok = FALSE;
209 }else{ 209 }
210 fprintf(stderr, "could not stat file %s: %s\n", dat_name, strerror(errno)); 210 } else {
211 dat_ok = FALSE; 211 fprintf(stderr, "could not stat file %s: %s\n", dat_name, strerror(errno));
212 } 212 dat_ok = FALSE;
213 printf("message %s deleted\n", uid); 213 }
214 214 printf("message %s deleted\n", uid);
215 spool_unlock(uid); 215
216 216 spool_unlock(uid);
217 }else{ 217
218 218 } else {
219 fprintf(stderr, "message %s is locked.\n", uid); 219
220 return FALSE; 220 fprintf(stderr, "message %s is locked.\n", uid);
221 } 221 return FALSE;
222 222 }
223 return (dat_ok && hdr_ok); 223
224 } 224 return (dat_ok && hdr_ok);
225 }