[sr-dev] git:master:3ae78d88: Revert "dmq: do not parse From header again, since it was done already prior to cloning msg."

Charles Chance charles.chance at sipcentric.com
Fri Jan 30 17:28:29 CET 2015


Module: kamailio
Branch: master
Commit: 3ae78d88678a64fe59a925c8e3e257e046464c97
URL: https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97

Author: Charles Chance <charles.chance at sipcentric.com>
Committer: Charles Chance <charles.chance at sipcentric.com>
Date: 2015-01-30T16:27:29Z

Revert "dmq: do not parse From header again, since it was done already prior to cloning msg."

This reverts commit 102504294f9edaaee9d4baea873d4ed9151b8fed.

---

Modified: modules/dmq/worker.c

---

Diff:  https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97.diff
Patch: https://github.com/kamailio/kamailio/commit/3ae78d88678a64fe59a925c8e3e257e046464c97.patch

---

diff --git a/modules/dmq/worker.c b/modules/dmq/worker.c
index ca1b3dc..8426730 100644
--- a/modules/dmq/worker.c
+++ b/modules/dmq/worker.c
@@ -91,11 +91,11 @@ void worker_loop(int id)
 			current_job = job_queue_pop(worker->queue);
 			/* job_queue_pop might return NULL if queue is empty */
 			if(current_job) {
-				/* attempt to identify node based on from uri */
-				if (current_job->msg->from->parsed) {
-					dmq_node = find_dmq_node_uri(node_list, &((struct to_body*)current_job->msg->from->parsed)->uri);
-				} else {
+				/* extract the from uri */
+				if (parse_from_header(current_job->msg) < 0) {
 					LM_ERR("bad sip message or missing From hdr\n");
+				} else {
+					dmq_node = find_dmq_node_uri(node_list, &((struct to_body*)current_job->msg->from->parsed)->uri);
 				}
 
 				ret_value = current_job->f(current_job->msg, &peer_response, dmq_node);




More information about the sr-dev mailing list