From b1daeaca382d39a76ed5d45a052f18cffa09298c Mon Sep 17 00:00:00 2001 From: lazedo Date: Mon, 25 Jan 2016 13:19:20 +0000 Subject: [PATCH] presence: add flags and user_agent to schema --- lib/srdb1/schema/pr_active_watchers.xml | 18 ++++++++++- .../db_berkeley/kamailio/active_watchers | 4 +-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/presence-create.sql | 4 ++- utils/kamctl/dbtext/kamailio/active_watchers | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/presence-create.sql | 4 ++- utils/kamctl/oracle/presence-create.sql | 4 ++- utils/kamctl/postgres/presence-create.sql | 4 ++- utils/kamctl/xhttp_pi/pi_framework.xml | 30 ++++++++++++------- utils/kamctl/xhttp_pi/presence-mod | 6 ++++ utils/kamctl/xhttp_pi/presence-table | 2 ++ 12 files changed, 61 insertions(+), 21 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 96899f89fcd..74826d05f8e 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -9,7 +9,7 @@ active_watchers - 11 + 12&MYSQL_TABLE_TYPE; Table for the presence module. More information can be found at: &KAMAILIO_MOD_DOC;presence.html @@ -200,6 +200,22 @@ Update winfo flag + + flags + int + &flag_len; + 0 + Branch and contact flags + + + + user_agent + string + &hf_len; + + User-Agent header field contains information about the UAC originating the request. + + active_watchers_idx diff --git a/utils/kamctl/db_berkeley/kamailio/active_watchers b/utils/kamctl/db_berkeley/kamailio/active_watchers index 104c998f403..18c0ec47744 100644 --- a/utils/kamctl/db_berkeley/kamailio/active_watchers +++ b/utils/kamctl/db_berkeley/kamailio/active_watchers @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) presentity_uri(str) watcher_username(str) watcher_domain(str) to_user(str) to_domain(str) event(str) event_id(str) to_tag(str) from_tag(str) callid(str) local_cseq(int) remote_cseq(int) contact(str) record_route(str) expires(int) status(int) reason(str) version(int) socket_info(str) local_contact(str) from_user(str) from_domain(str) updated(int) updated_winfo(int) +id(int) presentity_uri(str) watcher_username(str) watcher_domain(str) to_user(str) to_domain(str) event(str) event_id(str) to_tag(str) from_tag(str) callid(str) local_cseq(int) remote_cseq(int) contact(str) record_route(str) expires(int) status(int) reason(str) version(int) socket_info(str) local_contact(str) from_user(str) from_domain(str) updated(int) updated_winfo(int) flags(int) user_agent(str) METADATA_KEY 1 6 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|'presence'|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|2|NIL|0|NIL|NIL|NIL|NIL|NIL|NIL +NIL|NIL|NIL|NIL|NIL|NIL|'presence'|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|2|NIL|0|NIL|NIL|NIL|NIL|NIL|NIL|0|'' diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 605f88ec276..3e5c0ac17f8 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -15,7 +15,7 @@ acc|5 acc_cdrs| acc_cdrs|2 active_watchers| -active_watchers|11 +active_watchers|12 address| address|6 aliases| diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 3e01f415f2d..a84ee999656 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -43,6 +43,8 @@ CREATE TABLE active_watchers ( from_domain VARCHAR(64) NOT NULL, updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, + flags INTEGER DEFAULT 0 NOT NULL, + user_agent VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); @@ -51,7 +53,7 @@ CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); CREATE INDEX active_watchers_updated_winfo_idx ON active_watchers (updated_winfo, presentity_uri); -INSERT INTO version (table_name, table_version) values ('active_watchers','11'); +INSERT INTO version (table_name, table_version) values ('active_watchers','12'); CREATE TABLE watchers ( id INTEGER PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index 9bd9129d255..b4053a323e7 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 28a4c17f66b..7a5406fbffb 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -2,7 +2,7 @@ table_name(string) table_version(int) version:1 acc:5 acc_cdrs:2 -active_watchers:11 +active_watchers:12 address:6 aliases:8 carrier_name:1 diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index fb376220a56..c4423b508ec 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -43,6 +43,8 @@ CREATE TABLE `active_watchers` ( `from_domain` VARCHAR(64) NOT NULL, `updated` INT(11) NOT NULL, `updated_winfo` INT(11) NOT NULL, + `flags` INT(11) DEFAULT 0 NOT NULL, + `user_agent` VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT active_watchers_idx UNIQUE (`callid`, `to_tag`, `from_tag`) ); @@ -51,7 +53,7 @@ CREATE INDEX active_watchers_pres ON active_watchers (`presentity_uri`, `event`) CREATE INDEX updated_idx ON active_watchers (`updated`); CREATE INDEX updated_winfo_idx ON active_watchers (`updated_winfo`, `presentity_uri`); -INSERT INTO version (table_name, table_version) values ('active_watchers','11'); +INSERT INTO version (table_name, table_version) values ('active_watchers','12'); CREATE TABLE `watchers` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index ba818b7763d..f7a595dfe06 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -51,6 +51,8 @@ CREATE TABLE active_watchers ( from_domain VARCHAR2(64), updated NUMBER(10), updated_winfo NUMBER(10), + flags NUMBER(10) DEFAULT 0 NOT NULL, + user_agent VARCHAR2(255) DEFAULT '', CONSTRAINT ORA_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); @@ -67,7 +69,7 @@ CREATE INDEX ORA_active_watchers_pres ON active_watchers (presentity_uri, event CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); CREATE INDEX ORA_updated_winfo_idx ON active_watchers (updated_winfo, presentity_uri); -INSERT INTO version (table_name, table_version) values ('active_watchers','11'); +INSERT INTO version (table_name, table_version) values ('active_watchers','12'); CREATE TABLE watchers ( id NUMBER(10) PRIMARY KEY, diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 30d4240f490..aa0efc80341 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -43,6 +43,8 @@ CREATE TABLE active_watchers ( from_domain VARCHAR(64) NOT NULL, updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, + flags INTEGER DEFAULT 0 NOT NULL, + user_agent VARCHAR(255) DEFAULT '' NOT NULL, CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); @@ -51,7 +53,7 @@ CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity CREATE INDEX active_watchers_updated_idx ON active_watchers (updated); CREATE INDEX active_watchers_updated_winfo_idx ON active_watchers (updated_winfo, presentity_uri); -INSERT INTO version (table_name, table_version) values ('active_watchers','11'); +INSERT INTO version (table_name, table_version) values ('active_watchers','12'); CREATE TABLE watchers ( id SERIAL PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index b4b7d3109ac..016fae10b1a 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -221,6 +221,17 @@ attrsDB1_STR descriptionDB1_STR + + + domainpolicy + mysql + idDB1_INT + ruleDB1_STR + typeDB1_STR + attDB1_STR + valDB1_STR + descriptionDB1_STR + domain @@ -241,17 +252,6 @@ valueDB1_STR last_modifiedDB1_DATETIME - - - domainpolicy - mysql - idDB1_INT - ruleDB1_STR - typeDB1_STR - attDB1_STR - valDB1_STR - descriptionDB1_STR - dr_gateways @@ -536,6 +536,8 @@ from_domainDB1_STR updatedDB1_INT updated_winfoDB1_INT + flagsDB1_INT + user_agentDB1_STR @@ -2975,6 +2977,8 @@ from_domainupdatedupdated_winfo + flags + user_agentadd @@ -3005,6 +3009,8 @@ from_domainupdatedupdated_winfo + flags + user_agentupdate @@ -3038,6 +3044,8 @@ from_domainupdatedupdated_winfo + flags + user_agentdelete diff --git a/utils/kamctl/xhttp_pi/presence-mod b/utils/kamctl/xhttp_pi/presence-mod index 1c0b4818803..f2b2f607ff6 100644 --- a/utils/kamctl/xhttp_pi/presence-mod +++ b/utils/kamctl/xhttp_pi/presence-mod @@ -88,6 +88,8 @@ from_domainupdatedupdated_winfo + flags + user_agentadd @@ -118,6 +120,8 @@ from_domainupdatedupdated_winfo + flags + user_agentupdate @@ -151,6 +155,8 @@ from_domainupdatedupdated_winfo + flags + user_agentdelete diff --git a/utils/kamctl/xhttp_pi/presence-table b/utils/kamctl/xhttp_pi/presence-table index 53ee3827a3d..450c24c996d 100644 --- a/utils/kamctl/xhttp_pi/presence-table +++ b/utils/kamctl/xhttp_pi/presence-table @@ -42,6 +42,8 @@ from_domainDB1_STR updatedDB1_INT updated_winfoDB1_INT + flagsDB1_INT + user_agentDB1_STR