sr-dev July 2011

sr-dev@lists.kamailio.org

28 participants
198 discussions

git:master: modules_k/uac: Add reg_request_to function

by Alex Hermann

Module: sip-router Branch: master Commit: 30bec8e614018a7d4949cee0f9a38b512effe455 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30bec8e… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Fri Jun 10 13:00:20 2011 +0200 modules_k/uac: Add reg_request_to function This function will lookup a local user from the registration table and prepares mesasage variables so the request can be sent to the remote user, providing authentiction via uac_auth(). --- modules_k/uac/README | 75 ++++++++++++++++++++++++-------- modules_k/uac/doc/uac_admin.xml | 41 +++++++++++++++++ modules_k/uac/uac.c | 34 ++++++++++++++ modules_k/uac/uac_reg.c | 91 +++++++++++++++++++++++++++++++++++++++ modules_k/uac/uac_reg.h | 1 + 5 files changed, 223 insertions(+), 19 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=30b…

13 years, 3 months

git:master: module_k/xcap_server: Added support HTTP 1.1 pre-conditions ( If-Match: and If-None-Match:)

by Peter Dunkley

Module: sip-router Branch: master Commit: d38e225fbb91128d127770126a42f47d21e238c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d38e225… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jul 29 11:56:14 2011 +0100 module_k/xcap_server: Added support HTTP 1.1 pre-conditions (If-Match: and If-None-Match:) - Also fixed the ETag: header send by xcap_server as it should be a quoted-string (RFC 2616 section 3.11 and 14.19). - If-Match (RFC 2616 section 14.24) and If-None-Match (RFC 2616 section 14.26) are supported for the DELETE, GET, and PUT HTTP requests. This feature is useful as it enables clients to cache large XML documents (user-profiles/avatars/resource-lists) and only have to download them when they have actually changed (using If-None-Match:) If-Match: can help with the race conditions present when you have multiple simultaneous logins by helping to prevent clients from overwriting changes made by other clients. --- modules_k/xcap_server/Makefile | 1 + modules_k/xcap_server/xcap_server.c | 277 +++++++++++++++++++++++++++++------ 2 files changed, 234 insertions(+), 44 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d38…

13 years, 3 months

git:master: core: removing SQL buffer size stuff from doc/cfg_list/docbook/ cfg_core.xml

by Peter Dunkley

Module: sip-router Branch: master Commit: c50367e242afb64352b55bf1eb0959caf594d058 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c50367e… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jul 29 12:19:10 2011 +0100 core: removing SQL buffer size stuff from doc/cfg_list/docbook/cfg_core.xml --- doc/cfg_list/docbook/cfg_core.xml | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/doc/cfg_list/docbook/cfg_core.xml b/doc/cfg_list/docbook/cfg_core.xml index 05ccd80..c2ed233 100644 --- a/doc/cfg_list/docbook/cfg_core.xml +++ b/doc/cfg_list/docbook/cfg_core.xml @@ -520,16 +520,4 @@ </para> </section> -<section id="coresql_buffer_size"> - <title>core.sql_buffer_size</title> - <para> - Size for the SQL buffer. - This will limit the size of objects that can be stored in an SQL database. - </para> - <para>Default value: 65535.</para> - <para>Type: integer.</para> - <para> - </para> -</section> - </chapter>

13 years, 3 months

git:master: modules_k/xcap_server: Improved rls_update_subs() example in README

by Peter Dunkley

Module: sip-router Branch: master Commit: fa4ddbb3d4a56c35822e989c8e48aced51a0bd56 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa4ddbb… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 28 15:38:04 2011 +0100 modules_k/xcap_server: Improved rls_update_subs() example in README --- modules_k/rls/README | 13 ++++++++++++- modules_k/rls/doc/rls_admin.xml | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index b23953f..34f1d66 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -402,7 +402,18 @@ if(method=="NOTIFY") Example 1.17. rls_update_subs usage ... -rls_update_subs("sip:test@kamailio.org", "presence"); +Within event_route[xhttp:request]: + case "PUT": + xcaps_put("$var(uri)", "$var(doc_uri)", "$rb"); + if($xcapuri(u=>auid)=~"pres-rules") { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } else if ($xcapuri(u=>auid)=~"resource-lists" + || $xcapuri(u=>auid)=~"rls-services") { + rls_update_subs("$var(uri)", "presence"); + } + exit; + break; ... 5. Installation diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index bba428c..f0956b9 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -473,7 +473,18 @@ if(method=="NOTIFY") <title><function>rls_update_subs</function> usage</title> <programlisting format="linespecific"> ... -rls_update_subs("sip:test@kamailio.org", "presence"); +Within event_route[xhttp:request]: + case "PUT": + xcaps_put("$var(uri)", "$var(doc_uri)", "$rb"); + if($xcapuri(u=>auid)=~"pres-rules") { + pres_update_watchers("$var(uri)", "presence"); + pres_refresh_watchers("$var(uri)", "presence", 1); + } else if ($xcapuri(u=>auid)=~"resource-lists" + || $xcapuri(u=>auid)=~"rls-services") { + rls_update_subs("$var(uri)", "presence"); + } + exit; + break; ... </programlisting> </example>

13 years, 3 months

git:master: Merge branch 'master' into pd

by Peter Dunkley

Module: sip-router Branch: master Commit: f0784ecd899eb486e39bce2973a07225ba5d9cf6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0784ec… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Jul 29 11:44:56 2011 +0100 Merge branch 'master' into pd * master: core: fix all reported doxygen errors in PV and value evaluation code tls: restrict visibility of 4 only internal used functions to the module tls: two small code cleanups tls: fix all doxygen errors, extend existing documentation in touched files ---

13 years, 3 months

git:master: Merge branch 'master' into pd

by Peter Dunkley

Module: sip-router Branch: master Commit: 64209434c0a59060a516c6c5cd0c9e6f066c86ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6420943… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 28 12:22:27 2011 +0100 Merge branch 'master' into pd * master: textops(k): internal API bind function exported via module interface modules_k/xcap_server: increased maximum size of XCAP URI to 255 doxygen documentation fixes core: allow forcing send socket for replies alias_db(k): rephrase documentation a bit to make it hopefully better understandable ---

13 years, 3 months

git:master: modules_k/rls: Added a new exported function: rls_update_subs()

by Peter Dunkley

Module: sip-router Branch: master Commit: 4a09b0f8c57f632de5c26c6bc34f5ac32dbe86c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a09b0f… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 28 12:41:07 2011 +0100 modules_k/rls: Added a new exported function: rls_update_subs() - This new function can be called from the Kamailio configuration file to force the RLS module to refresh its back-end subscriptions. This is particularly useful when the resource list has changed (for example, a new contact has been added) as it will create a new back- end subscriptions when required. This means that when you add a new contact in a client the uses RLS the added contact can be immediately subscribed to and will get an authorisation request. - Sample usage: case "PUT": xcaps_put("$var(uri)", "$var(doc_uri)", "$rb"); if($xcapuri(u=>auid)=~"pres-rules") { pres_update_watchers("$var(uri)", "presence"); pres_refresh_watchers("$var(uri)", "presence", 1); } else if ($xcapuri(u=>auid)=~"resource-lists" || $xcapuri(u=>auid)=~"rls-services") { rls_update_subs("$var(uri)", "presence"); } exit; break; --- modules_k/rls/README | 22 ++++++ modules_k/rls/doc/rls_admin.xml | 34 ++++++++++ modules_k/rls/rls.c | 4 + modules_k/rls/subscribe.c | 136 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/README b/modules_k/rls/README index 41588ef..b23953f 100644 --- a/modules_k/rls/README +++ b/modules_k/rls/README @@ -42,6 +42,7 @@ Anca-Maria Vamanu 4.1. rls_handle_subscribe() 4.2. rls_handle_notify() + 4.3. rls_update_subs(uri, event) 5. Installation @@ -65,6 +66,7 @@ Anca-Maria Vamanu 1.14. Set server_address parameter 1.15. rls_handle_subscribe usage 1.16. rls_handle_notify usage + 1.17. rls_update_subs usage Chapter 1. Admin Guide @@ -97,6 +99,7 @@ Chapter 1. Admin Guide 4.1. rls_handle_subscribe() 4.2. rls_handle_notify() + 4.3. rls_update_subs(uri, event) 5. Installation @@ -339,6 +342,7 @@ modparam("rls", "server_address", "sip:rls@ip.address.ofyour.proxy:5060") 4.1. rls_handle_subscribe() 4.2. rls_handle_notify() + 4.3. rls_update_subs(uri, event) 4.1. rls_handle_subscribe() @@ -383,6 +387,24 @@ if(method=="NOTIFY") rls_handle_notify(); ... +4.3. rls_update_subs(uri, event) + + This function can be used in configuration to trigger updates to + resource list subscriptions (for example, after the contents of a + resource list has changes). + + Parameters: + * uri - the uri of the user who made the change and whose resource + list subscriptions should be updated + * event - the event package (e.g. presence). + + This function can be used from ANY_ROUTE. + + Example 1.17. rls_update_subs usage +... +rls_update_subs("sip:test@kamailio.org", "presence"); +... + 5. Installation The module requires 2 tables in Kamailio database: rls_presentity and diff --git a/modules_k/rls/doc/rls_admin.xml b/modules_k/rls/doc/rls_admin.xml index 351deb6..bba428c 100644 --- a/modules_k/rls/doc/rls_admin.xml +++ b/modules_k/rls/doc/rls_admin.xml @@ -444,6 +444,40 @@ if(method=="NOTIFY") </programlisting> </example> </section> + + <section> + <title> + <function moreinfo="none">rls_update_subs(uri, event)</function> + </title> + <para> + This function can be used in configuration to trigger updates to + resource list subscriptions (for example, after the contents of a + resource list has changes). + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>uri - the uri of the user who made the change + and whose resource list subscriptions should be + updated</para> + </listitem> + <listitem> + <para>event - the event package (e.g. presence). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>rls_update_subs</function> usage</title> + <programlisting format="linespecific"> +... +rls_update_subs("sip:test@kamailio.org", "presence"); +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/rls/rls.c b/modules_k/rls/rls.c index 368f815..b69cea7 100644 --- a/modules_k/rls/rls.c +++ b/modules_k/rls/rls.c @@ -164,6 +164,8 @@ static void destroy(void); int rlsubs_table_restore(); void rlsubs_table_update(unsigned int ticks,void *param); int add_rls_event(modparam_t type, void* val); +int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent); +int fixup_update_subs(void** param, int param_no); static cmd_export_t cmds[]= { @@ -171,6 +173,8 @@ static cmd_export_t cmds[]= 0, 0, REQUEST_ROUTE}, {"rls_handle_notify", (cmd_function)rls_handle_notify, 0, 0, 0, REQUEST_ROUTE}, + {"rls_update_subs", (cmd_function)rls_update_subs, 2, + fixup_update_subs, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0 } }; diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 205ecb5..ed6366b 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -50,6 +50,7 @@ #include "subscribe.h" #include "notify.h" #include "rls.h" +#include "../../mod_fix.h" int counter= 0; @@ -876,3 +877,138 @@ error: } +int fixup_update_subs(void** param, int param_no) +{ + if (param_no == 1) { + return fixup_spve_null(param, 1); + } else if (param_no == 2) { + return fixup_spve_null(param, 1); + } + return 0; +} + +int rls_update_subs(struct sip_msg *msg, char *puri, char *pevent) +{ + str uri; + str event; + struct sip_uri parsed_uri; + event_t e; + int i; + + if (fixup_get_svalue(msg, (gparam_p)puri, &uri) != 0) + { + LM_ERR("invalid uri parameter\n"); + return -1; + } + + if (fixup_get_svalue(msg, (gparam_p)pevent, &event) != 0) + { + LM_ERR("invalid event parameter\n"); + return -1; + } + + if (event_parser(event.s, event.len, &e) < 0) + { + LM_ERR("while parsing event: %.*s\n", event.len, event.s); + return -1; + } + + if (e.type & EVENT_OTHER) + { + LM_ERR("unrecognised event: %.*s\n", event.len, event.s); + return -1; + } + + if (!(e.type & rls_events)) + { + LM_ERR("event not supported by RLS: %.*s\n", event.len, + event.s); + return -1; + } + + if (parse_uri(uri.s, uri.len, &parsed_uri) < 0) + { + LM_ERR("bad uri: %.*s\n", uri.len, uri.s); + return -1; + } + + LM_DBG("watcher username: %.*s, watcher domain: %.*s\n", + parsed_uri.user.len, parsed_uri.user.s, + parsed_uri.host.len, parsed_uri.host.s); + + if (rls_table == NULL) + { + LM_ERR("rls_table is NULL\n"); + return -1; + } + + /* Search through the entire subscription table for matches... */ + for (i = 0; i < hash_size; i++) + { + subs_t *subs; + + lock_get(&rls_table[i].lock); + + subs = rls_table[i].entries->next; + + while (subs != NULL) + { + if (subs->from_user.len == parsed_uri.user.len && + strncmp(subs->from_user.s, parsed_uri.user.s, parsed_uri.user.len) == 0 && + subs->from_domain.len == parsed_uri.host.len && + strncmp(subs->from_domain.s, parsed_uri.host.s, parsed_uri.host.len) == 0 && + subs->event->evp->type == e.type) + { + subs_t *subs_copy = NULL; + xmlDocPtr doc = NULL; + xmlNodePtr service_node = NULL; + + LM_DBG("found matching RLS subscription for: %.*s\n", + subs->pres_uri.len, subs->pres_uri.s); + + if ((subs_copy = pres_copy_subs(subs, PKG_MEM_TYPE)) == NULL) + { + LM_ERR("subs_t copy failed\n"); + lock_release(&rls_table[i].lock); + return -1; + } + + if ((subs_copy->expires -= (int)time(NULL)) <= 0) + { + LM_WARN("found expired subscription for: %.*s\n", + subs_copy->pres_uri.len, subs_copy->pres_uri.s); + goto loop_done; + } + + if(rls_get_service_list(&subs_copy->pres_uri, &subs_copy->from_user, + &subs_copy->from_domain, &service_node, &doc)<0) + { + LM_ERR("failed getting resource list for: %.*s\n", + subs_copy->pres_uri.len, subs_copy->pres_uri.s); + goto loop_done; + } + if(doc==NULL) + { + LM_WARN("no document returned for: %.*s\n", + subs_copy->pres_uri.len, subs_copy->pres_uri.s); + goto loop_done; + } + + if(resource_subscriptions(subs_copy, service_node)< 0) + { + LM_ERR("failed sending subscribe requests to resources in list\n"); + goto loop_done; + } + +loop_done: + if (doc != NULL) + xmlFreeDoc(doc); + pkg_free(subs_copy); + } + subs = subs->next; + } + lock_release(&rls_table[i].lock); + } + + return 1; +}

13 years, 3 months

git:master: module_k/rls: Added support for resource-list indices.

by Peter Dunkley

Module: sip-router Branch: master Commit: 81ee00f531c1148e5077f81c5ece3094136bc8f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=81ee00f… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Thu Jul 28 12:35:03 2011 +0100 module_k/rls: Added support for resource-list indices. - That is, support for resource lists that contain references to other resource lists. - This is needed for OMA/RCS compliance. - Implementation only works with integrated XCAP. --- modules_k/rls/notify.c | 262 ++++++++++++++++++++++++++++++++++++++++++-- modules_k/rls/notify.h | 5 +- modules_k/rls/rls.c | 1 + modules_k/rls/rls.h | 1 + modules_k/rls/subscribe.c | 3 +- 5 files changed, 257 insertions(+), 15 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=81e…

13 years, 3 months

git:master: srdb1, modules_k/presence_xml, modules_k/xcap_server: Updated xcap table version from 3 to 4

by Peter Dunkley

Module: sip-router Branch: master Commit: 7545c62ab6dd98127149a0dfcc7e4818e3e6faa2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7545c62… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 27 14:44:39 2011 +0100 srdb1, modules_k/presence_xml, modules_k/xcap_server: Updated xcap table version from 3 to 4 - Also fixed a merge issue where I copied the PostgreSQL version of presence-create.sql over the MySQL one. --- lib/srdb1/schema/pr_xcap.xml | 2 +- modules_k/presence_xml/presence_xml.c | 2 +- modules_k/xcap_server/xcap_server.c | 2 +- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/presence-create.sql | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/presence-create.sql | 72 ++++++++++++++-------------- utils/kamctl/oracle/presence-create.sql | 2 +- utils/kamctl/postgres/presence-create.sql | 2 +- 9 files changed, 44 insertions(+), 44 deletions(-) diff --git a/lib/srdb1/schema/pr_xcap.xml b/lib/srdb1/schema/pr_xcap.xml index ef30273..be7aa97 100644 --- a/lib/srdb1/schema/pr_xcap.xml +++ b/lib/srdb1/schema/pr_xcap.xml @@ -9,7 +9,7 @@ <table id="xcap" xmlns:db="http://docbook.org/ns/docbook"> <name>xcap</name> - <version>3</version> + <version>4</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Table for the presence module. More information can be found at: &KAMAILIO_MOD_DOC;presence.html diff --git a/modules_k/presence_xml/presence_xml.c b/modules_k/presence_xml/presence_xml.c index f210460..e3bb8f2 100644 --- a/modules_k/presence_xml/presence_xml.c +++ b/modules_k/presence_xml/presence_xml.c @@ -59,7 +59,7 @@ #include "presence_xml.h" MODULE_VERSION -#define S_TABLE_VERSION 3 +#define S_TABLE_VERSION 4 /** module functions */ diff --git a/modules_k/xcap_server/xcap_server.c b/modules_k/xcap_server/xcap_server.c index db1e0f5..4c0aa30 100644 --- a/modules_k/xcap_server/xcap_server.c +++ b/modules_k/xcap_server/xcap_server.c @@ -49,7 +49,7 @@ MODULE_VERSION -#define XCAP_TABLE_VERSION 3 +#define XCAP_TABLE_VERSION 4 static int xcaps_put_db(str* user, str *domain, xcap_uri_t *xuri, str *etag, diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index c533ac2..74a5b86 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -105,4 +105,4 @@ usr_preferences|2 watchers| watchers|3 xcap| -xcap|3 +xcap|4 diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index c2bedf4..c6fa4c2 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -51,7 +51,7 @@ CREATE TABLE watchers ( CONSTRAINT watchers_watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) ); -INSERT INTO version (table_name, table_version) values ('xcap','3'); +INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( id INTEGER PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 4410f97..009f2e1 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -47,4 +47,4 @@ uri:1 userblacklist:1 usr_preferences:2 watchers:3 -xcap:3 +xcap:4 diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 3b2608c..2a404e2 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -1,20 +1,20 @@ INSERT INTO version (table_name, table_version) values ('presentity','3'); CREATE TABLE presentity ( - id SERIAL PRIMARY KEY NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, event VARCHAR(64) NOT NULL, etag VARCHAR(64) NOT NULL, - expires INTEGER NOT NULL, - received_time INTEGER NOT NULL, - body BYTEA NOT NULL, + expires INT(11) NOT NULL, + received_time INT(11) NOT NULL, + body BLOB NOT NULL, sender VARCHAR(128) NOT NULL, - CONSTRAINT presentity_presentity_idx UNIQUE (username, domain, event, etag) -); + CONSTRAINT presentity_idx UNIQUE (username, domain, event, etag) +) ENGINE=MyISAM; INSERT INTO version (table_name, table_version) values ('active_watchers','9'); CREATE TABLE active_watchers ( - id SERIAL PRIMARY KEY NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, watcher_username VARCHAR(64) NOT NULL, watcher_domain VARCHAR(64) NOT NULL, @@ -25,68 +25,68 @@ CREATE TABLE active_watchers ( to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, callid VARCHAR(255) NOT NULL, - local_cseq INTEGER NOT NULL, - remote_cseq INTEGER NOT NULL, + local_cseq INT(11) NOT NULL, + remote_cseq INT(11) NOT NULL, contact VARCHAR(128) NOT NULL, record_route TEXT, - expires INTEGER NOT NULL, - status INTEGER DEFAULT 2 NOT NULL, + expires INT(11) NOT NULL, + status INT(11) DEFAULT 2 NOT NULL, reason VARCHAR(64) NOT NULL, - version INTEGER DEFAULT 0 NOT NULL, + version INT(11) DEFAULT 0 NOT NULL, socket_info VARCHAR(64) NOT NULL, local_contact VARCHAR(128) NOT NULL, - CONSTRAINT active_watchers_active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) -); + CONSTRAINT active_watchers_idx UNIQUE (presentity_uri, callid, to_tag, from_tag) +) ENGINE=MyISAM; INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( - id SERIAL PRIMARY KEY NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, presentity_uri VARCHAR(128) NOT NULL, watcher_username VARCHAR(64) NOT NULL, watcher_domain VARCHAR(64) NOT NULL, event VARCHAR(64) DEFAULT 'presence' NOT NULL, - status INTEGER NOT NULL, + status INT(11) NOT NULL, reason VARCHAR(64), - inserted_time INTEGER NOT NULL, - CONSTRAINT watchers_watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) -); + inserted_time INT(11) NOT NULL, + CONSTRAINT watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) +) ENGINE=MyISAM; -INSERT INTO version (table_name, table_version) values ('xcap','3'); +INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( - id SERIAL PRIMARY KEY NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL, domain VARCHAR(64) NOT NULL, - doc BYTEA NOT NULL, - doc_type INTEGER NOT NULL, + doc MEDIUMBLOB NOT NULL, + doc_type INT(11) NOT NULL, etag VARCHAR(64) NOT NULL, - source INTEGER NOT NULL, + source INT(11) NOT NULL, doc_uri VARCHAR(128) NOT NULL, - port INTEGER NOT NULL, - CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) -); + port INT(11) NOT NULL, + CONSTRAINT account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) +) ENGINE=MyISAM; -CREATE INDEX xcap_source_idx ON xcap (source); +CREATE INDEX source_idx ON xcap (source); INSERT INTO version (table_name, table_version) values ('pua','6'); CREATE TABLE pua ( - id SERIAL PRIMARY KEY NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, pres_uri VARCHAR(128) NOT NULL, pres_id VARCHAR(255) NOT NULL, - event INTEGER NOT NULL, - expires INTEGER NOT NULL, - desired_expires INTEGER NOT NULL, - flag INTEGER NOT NULL, + event INT(11) NOT NULL, + expires INT(11) NOT NULL, + desired_expires INT(11) NOT NULL, + flag INT(11) NOT NULL, etag VARCHAR(64) NOT NULL, tuple_id VARCHAR(64), watcher_uri VARCHAR(128) NOT NULL, call_id VARCHAR(128) NOT NULL, to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - cseq INTEGER NOT NULL, + cseq INT(11) NOT NULL, record_route TEXT, contact VARCHAR(128) NOT NULL, remote_contact VARCHAR(128) NOT NULL, - version INTEGER NOT NULL, + version INT(11) NOT NULL, extra_headers TEXT NOT NULL -); +) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 5c6e1f2..e5f01f6 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -75,7 +75,7 @@ END watchers_tr; / BEGIN map2users('watchers'); END; / -INSERT INTO version (table_name, table_version) values ('xcap','3'); +INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( id NUMBER(10) PRIMARY KEY, username VARCHAR2(64), diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 3b2608c..aca4fe5 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -51,7 +51,7 @@ CREATE TABLE watchers ( CONSTRAINT watchers_watcher_idx UNIQUE (presentity_uri, watcher_username, watcher_domain, event) ); -INSERT INTO version (table_name, table_version) values ('xcap','3'); +INSERT INTO version (table_name, table_version) values ('xcap','4'); CREATE TABLE xcap ( id SERIAL PRIMARY KEY NOT NULL, username VARCHAR(64) NOT NULL,

13 years, 3 months

git:master: srdb1: Fixed merge error made in commit 8623eeb1c2762d299cd88e0b7bc8d8fdb8fa2a72

by Peter Dunkley

Module: sip-router Branch: master Commit: fce0a50f90d3fc7625f9d8d4984d34a01079a4d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fce0a50… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Jul 27 13:49:50 2011 +0100 srdb1: Fixed merge error made in commit 8623eeb1c2762d299cd88e0b7bc8d8fdb8fa2a72 - When copying utils/kamctl/mysql/siptrace-create.sql from my local SVN I accidently copied across utils/kamctl/postgres/siptrace-create.sql. --- utils/kamctl/mysql/siptrace-create.sql | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/mysql/siptrace-create.sql b/utils/kamctl/mysql/siptrace-create.sql index 9021d0c..806fc34 100644 --- a/utils/kamctl/mysql/siptrace-create.sql +++ b/utils/kamctl/mysql/siptrace-create.sql @@ -1,20 +1,20 @@ INSERT INTO version (table_name, table_version) values ('sip_trace','2'); CREATE TABLE sip_trace ( - id SERIAL PRIMARY KEY NOT NULL, - time_stamp TIMESTAMP WITHOUT TIME ZONE DEFAULT '1900-01-01 00:00:01' NOT NULL, + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + time_stamp DATETIME DEFAULT '1900-01-01 00:00:01' NOT NULL, callid VARCHAR(255) DEFAULT '' NOT NULL, traced_user VARCHAR(128) DEFAULT '' NOT NULL, - msg TEXT NOT NULL, + msg MEDIUMTEXT NOT NULL, method VARCHAR(50) DEFAULT '' NOT NULL, status VARCHAR(128) DEFAULT '' NOT NULL, fromip VARCHAR(50) DEFAULT '' NOT NULL, toip VARCHAR(50) DEFAULT '' NOT NULL, fromtag VARCHAR(64) DEFAULT '' NOT NULL, direction VARCHAR(4) DEFAULT '' NOT NULL -); +) ENGINE=MyISAM; -CREATE INDEX sip_trace_traced_user_idx ON sip_trace (traced_user); -CREATE INDEX sip_trace_date_idx ON sip_trace (time_stamp); -CREATE INDEX sip_trace_fromip_idx ON sip_trace (fromip); -CREATE INDEX sip_trace_callid_idx ON sip_trace (callid); +CREATE INDEX traced_user_idx ON sip_trace (traced_user); +CREATE INDEX date_idx ON sip_trace (time_stamp); +CREATE INDEX fromip_idx ON sip_trace (fromip); +CREATE INDEX callid_idx ON sip_trace (callid);

13 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2011