From cb65cf45e6665e9a32c1667cd1686fbbc358046a Mon Sep 17 00:00:00 2001
From: lazedo <luis.azedo@factorlusitano.com>
Date: Sat, 14 Dec 2019 11:50:38 +0000
Subject: [PATCH] Update message-role.cfg

---
 kamailio/message-role.cfg | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/kamailio/message-role.cfg b/kamailio/message-role.cfg
index 08cddc5..47abb32 100644
--- a/kamailio/message-role.cfg
+++ b/kamailio/message-role.cfg
@@ -28,7 +28,7 @@ route[MESSAGE_INBOUND]
     $var(Payload) = $_s({"Event-Category" : "message", "Event-Name" : "inbound", "Call-ID" : "$ci", "Message-ID" : "$ci", "Route-Type" : "on-net", "Route-ID" : "sip", "From" : "$fU@$fd", "To" : "$tU@$td", "Request" : "$rU@$rd", "Caller-ID-Number" : "$fU", "Callee-ID-Number" : "$tU", "Body" : "$rb", "Custom-SIP-Headers" : $var(headers_json), "Msg-ID" : "$uuid(g)"});
 
     $var(exchange) = "sms";
-    $var(RoutingKey) = $_s(message.inbound.sip.$(ci{kz.encode}));
+    $var(RoutingKey) = $_s(message.inbound.onnet.$(ci{kz.encode}));
     xlog("L_INFO", "$ci|msg|sending inbound message $var(RoutingKey) => $var(Payload)\n");
     kazoo_publish($var(exchange), $var(RoutingKey), $var(Payload));
     sl_send_reply("200", "OK");
@@ -38,17 +38,9 @@ route[MESSAGE_INBOUND]
 
 event_route[kazoo:consumer-event-message-route]
 {
-    $var(uri_username) = "";
-    kazoo_json($kzE, "Endpoints[0].To-Username", "$var(uri_username)");
-    $var(x) = $(kzE{kz.json,Endpoints[0].To-Username});
-    xlog("L_INFO", "$(kzE{kz.json,Call-ID})|log|received message route for $(kzE{kz.json,Endpoints[0].To-DID})\n");
-    if( $var(uri_username) != "" ) {
-        $var(from_uri) = "sip:" + $(kzE{kz.json,Caller-ID-Number}) + "@" + $(kzE{kz.json,Endpoints[0].To-Realm});
-        $var(to_uri) = "sip:" + $(kzE{kz.json,Endpoints[0].To-Username}) + "@" + $(kzE{kz.json,Endpoints[0].To-Realm});
-    } else {
-        $var(from_uri) = "sip:" + $(kzE{kz.json,Caller-ID-Number}) + $(kzE{kz.json,Endpoints[0].To-Realm});
-        $var(to_uri) = $(kzE{kz.json,Endpoints[0].Route});
-    }
+    xlog("L_INFO", "$(kzE{kz.json,Message-ID})|log|received message outbound for $(kzE{kz.json,Endpoints[0].To-DID})\n");
+    $var(from_uri) = $_s(sip:$(kzE{kz.json,From}));
+    $var(to_uri) = $_s(sip:$(kzE{kz.json,Endpoints[0].To-Username})@$(kzE{kz.json,Endpoints[0].To-Realm}));
     $uac_req(method)="MESSAGE";
     $uac_req(body)= $kzE;
     $uac_req(hdrs)="X-TM-Local: MESSAGE_ROUTE\r\nX-KAZOO-AOR: " + $var(to_uri)+ "\r\nContent-Type: text/plain\r\n";
@@ -56,8 +48,8 @@ event_route[kazoo:consumer-event-message-route]
     $uac_req(ruri) = $var(to_uri);
     $uac_req(furi) = $var(from_uri);
     $uac_req(ouri) = "sip:127.0.0.1:5090;transport=tcp";
-    $uac_req(callid) = $(kzE{kz.json,Call-ID});
-    xlog("L_INFO", "$(kzE{kz.json,Call-ID})|log|sending message from $var(from_uri) to $var(to_uri) \n");
+    $uac_req(callid) = $(kzE{kz.json,Message-ID});
+    xlog("L_INFO", "$(kzE{kz.json,Message-ID})|log|sending message from $var(from_uri) to $var(to_uri) \n");
     uac_req_send();
 }