From b6d98d8464c62d02a60713410334ac68e98a57bd Mon Sep 17 00:00:00 2001 From: Kirill Solomko Date: Tue, 19 Mar 2019 11:50:23 +0100 Subject: [PATCH] TT#54914 fix provisoniong.voip_peer_rules triggers ip_addr join * provisioning.voip_peer_rules triggers use internally a join by IP address to insert/update entries in kamailio.lcr_rule_target. in cases where there are 2 hosts per peering group with the same IP address, the triggers fail because they select duplicate peer hosts. to address that the "lcr_rule_target join" in the relevant triggers is adjusted to join the hosts tables by gw_name isntead, since gw_name is guaranteed unique per peer group (controlled by a unique key) Change-Id: I36669efc22bb62ad34c57aac4d978435dbb26f0c --- db_scripts/diff/15520.down | 76 ++++++++++++++++++++++++++++++++++++++ db_scripts/diff/15520.up | 76 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 db_scripts/diff/15520.down create mode 100644 db_scripts/diff/15520.up diff --git a/db_scripts/diff/15520.down b/db_scripts/diff/15520.down new file mode 100644 index 00000000..bf84f5a5 --- /dev/null +++ b/db_scripts/diff/15520.down @@ -0,0 +1,76 @@ +USE provisioning; + +DROP TRIGGER IF EXISTS voip_prul_crepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_prul_crepl_trig AFTER INSERT ON voip_peer_rules + FOR EACH ROW BEGIN + + IF NEW.enabled = 1 THEN + INSERT INTO kamailio.lcr_rule (lcr_id, prefix, request_uri, from_uri, stopper, enabled, group_id) + VALUES(1, NEW.callee_prefix, NEW.callee_pattern, NEW.caller_pattern, NEW.stopper, 1, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, LAST_INSERT_ID(), gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.ip = gw.ip_addr + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + END IF; + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_prul_urepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_prul_urepl_trig AFTER UPDATE ON voip_peer_rules + FOR EACH ROW BEGIN + + IF OLD.enabled = 1 AND NEW.enabled = 1 THEN + UPDATE kamailio.lcr_rule + SET prefix = NEW.callee_prefix, + request_uri = NEW.callee_pattern, + from_uri = NEW.caller_pattern, + stopper = NEW.stopper, + group_id = NEW.group_id + WHERE prefix <=> OLD.callee_prefix + AND request_uri <=> OLD.callee_pattern + AND from_uri <=> OLD.caller_pattern + AND group_id <=> OLD.group_id + AND stopper <=> OLD.stopper; + IF OLD.group_id != NEW.group_id THEN + DELETE FROM kamailio.lcr_rule_target WHERE rule_id = OLD.id; + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, OLD.id, gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.ip = gw.ip_addr + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + END IF; + ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN + INSERT INTO kamailio.lcr_rule (lcr_id, prefix, request_uri, from_uri, stopper, enabled, group_id) + VALUES(1, NEW.callee_prefix, NEW.callee_pattern, NEW.caller_pattern, NEW.stopper, 1, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, LAST_INSERT_ID(), gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.ip = gw.ip_addr + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN + DELETE FROM kamailio.lcr_rule + WHERE prefix <=> OLD.callee_prefix + AND request_uri <=> OLD.callee_pattern + AND from_uri <=> OLD.caller_pattern + AND group_id <=> OLD.group_id + AND stopper <=> OLD.stopper + LIMIT 1; + END IF; + + END */;; +DELIMITER ; diff --git a/db_scripts/diff/15520.up b/db_scripts/diff/15520.up new file mode 100644 index 00000000..dc05e146 --- /dev/null +++ b/db_scripts/diff/15520.up @@ -0,0 +1,76 @@ +USE provisioning; + +DROP TRIGGER IF EXISTS voip_prul_crepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_prul_crepl_trig AFTER INSERT ON voip_peer_rules + FOR EACH ROW BEGIN + + IF NEW.enabled = 1 THEN + INSERT INTO kamailio.lcr_rule (lcr_id, prefix, request_uri, from_uri, stopper, enabled, group_id) + VALUES(1, NEW.callee_prefix, NEW.callee_pattern, NEW.caller_pattern, NEW.stopper, 1, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, LAST_INSERT_ID(), gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.name = gw.gw_name + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + END IF; + + END */;; +DELIMITER ; + +DROP TRIGGER IF EXISTS voip_prul_urepl_trig; +DELIMITER ;; +/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_prul_urepl_trig AFTER UPDATE ON voip_peer_rules + FOR EACH ROW BEGIN + + IF OLD.enabled = 1 AND NEW.enabled = 1 THEN + UPDATE kamailio.lcr_rule + SET prefix = NEW.callee_prefix, + request_uri = NEW.callee_pattern, + from_uri = NEW.caller_pattern, + stopper = NEW.stopper, + group_id = NEW.group_id + WHERE prefix <=> OLD.callee_prefix + AND request_uri <=> OLD.callee_pattern + AND from_uri <=> OLD.caller_pattern + AND group_id <=> OLD.group_id + AND stopper <=> OLD.stopper; + IF OLD.group_id != NEW.group_id THEN + DELETE FROM kamailio.lcr_rule_target WHERE rule_id = OLD.id; + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, OLD.id, gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.name = gw.gw_name + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + END IF; + ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN + INSERT INTO kamailio.lcr_rule (lcr_id, prefix, request_uri, from_uri, stopper, enabled, group_id) + VALUES(1, NEW.callee_prefix, NEW.callee_pattern, NEW.caller_pattern, NEW.stopper, 1, NEW.group_id); + + INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight) + SELECT gw.lcr_id, LAST_INSERT_ID(), gw.id, vpg.priority, vph.weight + FROM kamailio.lcr_gw gw + INNER JOIN provisioning.voip_peer_hosts vph ON vph.name = gw.gw_name + AND gw.lcr_id = 1 + AND vph.group_id = gw.group_id + INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = vph.group_id + WHERE vph.group_id <=> NEW.group_id; + ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN + DELETE FROM kamailio.lcr_rule + WHERE prefix <=> OLD.callee_prefix + AND request_uri <=> OLD.callee_pattern + AND from_uri <=> OLD.caller_pattern + AND group_id <=> OLD.group_id + AND stopper <=> OLD.stopper + LIMIT 1; + END IF; + + END */;; +DELIMITER ;