TT#49100 Fix issue with trigger where peering host name was not always quoted

Change-Id: I37b02dbe5b4879369da2868c7c6717e21aec2cc6
(cherry picked from commit 97a791a3e2)
changes/28/25628/1
Andrew Pogrebennyk 6 years ago
parent f5482ccbce
commit 9835853ac7

@ -0,0 +1,74 @@
USE provisioning;
DROP TRIGGER IF EXISTS voip_phost_urepl_trig;
DELIMITER ;;
/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_urepl_trig AFTER UPDATE ON voip_peer_hosts
FOR EACH ROW BEGIN
DECLARE m_proto CHAR(4);
DECLARE m_probechange INTEGER;
IF NEW.transport = 2 THEN
SET m_proto := 'TCP';
ELSEIF NEW.transport = 3 THEN
SET m_proto := 'TLS';
ELSE
SET m_proto := 'UDP';
END IF;
IF OLD.enabled = 1 AND NEW.enabled = 1 THEN
UPDATE kamailio.lcr_gw
SET gw_name = NEW.name, ip_addr = NEW.ip, hostname = NEW.host, port = NEW.port, transport = NEW.transport, flags = NEW.id
WHERE lcr_id = 1
AND flags <=> NEW.id;
UPDATE kamailio.lcr_rule_target rt, kamailio.lcr_gw gw
SET rt.weight = NEW.weight
WHERE gw.id <=> rt.gw_id
AND gw.lcr_id = 1
AND gw.group_id <=> NEW.group_id
AND gw.flags <=> NEW.id;
IF OLD.probe = 1 AND (OLD.ip != NEW.ip OR OLD.port != NEW.port OR OLD.transport != NEW.transport OR OLD.name != NEW.name OR OLD.group_id != NEW.group_id) THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%');
SET m_probechange := 1;
ELSEIF OLD.probe = 1 and NEW.probe = 0 THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%');
END IF;
IF NEW.probe = 1 AND (m_probechange = 1 OR OLD.probe = 0) THEN
INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description)
VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername="', NEW.name, '";peergid=', NEW.group_id, ';'), 'Peer Probe');
END IF;
ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN
INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id)
VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id);
INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight)
SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight
FROM kamailio.lcr_rule rule
INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id
WHERE vpg.id <=> NEW.group_id;
IF NEW.probe = 1 THEN
INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description)
VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername=', NEW.name, ';peergid=', NEW.group_id, ';'), 'Peer Probe');
END IF;
ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN
DELETE FROM kamailio.lcr_gw
WHERE lcr_id = 1
AND flags <=> NEW.id;
IF OLD.probe = 1 THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', NEW.id, ';%');
END IF;
END IF;
END */;;
DELIMITER ;

@ -0,0 +1,74 @@
USE provisioning;
DROP TRIGGER IF EXISTS voip_phost_urepl_trig;
DELIMITER ;;
/*!50003 CREATE*/ /*!50017 DEFINER=`sipwise`@`localhost`*/ /*!50003 TRIGGER voip_phost_urepl_trig AFTER UPDATE ON voip_peer_hosts
FOR EACH ROW BEGIN
DECLARE m_proto CHAR(4);
DECLARE m_probechange INTEGER;
IF NEW.transport = 2 THEN
SET m_proto := 'TCP';
ELSEIF NEW.transport = 3 THEN
SET m_proto := 'TLS';
ELSE
SET m_proto := 'UDP';
END IF;
IF OLD.enabled = 1 AND NEW.enabled = 1 THEN
UPDATE kamailio.lcr_gw
SET gw_name = NEW.name, ip_addr = NEW.ip, hostname = NEW.host, port = NEW.port, transport = NEW.transport, flags = NEW.id
WHERE lcr_id = 1
AND flags <=> NEW.id;
UPDATE kamailio.lcr_rule_target rt, kamailio.lcr_gw gw
SET rt.weight = NEW.weight
WHERE gw.id <=> rt.gw_id
AND gw.lcr_id = 1
AND gw.group_id <=> NEW.group_id
AND gw.flags <=> NEW.id;
IF OLD.probe = 1 AND (OLD.ip != NEW.ip OR OLD.port != NEW.port OR OLD.transport != NEW.transport OR OLD.name != NEW.name OR OLD.group_id != NEW.group_id) THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%');
SET m_probechange := 1;
ELSEIF OLD.probe = 1 and NEW.probe = 0 THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', OLD.id, ';%');
END IF;
IF NEW.probe = 1 AND (m_probechange = 1 OR OLD.probe = 0) THEN
INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description)
VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername="', NEW.name, '";peergid=', NEW.group_id, ';'), 'Peer Probe');
END IF;
ELSEIF OLD.enabled = 0 AND NEW.enabled = 1 THEN
INSERT INTO kamailio.lcr_gw (lcr_id, gw_name, ip_addr, hostname, port, uri_scheme, transport, strip, flags, group_id)
VALUES(1, NEW.name, NEW.ip, NEW.host, NEW.port, 1, NEW.transport, 0, NEW.id, NEW.group_id);
INSERT INTO kamailio.lcr_rule_target (lcr_id, rule_id, gw_id, priority, weight)
SELECT rule.lcr_id, rule.id, LAST_INSERT_ID(), vpg.priority, NEW.weight
FROM kamailio.lcr_rule rule
INNER JOIN provisioning.voip_peer_groups vpg ON vpg.id = rule.group_id
WHERE vpg.id <=> NEW.group_id;
IF NEW.probe = 1 THEN
INSERT INTO kamailio.dispatcher (setid, destination, flags, priority, attrs, description)
VALUES(100, CONCAT('sip:', NEW.ip, ':', NEW.port, ';transport=', m_proto), 0, 0, CONCAT('peerid=', NEW.id, ';peername="', NEW.name, '";peergid=', NEW.group_id, ';'), 'Peer Probe');
END IF;
ELSEIF OLD.enabled = 1 AND NEW.enabled = 0 THEN
DELETE FROM kamailio.lcr_gw
WHERE lcr_id = 1
AND flags <=> NEW.id;
IF OLD.probe = 1 THEN
DELETE FROM kamailio.dispatcher WHERE attrs LIKE CONCAT('%peerid=', NEW.id, ';%');
END IF;
END IF;
END */;;
DELIMITER ;
Loading…
Cancel
Save