sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
167 discussions

git:master: db_sqlite: synchronize database schema with other engines

by Henning Westerholt

Module: sip-router Branch: master Commit: 6e51a4d83fd13876c6bfa71cef65a001145de52e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e51a4d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 20 13:45:47 2011 +0200 db_sqlite: synchronize database schema with other engines --- utils/kamctl/db_sqlite/lcr-create.sql | 5 +++-- utils/kamctl/db_sqlite/rls-create.sql | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/db_sqlite/lcr-create.sql b/utils/kamctl/db_sqlite/lcr-create.sql index bf93141..0671625 100644 --- a/utils/kamctl/db_sqlite/lcr-create.sql +++ b/utils/kamctl/db_sqlite/lcr-create.sql @@ -13,10 +13,11 @@ CREATE TABLE lcr_gw ( prefix VARCHAR(16) DEFAULT NULL, tag VARCHAR(64) DEFAULT NULL, flags INTEGER DEFAULT 0 NOT NULL, - defunct INTEGER DEFAULT NULL, - CONSTRAINT lcr_gw_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) + defunct INTEGER DEFAULT NULL ); +CREATE INDEX lcr_gw_lcr_id_idx ON lcr_gw (lcr_id); + INSERT INTO version (table_name, table_version) values ('lcr_rule_target','1'); CREATE TABLE lcr_rule_target ( id INTEGER PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/db_sqlite/rls-create.sql b/utils/kamctl/db_sqlite/rls-create.sql index b15120d..c3f3895 100644 --- a/utils/kamctl/db_sqlite/rls-create.sql +++ b/utils/kamctl/db_sqlite/rls-create.sql @@ -26,10 +26,10 @@ CREATE TABLE rls_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INTEGER NOT NULL, remote_cseq INTEGER NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL,

13 years, 5 months

git:master: db_sqlite: fix path in Makefile and utility script

by Henning Westerholt

Module: sip-router Branch: master Commit: 9483a2092f05ed34698e53e628fb879d00871ce7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9483a20… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 20 13:44:26 2011 +0200 db_sqlite: fix path in Makefile and utility script --- utils/kamctl/Makefile | 8 ++++---- utils/kamctl/kamdbctl.sqlite | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 8b0f790..4a3a08a 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -258,13 +258,13 @@ install-modules: $(bin_prefix)/$(bin_dir) $(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.sqlite ; \ $(INSTALL_CFG) /tmp/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \ rm -fr /tmp/kamdbctl.sqlite ; \ - mkdir -p $(data_prefix)/$(data_dir)/sqlite ; \ - for FILE in $(wildcard sqlite/*) ; do \ + mkdir -p $(data_prefix)/$(data_dir)/db_sqlite ; \ + for FILE in $(wildcard db_sqlite/*) ; do \ if [ -f $$FILE ] ; then \ $(INSTALL_TOUCH) $$FILE \ - $(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \ + $(data_prefix)/$(data_dir)/db_sqlite/`basename "$$FILE"` ; \ $(INSTALL_CFG) $$FILE \ - $(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \ + $(data_prefix)/$(data_dir)/db_sqlite/`basename "$$FILE"` ; \ fi ;\ done ; \ fi diff --git a/utils/kamctl/kamdbctl.sqlite b/utils/kamctl/kamdbctl.sqlite index ecb51aa..3478b26 100644 --- a/utils/kamctl/kamdbctl.sqlite +++ b/utils/kamctl/kamdbctl.sqlite @@ -5,10 +5,10 @@ # path to the database schemas DATA_DIR="/usr/local/share/kamailio" -if [ -d "$DATA_DIR/sqlite" ] ; then - DB_SCHEMA="$DATA_DIR/sqlite" +if [ -d "$DATA_DIR/db_sqlite" ] ; then + DB_SCHEMA="$DATA_DIR/db_sqlite" else - DB_SCHEMA="./sqlite" + DB_SCHEMA="./db_sqlite" fi #################################################################

13 years, 5 months

git:master: db_sqlite: rename database scheme files, to allow automatic updates

by Henning Westerholt

Module: sip-router Branch: master Commit: 60d201ddcf0e3cc119230f64ea30af3e7157434a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60d201d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 20 13:43:57 2011 +0200 db_sqlite: rename database scheme files, to allow automatic updates --- utils/kamctl/sqlite/acc-create.sql | 28 -------- utils/kamctl/sqlite/alias_db-create.sql | 12 ---- utils/kamctl/sqlite/auth_db-create.sql | 15 ---- utils/kamctl/sqlite/avpops-create.sql | 15 ---- utils/kamctl/sqlite/carrierroute-create.sql | 42 ------------ utils/kamctl/sqlite/cpl-create.sql | 10 --- utils/kamctl/sqlite/dialog-create.sql | 29 -------- utils/kamctl/sqlite/dialplan-create.sql | 13 ---- utils/kamctl/sqlite/dispatcher-create.sql | 11 --- utils/kamctl/sqlite/domain-create.sql | 8 -- utils/kamctl/sqlite/domainpolicy-create.sql | 13 ---- utils/kamctl/sqlite/drouting-create.sql | 39 ----------- utils/kamctl/sqlite/group-create.sql | 19 ----- utils/kamctl/sqlite/htable-create.sql | 9 --- utils/kamctl/sqlite/imc-create.sql | 19 ----- utils/kamctl/sqlite/lcr-create.sql | 43 ------------ utils/kamctl/sqlite/matrix-create.sql | 9 --- utils/kamctl/sqlite/msilo-create.sql | 16 ----- utils/kamctl/sqlite/mtree-create.sql | 8 -- utils/kamctl/sqlite/pdt-create.sql | 9 --- utils/kamctl/sqlite/permissions-create.sql | 21 ------ utils/kamctl/sqlite/presence-create.sql | 92 -------------------------- utils/kamctl/sqlite/purple-create.sql | 9 --- utils/kamctl/sqlite/registrar-create.sql | 22 ------ utils/kamctl/sqlite/rls-create.sql | 42 ------------ utils/kamctl/sqlite/siptrace-create.sql | 20 ------ utils/kamctl/sqlite/speeddial-create.sql | 14 ---- utils/kamctl/sqlite/standard-create.sql | 5 -- utils/kamctl/sqlite/uac-create.sql | 16 ----- utils/kamctl/sqlite/uri_db-create.sql | 10 --- utils/kamctl/sqlite/userblacklist-create.sql | 21 ------ utils/kamctl/sqlite/usrloc-create.sql | 22 ------ 32 files changed, 0 insertions(+), 661 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=60d…

13 years, 5 months

git:master: db_sqlite: rename database scheme files, to allow automatic updates

by Henning Westerholt

Module: sip-router Branch: master Commit: 97f64064e2a4f3571ab12317a8cb9e64bb261024 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97f6406… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jun 20 13:36:01 2011 +0200 db_sqlite: rename database scheme files, to allow automatic updates --- utils/kamctl/db_sqlite/acc-create.sql | 28 +++++++ utils/kamctl/db_sqlite/alias_db-create.sql | 12 +++ utils/kamctl/db_sqlite/auth_db-create.sql | 15 ++++ utils/kamctl/db_sqlite/avpops-create.sql | 15 ++++ utils/kamctl/db_sqlite/carrierroute-create.sql | 42 ++++++++++ utils/kamctl/db_sqlite/cpl-create.sql | 10 +++ utils/kamctl/db_sqlite/dialog-create.sql | 29 +++++++ utils/kamctl/db_sqlite/dialplan-create.sql | 13 +++ utils/kamctl/db_sqlite/dispatcher-create.sql | 11 +++ utils/kamctl/db_sqlite/domain-create.sql | 8 ++ utils/kamctl/db_sqlite/domainpolicy-create.sql | 13 +++ utils/kamctl/db_sqlite/drouting-create.sql | 39 ++++++++++ utils/kamctl/db_sqlite/group-create.sql | 19 +++++ utils/kamctl/db_sqlite/htable-create.sql | 9 ++ utils/kamctl/db_sqlite/imc-create.sql | 19 +++++ utils/kamctl/db_sqlite/lcr-create.sql | 43 +++++++++++ utils/kamctl/db_sqlite/matrix-create.sql | 9 ++ utils/kamctl/db_sqlite/msilo-create.sql | 16 ++++ utils/kamctl/db_sqlite/mtree-create.sql | 8 ++ utils/kamctl/db_sqlite/pdt-create.sql | 9 ++ utils/kamctl/db_sqlite/permissions-create.sql | 21 +++++ utils/kamctl/db_sqlite/presence-create.sql | 92 +++++++++++++++++++++++ utils/kamctl/db_sqlite/purple-create.sql | 9 ++ utils/kamctl/db_sqlite/registrar-create.sql | 22 ++++++ utils/kamctl/db_sqlite/rls-create.sql | 42 ++++++++++ utils/kamctl/db_sqlite/siptrace-create.sql | 20 +++++ utils/kamctl/db_sqlite/speeddial-create.sql | 14 ++++ utils/kamctl/db_sqlite/standard-create.sql | 5 + utils/kamctl/db_sqlite/uac-create.sql | 16 ++++ utils/kamctl/db_sqlite/uri_db-create.sql | 10 +++ utils/kamctl/db_sqlite/userblacklist-create.sql | 21 +++++ utils/kamctl/db_sqlite/usrloc-create.sql | 22 ++++++ 32 files changed, 661 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=97f…

13 years, 5 months

git:master: Makefile: exclude pua/presence_reginfo from default compile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 11e203ba63ab31962455a5a265dad4ef44eee00d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11e203b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 18 23:27:54 2011 +0200 Makefile: exclude pua/presence_reginfo from default compile - dependency on libxml2 - added the two modules to group presence --- Makefile | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 7e734ef..fa404bc 100644 --- a/Makefile +++ b/Makefile @@ -176,7 +176,8 @@ module_group_radius=acc_radius auth_radius misc_radius avp_radius uri_radius \ # kamailio modules module_group_presence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client xcap_server presence_conference + rls xcap_client xcap_server presence_conference \ + presence_reginfo pua_reginfo #ser modules module_group_presence+=dialog presence_b2b xcap # obsolete/unmaintained ser modules @@ -260,7 +261,8 @@ module_group_ktls=tls # K presence modules module_group_kpresence=presence presence_dialoginfo presence_mwi presence_xml \ pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp \ - rls xcap_client xcap_server presence_conference + rls xcap_client xcap_server presence_conference \ + presence_reginfo pua_reginfo # K lua module module_group_klua=app_lua @@ -296,7 +298,8 @@ else dialplan lcr utils presence presence_mwi \ presence_dialoginfo presence_xml pua pua_bla \ pua_dialoginfo pua_usrloc pua_xmpp \ - regex xcap_client xcap_server presence_conference + regex xcap_client xcap_server presence_conference \ + presence_reginfo pua_reginfo #excluded because they depend on external *.h files exclude_modules+= h350 # excluded because they do not compile (remove them only after they are

13 years, 5 months

git:master: docs: cleanup in xml files

by Daniel-Constantin Mierla

13 years, 5 months

git:master: docs: added README for pua_reginfo and presence_reginfo

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0eaebb2c9a06f2eff7f103d1f2768f5aa677c18a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0eaebb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 18 23:25:12 2011 +0200 docs: added README for pua_reginfo and presence_reginfo --- modules_k/presence_reginfo/README | 76 +++++++++++++ modules_k/pua_reginfo/README | 223 +++++++++++++++++++++++++++++++++++++ 2 files changed, 299 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_reginfo/README b/modules_k/presence_reginfo/README new file mode 100644 index 0000000..3cde44d --- /dev/null +++ b/modules_k/presence_reginfo/README @@ -0,0 +1,76 @@ +presence_reginfo Module + +Carsten Bock + + <carsten(a)ng-voice.com> + +Edited by + +Carsten Bock + + <carsten(a)ng-voice.com> + + Copyright © 2011 Carsten Bock, carsten(a)ng-voice.com, + http://www.ng-voice.com + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Functions + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Functions + +1. Overview + + The module enables the handling of "Event: reg" (as defined in RFC + 3680) inside of the presence module. This can be used distribute the + registration-info status to the subscribed watchers. + + The module does not currently implement any authorization rules. It + assumes that publish requests are only issued by an authorized + application and subscribe requests only by authorized users. + Authorization can thus be easily done in Kamailio configuration file + before calling handle_publish() and handle_subscribe() functions. + + Note: This module only activates the processing of the "reg" in the + presence module. To send dialog-info to watchers you also need a source + which PUBLISH the reg info to the presence module. For example you can + use the pua_reginfo module or any external component. This approach + allows to have the presence server and the reg-info aware publisher + (e.g. the main proxy) on different Kamailio instances. + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * presence. + +2.2. External Libraries or Applications + + None. + +3. Exported Functions + + None to be used in configuration file. diff --git a/modules_k/pua_reginfo/README b/modules_k/pua_reginfo/README new file mode 100644 index 0000000..bf6d98c --- /dev/null +++ b/modules_k/pua_reginfo/README @@ -0,0 +1,223 @@ +pua_reginfo Module + +Carsten Bock + + <carsten(a)ng-voice.com> + +Edited by + +Carsten Bock + + <carsten(a)ng-voice.com> + + Copyright © 2011 Carsten Bock, carsten(a)ng-voice.com, + http://www.ng-voice.com + __________________________________________________________________ + + Table of Contents + + 1. Admin Guide + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. default_domain(str) + 3.2. default_domain(str) + 3.3. publish_reginfo(int) + 3.4. outbound_proxy(str) + 3.5. server_address(str) + + 4. Exported Functions + + 4.1. reginfo_handle_notify + 4.2. reginfo_subscribe(uri[, expires]) + + List of Examples + + 1.1. Set default_domain parameter + 1.2. Set default_domain parameter + 1.3. Set publish_reginfo parameter + 1.4. Set outbound_proxy parameter + 1.5. Set server_address parameter + 1.6. reginfo_handle_notify usage + 1.7. reginfo_subscribe usage + +Chapter 1. Admin Guide + + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. default_domain(str) + 3.2. default_domain(str) + 3.3. publish_reginfo(int) + 3.4. outbound_proxy(str) + 3.5. server_address(str) + + 4. Exported Functions + + 4.1. reginfo_handle_notify + 4.2. reginfo_subscribe(uri[, expires]) + +1. Overview + + This modules publishes information about "reg"-events according to to + RFC 3680. This can be used distribute the registration-info status to + the subscribed watchers. + + This module "PUBLISH"es information when a new user registers at this + server (e.g. when "save()" is called) to users, which have subscribed + for the reg-info for this user. + + This module can "SUBSCRIBE" for information at another server, so it + will receive "NOTIFY"-requests, when the information about a user + changes. + + And finally, it can process received "NOTIFY" requests and it will + update the local registry accordingly. + + Use cases for this might be: + * Keeping different Servers in Sync regarding the location database + * Get notified, when a user registers: A presence-server, which + handles offline message storage for an account, would get notified, + when the user comes online. + * A client could subscribe to it's own registration-status, so he + would get notified as soon as his account gets administratively + unregistered. + * ... + +2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules + + The following modules must be loaded before this module: + * pua. + * usrloc. + +2.2. External Libraries or Applications + + None. + +3. Exported Parameters + + 3.1. default_domain(str) + 3.2. default_domain(str) + 3.3. publish_reginfo(int) + 3.4. outbound_proxy(str) + 3.5. server_address(str) + +3.1. default_domain(str) + + The default domain for the registered users to be used when + constructing the uri for the registrar callback. + + Default value is “NULL”. + + Example 1.1. Set default_domain parameter +... +modparam("pua_bla", "default_domain", "kamailio.org") +... + +3.2. default_domain(str) + + The domain to be used to publish information about a user. + + Example 1.2. Set default_domain parameter +... +modparam("pua_reginfo", "default_domain", "kamailio.org") +... + +3.3. publish_reginfo(int) + + Whether or not to generate PUBLISH requests. + + Default value is “1” (enabled). + + Example 1.3. Set publish_reginfo parameter +... +modparam("pua_reginfo", "publish_reginfo", 0) +... + +3.4. outbound_proxy(str) + + The outbound_proxy uri to be used when sending Subscribe requests. + + Default value is “NULL”. + + Example 1.4. Set outbound_proxy parameter +... +modparam("pua_reginfo", "outbound_proxy", "sip:proxy@kamailio.org") +... + +3.5. server_address(str) + + The IP address of the server. + + Example 1.5. Set server_address parameter +... +modparam("pua_reginfo", "server_address", "sip:reginfo@160.34.23.12") +... + +4. Exported Functions + + 4.1. reginfo_handle_notify + 4.2. reginfo_subscribe(uri[, expires]) + +4.1. reginfo_handle_notify + + This function processes received "NOTIFY"-requests and updates the + local registry accordingly. + + This method does not create any SIP-Reponse, this has to be done the + script-writer. + + Return codes: + * 2 - contacts successfully updated, but no more contacts online now. + 1 - contacts successfully updated and at at least one contact still + registered. + -1 - Invalid NOTIFY or other error (see log-file) + + Example 1.6. reginfo_handle_notify usage +... +if(is_method("NOTIFY")) + if (reginfo_handle_notify()) + send_reply("202", "Accepted"); +... + +4.2. reginfo_subscribe(uri[, expires]) + + This function will subscribe for reginfo-information at the given + server URI. + + Meaning of the parameters is as follows: + * uri - SIP-URI of the server, where to subscribe, may contain + pseudo-variables. + expires - Expiration date for this subscription, in seconds + (default 3600) + + Example 1.7. reginfo_subscribe usage +... +route { + t_on_reply("1"); + t_relay(); +} + +reply_route[1] { + if (t_check_status("200")) + reginfo_subscribe("$ru"); +} +...

13 years, 5 months

git:master: tmx: readme regenerated

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9fb70fab954ba21085fe1472bdf93630165bfd4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fb70fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 18 19:43:11 2011 +0200 tmx: readme regenerated --- modules_k/tmx/README | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/modules_k/tmx/README b/modules_k/tmx/README index 6f9ad6f..707d409 100644 --- a/modules_k/tmx/README +++ b/modules_k/tmx/README @@ -40,6 +40,7 @@ Daniel-Constantin Mierla 5.2. t_uac_cancel 5.3. t_hash 5.4. t_reply + 5.5. t_reply_callid 6. Exported statistics @@ -90,6 +91,7 @@ Chapter 1. Admin Guide 5.2. t_uac_cancel 5.3. t_hash 5.4. t_reply + 5.5. t_reply_callid 6. Exported statistics @@ -137,7 +139,7 @@ Chapter 1. Admin Guide 3.5. t_is_failure_route() 3.6. t_is_branch_route() -3.1. t_cancel_branches(which) +3.1. t_cancel_branches(which) Cancel branches of an active SIP transaction. The function can be called for a SIP reply that will identify the current branch. @@ -156,7 +158,7 @@ if (t_cancel_branches("all")) { } ... -3.2. t_cancel_callid(callid, cseq, flag) +3.2. t_cancel_callid(callid, cseq, flag) Cancel first INVITE transaction identified by callid and cseq. It sets the flag if the value is greater than zero @@ -175,7 +177,7 @@ if (t_cancel_callid("123qaz", "5", "22")) { } ... -3.3. t_reply_callid(callid, cseq, code, reason) +3.3. t_reply_callid(callid, cseq, code, reason) Send reply to first INVITE transaction identified by callid and cseq. @@ -194,7 +196,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { } ... -3.4. t_flush_flags() +3.4. t_flush_flags() Flush the flags from current SIP message into the already created transaction. It make sense only in routing block if the transaction was @@ -207,7 +209,7 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { t_flush_flags(); ... -3.5. t_is_failure_route() +3.5. t_is_failure_route() Returns true if the top-executed route block is failure_route. @@ -224,7 +226,7 @@ route[abc] { } ... -3.6. t_is_branch_route() +3.6. t_is_branch_route() Returns true if the top-executed route block is branch_route. @@ -257,8 +259,9 @@ route[abc] { 5.2. t_uac_cancel 5.3. t_hash 5.4. t_reply + 5.5. t_reply_callid -5.1. t_uac_dlg +5.1. t_uac_dlg Generates and sends a local SIP request. @@ -273,7 +276,7 @@ route[abc] { * body - (optional, may not be present) request body (if present, requires the "Content-Type" and "Content-length" headers) -5.2. t_uac_cancel +5.2. t_uac_cancel Generates and sends a CANCEL for an existing local SIP request. @@ -281,14 +284,14 @@ route[abc] { * callid - callid of the INVITE request to be cancelled. * cseq - cseq of the INVITE request to be cancelled. -5.3. t_hash +5.3. t_hash Gets information about the load of TM internal hash table. Parameters: * none -5.4. t_reply +5.4. t_reply Generates and sends a reply for an existing inbound SIP transaction. @@ -302,6 +305,21 @@ route[abc] { * body - (optional, may not be present) reply body (if present, requires the "Content-Type" and "Content-length" headers) +5.5. t_reply_callid + + Generates and sends a reply for an existing inbound SIP transaction. + + Parameters: + * code - reply code + * reason - reason phrase. + * callid - SIP Call-ID header + * cseq - SIP CSeq header + * to_tag - To tag to be added to TO header + * new_headers - extra headers to be appended to the reply; use a dot + (".") char only if there are no headers; + * body - (optional, may not be present) reply body (if present, + requires the "Content-Type" and "Content-length" headers) + 6. Exported statistics 6.1. received_replies

13 years, 5 months

git:master: dbschema: regenerated db creation scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7ed91f0632fac344668ee7be5332d8e45490e2cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ed91f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 18 19:42:27 2011 +0200 dbschema: regenerated db creation scripts - updates to lcr tables and rls_watchers --- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/lcr-create.sql | 5 +++-- utils/kamctl/mysql/rls-create.sql | 4 ++-- utils/kamctl/oracle/lcr-create.sql | 5 +++-- utils/kamctl/oracle/rls-create.sql | 4 ++-- utils/kamctl/postgres/lcr-create.sql | 5 +++-- utils/kamctl/postgres/rls-create.sql | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 28d3bba..c533ac2 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -16,10 +16,10 @@ address| address|4 aliases| aliases|1004 -carrierfailureroute| -carrierfailureroute|2 carrier_name| carrier_name|1 +carrierfailureroute| +carrierfailureroute|2 carrierroute| carrierroute|3 cpl| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 0b9aad0..4410f97 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,8 +3,8 @@ acc:4 active_watchers:9 address:4 aliases:1004 -carrierfailureroute:2 carrier_name:1 +carrierfailureroute:2 carrierroute:3 cpl:1 dbaliases:1 diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index 0c23051..f0887c5 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -13,10 +13,11 @@ CREATE TABLE lcr_gw ( prefix VARCHAR(16) DEFAULT NULL, tag VARCHAR(64) DEFAULT NULL, flags INT UNSIGNED DEFAULT 0 NOT NULL, - defunct INT UNSIGNED DEFAULT NULL, - CONSTRAINT lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) + defunct INT UNSIGNED DEFAULT NULL ) ENGINE=MyISAM; +CREATE INDEX lcr_id_idx ON lcr_gw (lcr_id); + INSERT INTO version (table_name, table_version) values ('lcr_rule_target','1'); CREATE TABLE lcr_rule_target ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/mysql/rls-create.sql b/utils/kamctl/mysql/rls-create.sql index 28e8067..9b4e66d 100644 --- a/utils/kamctl/mysql/rls-create.sql +++ b/utils/kamctl/mysql/rls-create.sql @@ -26,10 +26,10 @@ CREATE TABLE rls_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INT(11) NOT NULL, remote_cseq INT(11) NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INT(11) NOT NULL, status INT(11) DEFAULT 2 NOT NULL, diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index 89e9bbc..bdf3dc2 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -13,8 +13,7 @@ CREATE TABLE lcr_gw ( prefix VARCHAR2(16) DEFAULT NULL, tag VARCHAR2(64) DEFAULT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, - defunct NUMBER(10) DEFAULT NULL, - CONSTRAINT ORA_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) + defunct NUMBER(10) DEFAULT NULL ); CREATE OR REPLACE TRIGGER lcr_gw_tr @@ -25,6 +24,8 @@ END lcr_gw_tr; / BEGIN map2users('lcr_gw'); END; / +CREATE INDEX lcr_gw_lcr_id_idx ON lcr_gw (lcr_id); + INSERT INTO version (table_name, table_version) values ('lcr_rule_target','1'); CREATE TABLE lcr_rule_target ( id NUMBER(10) PRIMARY KEY, diff --git a/utils/kamctl/oracle/rls-create.sql b/utils/kamctl/oracle/rls-create.sql index 2d46b15..fdd64c3 100644 --- a/utils/kamctl/oracle/rls-create.sql +++ b/utils/kamctl/oracle/rls-create.sql @@ -34,10 +34,10 @@ CREATE TABLE rls_watchers ( event_id VARCHAR2(64), to_tag VARCHAR2(64), from_tag VARCHAR2(64), - callid VARCHAR2(64), + callid VARCHAR2(128), local_cseq NUMBER(10), remote_cseq NUMBER(10), - contact VARCHAR2(64), + contact VARCHAR2(128), record_route CLOB, expires NUMBER(10), status NUMBER(10) DEFAULT 2 NOT NULL, diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 714615f..316e3ab 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -13,10 +13,11 @@ CREATE TABLE lcr_gw ( prefix VARCHAR(16) DEFAULT NULL, tag VARCHAR(64) DEFAULT NULL, flags INTEGER DEFAULT 0 NOT NULL, - defunct INTEGER DEFAULT NULL, - CONSTRAINT lcr_gw_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) + defunct INTEGER DEFAULT NULL ); +CREATE INDEX lcr_gw_lcr_id_idx ON lcr_gw (lcr_id); + INSERT INTO version (table_name, table_version) values ('lcr_rule_target','1'); CREATE TABLE lcr_rule_target ( id SERIAL PRIMARY KEY NOT NULL, diff --git a/utils/kamctl/postgres/rls-create.sql b/utils/kamctl/postgres/rls-create.sql index 2da3fe2..4cb0d13 100644 --- a/utils/kamctl/postgres/rls-create.sql +++ b/utils/kamctl/postgres/rls-create.sql @@ -26,10 +26,10 @@ CREATE TABLE rls_watchers ( event_id VARCHAR(64), to_tag VARCHAR(64) NOT NULL, from_tag VARCHAR(64) NOT NULL, - callid VARCHAR(64) NOT NULL, + callid VARCHAR(128) NOT NULL, local_cseq INTEGER NOT NULL, remote_cseq INTEGER NOT NULL, - contact VARCHAR(64) NOT NULL, + contact VARCHAR(128) NOT NULL, record_route TEXT, expires INTEGER NOT NULL, status INTEGER DEFAULT 2 NOT NULL,

13 years, 5 months

git:master: tmx: added t_reply_callid MI command

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 03cda297c97bc098c0389b04b180a6ec27c3e5e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=03cda29… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 18 19:30:09 2011 +0200 tmx: added t_reply_callid MI command - patch by Helmut Grohne --- modules_k/tmx/t_mi.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/tmx/t_mi.h | 3 ++ modules_k/tmx/tmx_mod.c | 1 + 3 files changed, 78 insertions(+), 0 deletions(-) diff --git a/modules_k/tmx/t_mi.c b/modules_k/tmx/t_mi.c index 405ed88..973061e 100644 --- a/modules_k/tmx/t_mi.c +++ b/modules_k/tmx/t_mi.c @@ -824,3 +824,77 @@ struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param) return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); } +/* + Syntax of "t_reply_callid" : + code + reason + callid + cseq + to_tag + new headers + [Body] +*/ +struct mi_root* mi_tm_reply_callid(struct mi_root* cmd_tree, void* param) +{ + struct mi_node* node; + unsigned int rpl_code; + struct cell *trans; + str reason = {0, 0}; + str totag = {0, 0}; + str new_hdrs = {0, 0}; + str body = {0, 0}; + str callid = {0, 0}; + str cseq = {0, 0}; + int n; + + for( n=0,node = cmd_tree->node.kids; n<7 && node ; n++,node=node->next ); + if ( !(n==6 || n==7) || node!=0) + return init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN); + + /* get all info from the command */ + + /* reply code (param 1) */ + node = cmd_tree->node.kids; + if (str2int( &node->value, &rpl_code)!=0 || rpl_code>=700) + return init_mi_tree( 400, "Invalid reply code", 18); + + /* reason text (param 2) */ + node = node->next; + reason = node->value; + + /* callid (param 3) */ + node = node->next; + callid = node->value; + + /* cseq (param 4) */ + node = node->next; + cseq = node->value; + + if(_tmx_tmb.t_lookup_callid( &trans, callid, cseq) < 0 ) + return init_mi_tree( 400, "Lookup failed - no transaction", 30); + + /* to_tag (param 5) */ + node = node->next; + totag = node->value; + + /* new headers (param 6) */ + node = node->next; + if (!(node->value.len==1 && node->value.s[0]=='.')) + new_hdrs = node->value; + + /* body (param 7 - optional) */ + node = node->next; + if (node) + body = node->value; + + /* it's refcounted now, t_reply_with body unrefs for me -- I can + * continue but may not use T anymore */ + n = _tmx_tmb.t_reply_with_body(trans, rpl_code, &reason, &body, + &new_hdrs, &totag); + + if (n<0) + return init_mi_tree( 500, "Reply failed", 12); + + return init_mi_tree( 200, MI_OK_S, MI_OK_LEN); +} + diff --git a/modules_k/tmx/t_mi.h b/modules_k/tmx/t_mi.h index 23c4f9f..3b10d57 100644 --- a/modules_k/tmx/t_mi.h +++ b/modules_k/tmx/t_mi.h @@ -43,6 +43,7 @@ #define MI_TM_CANCEL "t_uac_cancel" #define MI_TM_HASH "t_hash" #define MI_TM_REPLY "t_reply" +#define MI_TM_REPLY_CALLID "t_reply_callid" struct mi_root* mi_tm_uac_dlg(struct mi_root* cmd_tree, void* param); @@ -52,4 +53,6 @@ struct mi_root* mi_tm_hash(struct mi_root* cmd_tree, void* param); struct mi_root* mi_tm_reply(struct mi_root* cmd_tree, void* param); +struct mi_root* mi_tm_reply_callid(struct mi_root* cmd_tree, void* param); + #endif diff --git a/modules_k/tmx/tmx_mod.c b/modules_k/tmx/tmx_mod.c index 36f7e6c..8a36352 100644 --- a/modules_k/tmx/tmx_mod.c +++ b/modules_k/tmx/tmx_mod.c @@ -129,6 +129,7 @@ static mi_export_t mi_cmds [] = { {MI_TM_CANCEL, mi_tm_cancel, 0, 0, 0 }, {MI_TM_HASH, mi_tm_hash, MI_NO_INPUT_FLAG, 0, 0 }, {MI_TM_REPLY, mi_tm_reply, 0, 0, 0 }, + {MI_TM_REPLY_CALLID, mi_tm_reply_callid, 0, 0, 0 }, {0,0,0,0,0} };

13 years, 5 months

← Newer
1
...
5
6
7
8
9
10
11
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2011