[Project] Adopt main routines and plugins

1 files changed, 33 insertions, 44 deletions

diff --git a/src/plugins/surbl.c b/src/plugins/surbl.c
index baf985c39..860f4b5e5 100644
--- a/src/plugins/surbl.c
+++ b/src/plugins/surbl.c
@@ -1579,8 +1579,7 @@ process_dns_results (struct rspamd_task *task,
 
 		bit = g_hash_table_lookup (suffix->ips, &addr);
 		if (bit != NULL) {
-			msg_info_surbl ("<%s> domain [%s] is in surbl %s(%xd)",
-					task->message_id,
+			msg_info_surbl ("domain [%s] is in surbl %s(%xd)",
 					resolved_name, suffix->suffix,
 					bit->bit);
 			rspamd_task_insert_result (task, bit->symbol, 1, resolved_name);
@@ -1602,8 +1601,7 @@ process_dns_results (struct rspamd_task *task,
 
 			if (((gint)bit->bit & (gint)ntohl (addr)) != 0) {
 				got_result = TRUE;
-				msg_info_surbl ("<%s> domain [%s] is in surbl %s(%xd)",
-						task->message_id,
+				msg_info_surbl ("domain [%s] is in surbl %s(%xd)",
 						resolved_name, suffix->suffix,
 						bit->bit);
 				rspamd_task_insert_result (task, bit->symbol, 1, resolved_name);
@@ -1617,8 +1615,7 @@ process_dns_results (struct rspamd_task *task,
 	if (!got_result) {
 		if ((suffix->bits == NULL || suffix->bits->len == 0) &&
 				suffix->ips == NULL) {
-			msg_info_surbl ("<%s> domain [%s] is in surbl %s",
-					task->message_id,
+			msg_info_surbl ("domain [%s] is in surbl %s",
 					resolved_name, suffix->suffix);
 			rspamd_task_insert_result (task, suffix->symbol, 1, resolved_name);
 
@@ -1628,8 +1625,7 @@ process_dns_results (struct rspamd_task *task,
 		}
 		else {
 			ina.s_addr = addr;
-			msg_info_surbl ("<%s> domain [%s] is in surbl %s but at unknown result: %s",
-					task->message_id,
+			msg_info_surbl ("domain [%s] is in surbl %s but at unknown result: %s",
 					resolved_name, suffix->suffix,
 					inet_ntoa (ina));
 		}
@@ -1645,8 +1641,7 @@ surbl_dns_callback (struct rdns_reply *reply, gpointer arg)
 
 	task = param->task;
 	if (reply->code == RDNS_RC_NOERROR && reply->entries) {
-		msg_debug_surbl ("<%s> domain [%s] is in surbl %s",
-				param->task->message_id,
+		msg_debug_surbl ("domain [%s] is in surbl %s",
 				param->host_orig, param->suffix->suffix);
 
 		DL_FOREACH (reply->entries, elt) {
@@ -1659,8 +1654,8 @@ surbl_dns_callback (struct rdns_reply *reply, gpointer arg)
 	}
 	else {
 		if (reply->code == RDNS_RC_NXDOMAIN || reply->code == RDNS_RC_NOREC) {
-			msg_debug_surbl ("<%s> domain [%s] is not in surbl %s",
-					param->task->message_id, param->host_orig,
+			msg_debug_surbl ("domain [%s] is not in surbl %s",
+					param->host_orig,
 					param->suffix->suffix);
 		}
 		else {
@@ -1705,8 +1700,7 @@ surbl_dns_ip_callback (struct rdns_reply *reply, gpointer arg)
 						ip_addr >> 8 & 0xff,
 						ip_addr & 0xff, param->suffix->suffix);
 				msg_debug_surbl (
-						"<%s> domain [%s] send %v request to surbl",
-						param->task->message_id,
+						"domain [%s] send %v request to surbl",
 						param->host_orig,
 						to_resolve);
 
@@ -1721,8 +1715,8 @@ surbl_dns_ip_callback (struct rdns_reply *reply, gpointer arg)
 		}
 	}
 	else {
-		msg_debug_surbl ("<%s> domain [%s] cannot be resolved for SURBL check %s",
-				param->task->message_id, param->host_resolve,
+		msg_debug_surbl ("domain [%s] cannot be resolved for SURBL check %s",
+				param->host_resolve,
 				param->suffix->suffix);
 
 	}
@@ -1778,8 +1772,7 @@ surbl_redirector_finish (struct rspamd_http_connection *conn,
 		hdr = rspamd_http_message_find_header (msg, "Uri");
 
 		if (hdr != NULL) {
-			msg_info_surbl ("<%s> got reply from redirector: '%*s' -> '%T'",
-					param->task->message_id,
+			msg_info_surbl ("got reply from redirector: '%*s' -> '%T'",
 					param->url->urllen, param->url->string,
 					hdr);
 			urllen = hdr->len;
@@ -1792,8 +1785,9 @@ surbl_redirector_finish (struct rspamd_http_connection *conn,
 					task->task_pool, RSPAMD_URL_PARSE_TEXT);
 
 			if (r == URI_ERRNO_OK) {
-				if ((existing = g_hash_table_lookup (task->urls, redirected_url)) == NULL) {
-					g_hash_table_insert (task->urls, redirected_url,
+				if ((existing = g_hash_table_lookup (MESSAGE_FIELD (task, urls),
+						redirected_url)) == NULL) {
+					g_hash_table_insert (MESSAGE_FIELD (task, urls), redirected_url,
 							redirected_url);
 					redirected_url->phished_url = param->url;
 					redirected_url->flags |= RSPAMD_URL_FLAG_REDIRECTED;
@@ -1813,8 +1807,7 @@ surbl_redirector_finish (struct rspamd_http_connection *conn,
 		}
 	}
 	else {
-		msg_info_surbl ("<%s> could not resolve '%*s' on redirector",
-				param->task->message_id,
+		msg_info_surbl ("could not resolve '%*s' on redirector",
 				param->url->urllen, param->url->string);
 	}
 
@@ -1852,8 +1845,7 @@ register_redirector_call (struct rspamd_url *url, struct rspamd_task *task,
 		}
 
 		if (param->conn == NULL) {
-			msg_info_surbl ("<%s> cannot create tcp socket failed: %s",
-					task->message_id,
+			msg_info_surbl ("cannot create tcp socket failed: %s",
 					strerror (errno));
 
 			return;
@@ -1880,8 +1872,7 @@ register_redirector_call (struct rspamd_url *url, struct rspamd_task *task,
 				NULL, param, surbl_module_ctx->read_timeout);
 
 		msg_info_surbl (
-				"<%s> registered redirector call for %*s to %s, according to rule: %s",
-				task->message_id,
+				"registered redirector call for %*s to %s, according to rule: %s",
 				url->urllen, url->string,
 				rspamd_upstream_name (param->redirector),
 				rule);
@@ -1909,8 +1900,7 @@ surbl_test_tags (struct rspamd_task *task, struct redirector_param *param,
 		/* We know results for this URL */
 
 		DL_FOREACH (tag, cur) {
-			msg_info_surbl ("<%s> domain [%s] is in surbl %s (tags)",
-					task->message_id,
+			msg_info_surbl ("domain [%s] is in surbl %s (tags)",
 					ftld, cur->data);
 			rspamd_task_insert_result (task, cur->data, 1, ftld);
 		}
@@ -2084,19 +2074,19 @@ surbl_test_url (struct rspamd_task *task,
 	rspamd_mempool_add_destructor (task->task_pool,
 		(rspamd_mempool_destruct_t)g_hash_table_unref,
 		param->tree);
-	g_hash_table_foreach (task->urls, surbl_tree_url_callback, param);
+	g_hash_table_foreach (MESSAGE_FIELD (task, urls),
+			surbl_tree_url_callback, param);
 
 	rspamd_symcache_item_async_inc (task, item, M);
 
 	if (suffix->options & SURBL_OPTION_CHECKEMAILS) {
-		g_hash_table_foreach (task->emails, surbl_tree_url_callback, param);
+		g_hash_table_foreach (MESSAGE_FIELD (task, emails),
+				surbl_tree_url_callback, param);
 	}
 
 	/* We also need to check and process img URLs */
 	if (suffix->options & SURBL_OPTION_CHECKIMAGES) {
-		for (i = 0; i < task->text_parts->len; i ++) {
-			part = g_ptr_array_index (task->text_parts, i);
-
+		PTR_ARRAY_FOREACH (MESSAGE_FIELD (task, text_parts), i, part) {
 			if (part->html && part->html->images) {
 				for (j = 0; j < part->html->images->len; j ++) {
 					img = g_ptr_array_index (part->html->images, j);
@@ -2166,11 +2156,11 @@ surbl_test_redirector (struct rspamd_task *task,
 	param->redirector_requests = 0;
 	param->ctx = surbl_module_ctx;
 	param->item = item;
-	g_hash_table_foreach (task->urls, surbl_tree_redirector_callback, param);
+	g_hash_table_foreach (MESSAGE_FIELD (task, urls),
+			surbl_tree_redirector_callback, param);
 
 	/* We also need to check and process img URLs */
-	for (i = 0; i < task->text_parts->len; i ++) {
-		part = g_ptr_array_index (task->text_parts, i);
+	PTR_ARRAY_FOREACH (MESSAGE_FIELD (task, text_parts), i, part) {
 		if (part->html && part->html->images) {
 			for (j = 0; j < part->html->images->len; j ++) {
 				img = g_ptr_array_index (part->html->images, j);
@@ -2314,8 +2304,7 @@ surbl_continue_process_handler (lua_State *L)
 		surbl_module_ctx = surbl_get_context (task->cfg);
 
 		if (nurl != NULL) {
-			msg_info_surbl ("<%s> got reply from redirector: '%*s' -> '%*s'",
-					param->task->message_id,
+			msg_info_surbl ("got reply from redirector: '%*s' -> '%*s'",
 					param->url->urllen, param->url->string,
 					(gint)urllen, nurl);
 			urlstr = rspamd_mempool_alloc (task->task_pool,
@@ -2327,8 +2316,10 @@ surbl_continue_process_handler (lua_State *L)
 					task->task_pool, RSPAMD_URL_PARSE_TEXT);
 
 			if (r == URI_ERRNO_OK) {
-				if (!g_hash_table_lookup (task->urls, redirected_url)) {
-					g_hash_table_insert (task->urls, redirected_url,
+				if (!g_hash_table_lookup (MESSAGE_FIELD (task, urls),
+						redirected_url)) {
+					g_hash_table_insert (MESSAGE_FIELD (task, urls),
+							redirected_url,
 							redirected_url);
 					redirected_url->phished_url = param->url;
 					redirected_url->flags |= RSPAMD_URL_FLAG_REDIRECTED;
@@ -2340,14 +2331,12 @@ surbl_continue_process_handler (lua_State *L)
 				}
 			}
 			else {
-				msg_info_surbl ("<%s> could not resolve '%*s' on redirector",
-						param->task->message_id,
+				msg_info_surbl ("could not resolve '%*s' on redirector",
 						param->url->urllen, param->url->string);
 			}
 		}
 		else {
-			msg_info_surbl ("<%s> could not resolve '%*s' on redirector",
-					param->task->message_id,
+			msg_info_surbl ("could not resolve '%*s' on redirector",
 					param->url->urllen, param->url->string);
 		}
 	}