sr-dev December 2009

sr-dev@lists.kamailio.org

26 participants
157 discussions

git:kamailio_3.0: dialog: new column to hold request uri
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 1f64908ea0e6ad14ad6d209ba0eeb7b11c6b1e18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1f64908… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 19 23:02:32 2009 +0100 dialog: new column to hold request uri - table version set to 4 - regenerated db creation scripts --- lib/srdb1/schema/dialog.xml | 9 ++++++++- utils/kamctl/db_berkeley/kamailio/dialog | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/dbtext/kamailio/dialog | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/dialog-create.sql | 5 +++-- utils/kamctl/oracle/dialog-create.sql | 5 +++-- utils/kamctl/postgres/dialog-create.sql | 5 +++-- 8 files changed, 22 insertions(+), 12 deletions(-) diff --git a/lib/srdb1/schema/dialog.xml b/lib/srdb1/schema/dialog.xml index cb0f931..9e69cf7 100644 --- a/lib/srdb1/schema/dialog.xml +++ b/lib/srdb1/schema/dialog.xml @@ -9,7 +9,7 @@ <table id="dialog" xmlns:db="http://docbook.org/ns/docbook"> <name>dialog</name> - <version>3</version> + <version>4</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>Persistent dialog information for the dialog module. More @@ -185,6 +185,13 @@ </description> </column> + <column> + <name>req_uri</name> + <type>string</type> + <size>&uri_len;</size> + <description>The URI of initial request in dialog</description> + </column> + <index> <name>hash_idx</name> <colref linkend="hash_entry"/> diff --git a/utils/kamctl/db_berkeley/kamailio/dialog b/utils/kamctl/db_berkeley/kamailio/dialog index afce2f1..0a1420c 100644 --- a/utils/kamctl/db_berkeley/kamailio/dialog +++ b/utils/kamctl/db_berkeley/kamailio/dialog @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) +id(int) hash_entry(int) hash_id(int) callid(str) from_uri(str) from_tag(str) to_uri(str) to_tag(str) caller_cseq(str) callee_cseq(str) caller_route_set(str) callee_route_set(str) caller_contact(str) callee_contact(str) caller_sock(str) callee_sock(str) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(str) METADATA_KEY 1 2 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0 +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|0|0|0|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index e03028f..de51b44 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -27,7 +27,7 @@ cpl|1 dbaliases| dbaliases|1 dialog| -dialog|3 +dialog|4 dialplan| dialplan|1 dispatcher| diff --git a/utils/kamctl/dbtext/kamailio/dialog b/utils/kamctl/dbtext/kamailio/dialog index d6e80be..0b852ca 100644 --- a/utils/kamctl/dbtext/kamailio/dialog +++ b/utils/kamctl/dbtext/kamailio/dialog @@ -1 +1 @@ -id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) +id(int,auto) hash_entry(int) hash_id(int) callid(string) from_uri(string) from_tag(string) to_uri(string) to_tag(string) caller_cseq(string) callee_cseq(string) caller_route_set(string,null) callee_route_set(string,null) caller_contact(string) callee_contact(string) caller_sock(string) callee_sock(string) state(int) start_time(int) timeout(int) sflags(int) toroute(int) req_uri(string) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 5b9b49d..09afa74 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -8,7 +8,7 @@ carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 -dialog:3 +dialog:4 dialplan:1 dispatcher:3 domain:1 diff --git a/utils/kamctl/mysql/dialog-create.sql b/utils/kamctl/mysql/dialog-create.sql index 1eb934d..b89f3a3 100644 --- a/utils/kamctl/mysql/dialog-create.sql +++ b/utils/kamctl/mysql/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','3'); +INSERT INTO version (table_name, table_version) values ('dialog','4'); CREATE TABLE dialog ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, hash_entry INT(10) UNSIGNED NOT NULL, @@ -20,7 +20,8 @@ CREATE TABLE dialog ( start_time INT(10) UNSIGNED NOT NULL, timeout INT(10) UNSIGNED DEFAULT 0 NOT NULL, sflags INT(10) UNSIGNED DEFAULT 0 NOT NULL, - toroute INT(10) UNSIGNED DEFAULT 0 NOT NULL + toroute INT(10) UNSIGNED DEFAULT 0 NOT NULL, + req_uri VARCHAR(128) NOT NULL ) ENGINE=MyISAM; CREATE INDEX hash_idx ON dialog (hash_entry, hash_id); diff --git a/utils/kamctl/oracle/dialog-create.sql b/utils/kamctl/oracle/dialog-create.sql index 029b26e..4911fa1 100644 --- a/utils/kamctl/oracle/dialog-create.sql +++ b/utils/kamctl/oracle/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','3'); +INSERT INTO version (table_name, table_version) values ('dialog','4'); CREATE TABLE dialog ( id NUMBER(10) PRIMARY KEY, hash_entry NUMBER(10), @@ -20,7 +20,8 @@ CREATE TABLE dialog ( start_time NUMBER(10), timeout NUMBER(10) DEFAULT 0 NOT NULL, sflags NUMBER(10) DEFAULT 0 NOT NULL, - toroute NUMBER(10) DEFAULT 0 NOT NULL + toroute NUMBER(10) DEFAULT 0 NOT NULL, + req_uri VARCHAR2(128) ); CREATE OR REPLACE TRIGGER dialog_tr diff --git a/utils/kamctl/postgres/dialog-create.sql b/utils/kamctl/postgres/dialog-create.sql index 9486ebd..90faadf 100644 --- a/utils/kamctl/postgres/dialog-create.sql +++ b/utils/kamctl/postgres/dialog-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('dialog','3'); +INSERT INTO version (table_name, table_version) values ('dialog','4'); CREATE TABLE dialog ( id SERIAL PRIMARY KEY NOT NULL, hash_entry INTEGER NOT NULL, @@ -20,7 +20,8 @@ CREATE TABLE dialog ( start_time INTEGER NOT NULL, timeout INTEGER DEFAULT 0 NOT NULL, sflags INTEGER DEFAULT 0 NOT NULL, - toroute INTEGER DEFAULT 0 NOT NULL + toroute INTEGER DEFAULT 0 NOT NULL, + req_uri VARCHAR(128) NOT NULL ); CREATE INDEX dialog_hash_idx ON dialog (hash_entry, hash_id);

1 0

git:kamailio_3.0: pua_dialoginfo: use contact addresses in document
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: d35df0cdab10aa83b3ceedde3a8cde8baeabfc79 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d35df0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 19 23:26:01 2009 +0100 pua_dialoginfo: use contact addresses in document - for local and remote targets - patch by Santiago Gimeno, FS#20 --- modules_k/pua_dialoginfo/dialog_publish.c | 16 ++++++++-- modules_k/pua_dialoginfo/pua_dialoginfo.c | 47 ++++++++++++++++++++-------- modules_k/pua_dialoginfo/pua_dialoginfo.h | 4 ++- 3 files changed, 49 insertions(+), 18 deletions(-) diff --git a/modules_k/pua_dialoginfo/dialog_publish.c b/modules_k/pua_dialoginfo/dialog_publish.c index 59c5bc6..8b15c77 100644 --- a/modules_k/pua_dialoginfo/dialog_publish.c +++ b/modules_k/pua_dialoginfo/dialog_publish.c @@ -55,7 +55,8 @@ void print_publ(publ_info_t* p) } str* build_dialoginfo(char *state, str *entity, str *peer, str *callid, - unsigned int initiator, str *localtag, str *remotetag) + unsigned int initiator, str *localtag, str *remotetag, + str *localtarget, str *remotetarget) { xmlDocPtr doc = NULL; xmlNodePtr root_node = NULL; @@ -187,6 +188,10 @@ str* build_dialoginfo(char *state, str *entity, str *peer, str *callid, LM_ERR("while adding child\n"); goto error; } + if (remotetarget && remotetarget->s) { + memcpy(buf, remotetarget->s, remotetarget->len); + buf[remotetarget->len]= '\0'; + } xmlNewProp(tag_node, BAD_CAST "uri", BAD_CAST buf); /* local tag*/ @@ -216,6 +221,10 @@ str* build_dialoginfo(char *state, str *entity, str *peer, str *callid, LM_ERR("while adding child\n"); goto error; } + if (localtarget && localtarget->s) { + memcpy(buf, localtarget->s, localtarget->len); + buf[localtarget->len]= '\0'; + } xmlNewProp(tag_node, BAD_CAST "uri", BAD_CAST buf); } @@ -251,7 +260,8 @@ error: } void dialog_publish(char *state, str *entity, str *peer, str *callid, - unsigned int initiator, unsigned int lifetime, str *localtag, str *remotetag) + unsigned int initiator, unsigned int lifetime, str *localtag, str *remotetag, + str *localtarget, str *remotetarget) { str* body= NULL; str uri= {NULL, 0}; @@ -273,7 +283,7 @@ void dialog_publish(char *state, str *entity, str *peer, str *callid, content_type.s= "application/dialog-info+xml"; content_type.len= 27; - body= build_dialoginfo(state, entity, peer, callid, initiator, localtag, remotetag); + body= build_dialoginfo(state, entity, peer, callid, initiator, localtag, remotetag, localtarget, remotetarget); if(body == NULL || body->s == NULL) goto error; diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index f95e0c6..f2731c0 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -41,6 +41,7 @@ #include "../../mem/shm_mem.h" #include "../../parser/msg_parser.h" #include "../../parser/parse_to.h" +#include "../../parser/contact/parse_contact.h" #include "../../str.h" #include "../../mem/mem.h" #include "../../pt.h" @@ -199,6 +200,8 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para { str tag = {0,0}; str uri = {0,0}; + str target = {0,0}; + struct dlginfo_cell *dlginfo = (struct dlginfo_cell*)*_params->param; if (include_req_uri) { @@ -212,18 +215,30 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para case DLGCB_TERMINATED: case DLGCB_EXPIRED: LM_DBG("dialog over, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); + dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0, &target, &(dlginfo->from_contact)); break; case DLGCB_CONFIRMED: case DLGCB_REQ_WITHIN: LM_DBG("dialog confirmed, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("confirmed", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); + dialog_publish("confirmed", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0, &target, &(dlginfo->from_contact)); break; case DLGCB_EARLY: LM_DBG("dialog is early, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); if (include_tags) { + /* get remotetarget */ + if ( !_params->msg->contact && ((parse_headers(_params->msg, HDR_CONTACT_F,0)<0) || !_params->msg->contact) ) { + LM_ERR("bad reply or missing CONTACT hdr\n"); + } else { + if ( parse_contact(_params->msg->contact)<0 || + ((contact_body_t *)_params->msg->contact->parsed)->contacts==NULL || + ((contact_body_t *)_params->msg->contact->parsed)->contacts->next!=NULL ) { + LM_ERR("Malformed CONTACT hdr\n"); + } else { + target = ((contact_body_t *)_params->msg->contact->parsed)->contacts->uri; + } + } /* get to tag*/ if ( !_params->msg->to && ((parse_headers(_params->msg, HDR_TO_F,0)<0) || !_params->msg->to) ) { LM_ERR("bad reply or missing TO hdr :-/\n"); @@ -238,27 +253,27 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para } } if (caller_confirmed) { - dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag, &(dlginfo->from_contact), &target); } else { - dialog_publish("early", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); + dialog_publish("early", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag, &(dlginfo->from_contact), &target); } - dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, &tag, &(dlginfo->from_tag)); + dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, &tag, &(dlginfo->from_tag), &target, &(dlginfo->from_contact)); } else { if (caller_confirmed) { - dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); } else { - dialog_publish("early", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("early", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); } - dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0, &target, &(dlginfo->from_contact)); } break; default: LM_ERR("unhandled dialog callback type %d received, from=%.*s\n", type, dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0, &(dlginfo->from_contact), &target); + dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0, &target, &(dlginfo->from_contact)); } } @@ -281,7 +296,8 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) dlg->to_uri.len + dlg->callid.len + dlg->tag[0].len + - dlg->req_uri.len; + dlg->req_uri.len + + dlg->contact[0].len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -302,11 +318,14 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) dlginfo->from_tag.len = dlg->tag[0].len; dlginfo->req_uri.s = dlginfo->from_tag.s + dlginfo->from_tag.len; dlginfo->req_uri.len = dlg->req_uri.len; + dlginfo->from_contact.s = dlginfo->req_uri.s + dlginfo->req_uri.len; + dlginfo->from_contact.len = dlg->contact[0].len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); memcpy(dlginfo->callid.s, dlg->callid.s, dlg->callid.len); memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); + memcpy(dlginfo->from_contact.s, dlg->contact[0].s, dlg->contact[0].len); /* register dialog callbacks which triggers sending PUBLISH */ if (dlg_api.register_dlgcb(dlg, @@ -329,7 +348,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) } #endif - dialog_publish("Trying", &(dlg->from_uri), &(dlg->to_uri), &(dlg->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("Trying", &(dlg->from_uri), (include_req_uri)?&(dlg->req_uri):&(dlg->to_uri), &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0); } diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.h b/modules_k/pua_dialoginfo/pua_dialoginfo.h index 74cc6e0..7ff71b7 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.h +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.h @@ -30,7 +30,8 @@ extern send_publish_t pua_send_publish; void dialog_publish(char *state, str *entity, str *peer, str *callid, - unsigned int initiator, unsigned int lifetime, str *localtag, str *remotetag); + unsigned int initiator, unsigned int lifetime, str *localtag, str *remotetag, + str *localtarget, str *remotetarget); /* store the important data locally to avoid reading the data from the dlg_cell during the callback (as this could create a race condition @@ -42,6 +43,7 @@ struct dlginfo_cell { str from_tag; /* str *to_tag; */ str req_uri; + str from_contact; unsigned int lifetime; };

1 0

git:kamailio_3.0: pua_dialoginfo: patch from FS#18
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 09d1bdc38b51619c65c6a9ec8f293cf9c395c6c1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09d1bdc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 19 22:58:26 2009 +0100 pua_dialoginfo: patch from FS#18 - applied patch from Francisco Javier Lizaran Vilches - use r-uri in published document --- modules_k/pua_dialoginfo/pua_dialoginfo.c | 42 ++++++++++++++++++++-------- modules_k/pua_dialoginfo/pua_dialoginfo.h | 1 + 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index eab17d1..f95e0c6 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -57,6 +57,7 @@ MODULE_VERSION #define DEF_INCLUDE_TAGS 1 #define DEF_OVERRIDE_LIFETIME 0 #define DEF_CALLER_ALWAYS_CONFIRMED 0 +#define DEF_INCLUDE_REQ_URI 0 /* define PUA_DIALOGINFO_DEBUG to activate more verbose * logging and dialog info callback debugging @@ -73,6 +74,7 @@ int include_localremote = DEF_INCLUDE_LOCALREMOTE; int include_tags = DEF_INCLUDE_TAGS; int override_lifetime = DEF_OVERRIDE_LIFETIME; int caller_confirmed = DEF_CALLER_ALWAYS_CONFIRMED; +int include_req_uri = DEF_INCLUDE_REQ_URI; send_publish_t pua_send_publish; @@ -92,6 +94,7 @@ static param_export_t params[]={ {"include_tags", INT_PARAM, &include_tags }, {"override_lifetime", INT_PARAM, &override_lifetime }, {"caller_confirmed", INT_PARAM, &caller_confirmed }, + {"include_req_uri", INT_PARAM, &include_req_uri }, {0, 0, 0 } }; @@ -195,21 +198,28 @@ static void __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { str tag = {0,0}; + str uri = {0,0}; struct dlginfo_cell *dlginfo = (struct dlginfo_cell*)*_params->param; + if (include_req_uri) { + uri = dlginfo->req_uri; + } else { + uri = dlginfo->to_uri; + } + switch (type) { case DLGCB_FAILED: case DLGCB_TERMINATED: case DLGCB_EXPIRED: LM_DBG("dialog over, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("terminated", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("terminated", &(dlginfo->to_uri), &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); break; case DLGCB_CONFIRMED: case DLGCB_REQ_WITHIN: LM_DBG("dialog confirmed, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("confirmed", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("confirmed", &(dlginfo->to_uri), &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("confirmed", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); break; case DLGCB_EARLY: LM_DBG("dialog is early, from=%.*s\n", dlginfo->from_uri.len, dlginfo->from_uri.s); @@ -228,24 +238,28 @@ __dialog_sendpublish(struct dlg_cell *dlg, int type, struct dlg_cb_params *_para } } if (caller_confirmed) { - dialog_publish("confirmed", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); } else { - dialog_publish("early", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); + dialog_publish("early", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, &(dlginfo->from_tag), &tag); } - dialog_publish("early", &(dlginfo->to_uri), &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, &tag, &(dlginfo->from_tag)); + dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, &tag, &(dlginfo->from_tag)); + } else { if (caller_confirmed) { - dialog_publish("confirmed", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("confirmed", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + } else { dialog_publish("early", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); } - dialog_publish("early", &(dlginfo->to_uri), &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("early", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + } break; default: LM_ERR("unhandled dialog callback type %d received, from=%.*s\n", type, dlginfo->from_uri.len, dlginfo->from_uri.s); - dialog_publish("terminated", &(dlginfo->from_uri), &(dlginfo->to_uri), &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); - dialog_publish("terminated", &(dlginfo->to_uri), &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &(dlginfo->from_uri), &uri, &(dlginfo->callid), 1, dlginfo->lifetime, 0, 0); + dialog_publish("terminated", &uri, &(dlginfo->from_uri), &(dlginfo->callid), 0, dlginfo->lifetime, 0, 0); + } } @@ -266,7 +280,8 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) dlg->from_uri.len + dlg->to_uri.len + dlg->callid.len + - dlg->tag[0].len; + dlg->tag[0].len + + dlg->req_uri.len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -285,10 +300,13 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) dlginfo->callid.len = dlg->callid.len; dlginfo->from_tag.s = dlginfo->callid.s + dlg->callid.len; dlginfo->from_tag.len = dlg->tag[0].len; + dlginfo->req_uri.s = dlginfo->from_tag.s + dlginfo->from_tag.len; + dlginfo->req_uri.len = dlg->req_uri.len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); memcpy(dlginfo->callid.s, dlg->callid.s, dlg->callid.len); memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); + memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); /* register dialog callbacks which triggers sending PUBLISH */ if (dlg_api.register_dlgcb(dlg, diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.h b/modules_k/pua_dialoginfo/pua_dialoginfo.h index 627fced..74cc6e0 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.h +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.h @@ -41,6 +41,7 @@ struct dlginfo_cell { str callid; str from_tag; /* str *to_tag; */ + str req_uri; unsigned int lifetime; };

1 0

git:kamailio_3.0: dialog(k): patch from FS#18
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: df950f2a01f5f3d3da04e84a4f4a1cb810def038 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df950f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 19 22:44:28 2009 +0100 dialog(k): patch from FS#18 - reworked part of patch from Francisco Javier Lizaran Vilches - add r-uri to dialog structure - r-uri value can be specified as PV via parameter, default is $ru - for dlg_bridge, r-uri is same as to-uri --- modules_k/dialog/dialog.c | 15 +++++++++++++++ modules_k/dialog/dlg_db_handler.c | 23 ++++++++++++++++------- modules_k/dialog/dlg_db_handler.h | 5 +++-- modules_k/dialog/dlg_handlers.c | 10 +++++++++- modules_k/dialog/dlg_hash.c | 12 +++++++++--- modules_k/dialog/dlg_hash.h | 4 +++- modules_k/dialog/dlg_transfer.c | 7 ++++--- 7 files changed, 59 insertions(+), 17 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=df9…

1 0

[tracker] Comment added: modules/mi_rpc should support t_uac_dlg async mi command
by sip-router 19 Dec '09

19 Dec '09

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#10 - modules/mi_rpc should support t_uac_dlg async mi command User who did this - Daniel-Constantin Mierla (miconda) ---------- I think this is implemented, if yes, then should close this issue. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=10#comment10 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Kamailio 3.0.0-RC3 Released
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Kamailio v3.0.0-RC3 is out - the tarball with sources is available at: http://www.kamailio.org/pub/kamailio/3.0.0-rc3/src/kamailio-3.0.0-rc3_src.t… Lot of fixes to packaging, code and documentation have been committed since RC1, Kamailio 3.0.0-RC3 becoming ready for pre-production phase. If you like to work with sources, then use the tutorial guiding the installation of Kamailio 3.0 branch from GIT repository: http://www.kamailio.org/dokuwiki/doku.php/install:kamailio-3.0.x-from-git Two wiki pages were created to collect what is new in Kamailio 3.0 and how to migrate to this version: http://www.kamailio.org/dokuwiki/doku.php/features:new-in-3.0.x http://www.kamailio.org/dokuwiki/doku.php/install:1.5.x-to-3.0.0 Feel free to contribute to wiki pages, helping to build migration tutorials. This is the last RC before full 3.0.0 relase. Please report any issue you find to sr-dev(a)lists.sip-router.org Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

2 3

git:kamailio_3.0: Makefile: fix name of cfgutils in group kstandard
by Daniel-Constantin Mierla 19 Dec '09

19 Dec '09

Module: sip-router Branch: kamailio_3.0 Commit: 78e097fb1f185796abeff27e5978bc82bdb6526f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78e097f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 19 19:54:16 2009 +0100 Makefile: fix name of cfgutils in group kstandard - wrong name having '_' caused the module not to be packaged in debs - reported by Klaus Darilion --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c274022..1be6f4a 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ module_group_experimental=tls oracle iptrtpproxy # Kamailio specific groups # Standard modules in K Debian distro module_group_kstandard=acc alias_db auth auth_db benchmark call_control \ - cfg_utils db_text dialog dispatcher diversion domain drouting \ + cfgutils db_text dialog dispatcher diversion domain drouting \ exec group htable imc kex maxfwd mi_datagram mi_fifo msilo \ nat_traversal nathelper path pdt permissions pike pv qos \ ratelimit regex registrar rr rtimer siptrace siputils sl sms \

1 0

How to parse msg stored in the tm correctly?
by Min Wang 19 Dec '09

19 Dec '09

Hi Ser Gurus: How to parse msg stored in the tm correctly? e.g in the reply msg, we can get the corresponding request from tm: msg = t->uas.request; The sip_msg_cloner seems copy only via/from/to/cseq/auth headers and parsed headers to the shm, right? what if we want to parse the other headers, e.g: parse_headers(msg, HDR_ROUTE_F, 0)<0) The parse_headers uses pkg_alloc, thus the parsed result is pkg_alloced and stored the tm structure, then it never get freed until tm is destoried ( but even in this case tm may call shm_free instead of pkg_free???? ) So how can we parsed the tm-stored msg and how to do it correctly? ( ps: The question is related to: http://lists.berlios.de/pipermail/openimscore-cscf/2009-December/002315. html) Kind Regards Min Wang

2 2

old string reference in ul_mi.c
by Juha Heinanen 19 Dec '09

19 Dec '09

perhaps this old reference to openser in ul_mi.c should be replaced by a Makefile.defs variable: /*! call-id used for ul_add and ul_rm_contact */ static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)openser.mi"); also this string could be a variable: /*! user agent used for ul_add */ static str mi_ul_ua = str_init("Kamailio MI Server"); -- juha

1 0

Kamailio + CSQL + module
by Ramu 18 Dec '09

18 Dec '09

Hi All, We would like to write module for CSQL DB support for Kamailio. We would like to hear your suggestions on this. CSQL has support for ODBC. You can find more details about this in-memory database http://www.csqldb.com/ We will be waiting for your valuable suggestions. Thanks, Ramu

4 5

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2009