sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

[ openser-Bugs-2814137 ] force_rtp_proxy bug
by SourceForge.net 30 Jun '09

30 Jun '09

Bugs item #2814137, was opened at 2009-06-29 17:29 Message generated for change (Comment added) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Marcus Hunger (marcushunger) Assigned to: Nobody/Anonymous (nobody) Summary: force_rtp_proxy bug Initial Comment: force_rtp_proxy seems to handle re-invite wrong, resulting in one-way-audio. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-06-30 13:15 Message: in detail, the sdp is rewritten with the wrong port for this direction of the session. it's the same as the answer's which does not work. to build the query for the rtp-proxy from- and to-tag the have to be reversed in this case. ---------------------------------------------------------------------- Comment By: Marcus Hunger (marcushunger) Date: 2009-06-30 09:45 Message: happens when i handle a reinvite with rtpproxy_offer("l") ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-06-29 18:19 Message: When is this happening? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&group_…

1 0

git:master: carrierroute: port from 1.5 branch, r5876, remove dead code ( double return)
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: a06115db66feb2aa2b70afe5f98e02d7ba3b51d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a06115d… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 14:12:28 2009 +0200 carrierroute: port from 1.5 branch, r5876, remove dead code (double return) --- modules/carrierroute/cr_fifo.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 065cdc1..48b7267 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -162,7 +162,6 @@ struct mi_root* dump_fifo (struct mi_root* cmd_tree, void *param) { } release_data (rd); return rpl_tree; - return 0; error: release_data (rd);

1 0

git:master: carrierroute: port from 1.5 branch, r5885
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 68b6d2a99475cc0fdff9093d7212e91d4227c72f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68b6d2a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 14:19:52 2009 +0200 carrierroute: port from 1.5 branch, r5885 - apparently its not possible to use ID 0 with autoincrement columns, so we should start the example domain with id '1' --- modules/carrierroute/README | 32 +++++++++++----------- modules/carrierroute/doc/carrierroute_admin.xml | 30 ++++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/modules/carrierroute/README b/modules/carrierroute/README index e64108b..eba27e5 100644 --- a/modules/carrierroute/README +++ b/modules/carrierroute/README @@ -854,17 +854,17 @@ domain register { +----+---------+--------+-------------+-------+------+---------------+ | id | carrier | domain | scan_prefix | flags | prob | rewrite_host | +----+---------+--------+-------------+-------+------+---------------+ -| 1 | 1 | 0 | 49 | 0 | 0.5 | de-1.carrier1 | -| 2 | 1 | 0 | 49 | 0 | 0.5 | de-2.carrier1 | -| 3 | 1 | 0 | 49 | 16 | 1 | de-3.carrier1 | -| 4 | 1 | 0 | | 0 | 1 | gw.carrier1-1 | -| 5 | 1 | 1 | 49 | 0 | 1 | gw.carrier1-1 | -| 6 | 1 | 2 | | 0 | 1 | gw.carrier1-2 | -| 7 | 1 | 3 | | 0 | 1 | gw.carrier1-3 | -| 8 | 2 | 0 | 49 | 0 | 0.5 | de-1.carrier2 | -| 9 | 2 | 0 | 49 | 0 | 0.5 | de-2.carrier2 | -| 10 | 2 | 0 | | 0 | 1 | gw.carrier2 | -| 11 | 2 | 1 | 49 | 0 | 1 | gw.carrier2 | +| 1 | 1 | 1 | 49 | 0 | 0.5 | de-1.carrier1 | +| 2 | 1 | 1 | 49 | 0 | 0.5 | de-2.carrier1 | +| 3 | 1 | 1 | 49 | 16 | 1 | de-3.carrier1 | +| 4 | 1 | 1 | | 0 | 1 | gw.carrier1-1 | +| 5 | 1 | 2 | 49 | 0 | 1 | gw.carrier1-1 | +| 6 | 1 | 3 | | 0 | 1 | gw.carrier1-2 | +| 7 | 1 | 4 | | 0 | 1 | gw.carrier1-3 | +| 8 | 2 | 1 | 49 | 0 | 0.5 | de-1.carrier2 | +| 9 | 2 | 1 | 49 | 0 | 0.5 | de-2.carrier2 | +| 10 | 2 | 1 | | 0 | 1 | gw.carrier2 | +| 11 | 2 | 2 | 49 | 0 | 1 | gw.carrier2 | | 12 | 3 | 8 | 49 | 0 | 1 | de-gw.default | | 13 | 3 | 8 | | 0 | 1 | gw.default | +----+---------+--------+-------------+-------+------+---------------+ @@ -875,9 +875,9 @@ domain register { and carrier 1. The gateways for the default carrier will be used for functions that don't support the user specific carrier lookup. The routing rules for carrier 1 and carrier 2 for the - "49" prefix contains a additional rule with the domain 1, that - can be used for example as fallback if the gateways in domain 0 - are not reachable. Two more fallback rules (domain 2 and 3) for + "49" prefix contains a additional rule with the domain 2, that + can be used for example as fallback if the gateways in domain 1 + are not reachable. Two more fallback rules (domain 3 and 4) for carrier 1 are also supplied to support the functionality of the carrierfailureroute table example that is provided in the next section. @@ -894,8 +894,8 @@ domain register { +----+---------+--------+---------------+------------+-------------+ | id | carrier | domain | host_name | reply_code | next_domain | +----+---------+--------+---------------+------------+-------------+ -| 1 | 1 | 0 | gw.carrier1-2 | ... | 3 | -| 2 | 1 | 0 | gw.carrier1-3 | ... | 2 | +| 1 | 1 | 1 | gw.carrier1-2 | ... | 3 | +| 2 | 1 | 1 | gw.carrier1-3 | ... | 2 | +----+---------+--------+---------------+------------+-------------+ ... diff --git a/modules/carrierroute/doc/carrierroute_admin.xml b/modules/carrierroute/doc/carrierroute_admin.xml index 0e0a5bb..d6b927f 100644 --- a/modules/carrierroute/doc/carrierroute_admin.xml +++ b/modules/carrierroute/doc/carrierroute_admin.xml @@ -1000,17 +1000,17 @@ domain register { +----+---------+--------+-------------+-------+------+---------------+ | id | carrier | domain | scan_prefix | flags | prob | rewrite_host | +----+---------+--------+-------------+-------+------+---------------+ -| 1 | 1 | 0 | 49 | 0 | 0.5 | de-1.carrier1 | -| 2 | 1 | 0 | 49 | 0 | 0.5 | de-2.carrier1 | -| 3 | 1 | 0 | 49 | 16 | 1 | de-3.carrier1 | -| 4 | 1 | 0 | | 0 | 1 | gw.carrier1-1 | -| 5 | 1 | 1 | 49 | 0 | 1 | gw.carrier1-1 | -| 6 | 1 | 2 | | 0 | 1 | gw.carrier1-2 | -| 7 | 1 | 3 | | 0 | 1 | gw.carrier1-3 | -| 8 | 2 | 0 | 49 | 0 | 0.5 | de-1.carrier2 | -| 9 | 2 | 0 | 49 | 0 | 0.5 | de-2.carrier2 | -| 10 | 2 | 0 | | 0 | 1 | gw.carrier2 | -| 11 | 2 | 1 | 49 | 0 | 1 | gw.carrier2 | +| 1 | 1 | 1 | 49 | 0 | 0.5 | de-1.carrier1 | +| 2 | 1 | 1 | 49 | 0 | 0.5 | de-2.carrier1 | +| 3 | 1 | 1 | 49 | 16 | 1 | de-3.carrier1 | +| 4 | 1 | 1 | | 0 | 1 | gw.carrier1-1 | +| 5 | 1 | 2 | 49 | 0 | 1 | gw.carrier1-1 | +| 6 | 1 | 3 | | 0 | 1 | gw.carrier1-2 | +| 7 | 1 | 4 | | 0 | 1 | gw.carrier1-3 | +| 8 | 2 | 1 | 49 | 0 | 0.5 | de-1.carrier2 | +| 9 | 2 | 1 | 49 | 0 | 0.5 | de-2.carrier2 | +| 10 | 2 | 1 | | 0 | 1 | gw.carrier2 | +| 11 | 2 | 2 | 49 | 0 | 1 | gw.carrier2 | | 12 | 3 | 8 | 49 | 0 | 1 | de-gw.default | | 13 | 3 | 8 | | 0 | 1 | gw.default | +----+---------+--------+-------------+-------+------+---------------+ @@ -1023,8 +1023,8 @@ domain register { gateways for the default carrier will be used for functions that don't support the user specific carrier lookup. The routing rules for carrier 1 and carrier 2 for the <quote>49</quote> prefix contains a additional rule - with the domain 1, that can be used for example as fallback if the gateways - in domain 0 are not reachable. Two more fallback rules (domain 2 and 3) for + with the domain 2, that can be used for example as fallback if the gateways + in domain 1 are not reachable. Two more fallback rules (domain 3 and 4) for carrier 1 are also supplied to support the functionality of the carrierfailureroute table example that is provided in the next section. </para> @@ -1041,8 +1041,8 @@ domain register { +----+---------+--------+---------------+------------+-------------+ | id | carrier | domain | host_name | reply_code | next_domain | +----+---------+--------+---------------+------------+-------------+ -| 1 | 1 | 0 | gw.carrier1-2 | ... | 3 | -| 2 | 1 | 0 | gw.carrier1-3 | ... | 2 | +| 1 | 1 | 1 | gw.carrier1-2 | ... | 3 | +| 2 | 1 | 1 | gw.carrier1-3 | ... | 2 | +----+---------+--------+---------------+------------+-------------+ ... </programlisting>

1 0

git:master: siputils(k): port from 1.5 branch, r5880
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 0c5cd640fa89038338555d69eec6496222e2e31c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c5cd64… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 14:17:26 2009 +0200 siputils(k): port from 1.5 branch, r5880 fix a bunch of docs errors, wrong module name in modparam --- modules_k/siputils/README | 12 ++++++------ modules_k/siputils/doc/siputils_admin.xml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules_k/siputils/README b/modules_k/siputils/README index f6c63f2..e4d3691 100644 --- a/modules_k/siputils/README +++ b/modules_k/siputils/README @@ -151,7 +151,7 @@ Chapter 1. Admin Guide Example 1.1. Set ring_timeout parameter ... -modparam("utils", "ring_timeout", "30") +modparam("siputils", "ring_timeout", 30) ... 1.3.2. options_accept (string) @@ -166,7 +166,7 @@ modparam("utils", "ring_timeout", "30") Example 1.2. Set options_accept parameter ... -modparam("options", "options_accept", "application/*") +modparam("siputils", "options_accept", "application/*") ... 1.3.3. options_accept_encoding (string) @@ -179,7 +179,7 @@ modparam("options", "options_accept", "application/*") Example 1.3. Set options_accept_encoding parameter ... -modparam("options", "options_accept_encoding", "gzip") +modparam("siputils", "options_accept_encoding", "gzip") ... 1.3.4. contact_flds_separator (string) @@ -198,7 +198,7 @@ Warning Example 1.4. Set db_url parameter ... -modparam("mangler", "contact_flds_separator", "-") +modparam("siputils", "contact_flds_separator", "-") ... then an encoded uri might look @@ -216,7 +216,7 @@ modparam("mangler", "contact_flds_separator", "-") Example 1.5. Set options_accept_language parameter ... -modparam("options", "options_accept_language", "de") +modparam("siputils", "options_accept_language", "de") ... 1.3.6. options_support (string) @@ -230,7 +230,7 @@ modparam("options", "options_accept_language", "de") Example 1.6. Set options_support parameter ... -modparam("options", "options_support", "100rel") +modparam("siputils", "options_support", "100rel") ... 1.4. Exported Functions diff --git a/modules_k/siputils/doc/siputils_admin.xml b/modules_k/siputils/doc/siputils_admin.xml index 0303038..c97d4bd 100644 --- a/modules_k/siputils/doc/siputils_admin.xml +++ b/modules_k/siputils/doc/siputils_admin.xml @@ -87,7 +87,7 @@ <title>Set <varname>ring_timeout</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("utils", "ring_timeout", "30") +modparam("siputils", "ring_timeout", 30) ... </programlisting> </example> @@ -110,7 +110,7 @@ modparam("utils", "ring_timeout", "30") <title>Set <varname>options_accept</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("options", "options_accept", "application/*") +modparam("siputils", "options_accept", "application/*") ... </programlisting> </example> @@ -131,7 +131,7 @@ modparam("options", "options_accept", "application/*") <title>Set <varname>options_accept_encoding</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("options", "options_accept_encoding", "gzip") +modparam("siputils", "options_accept_encoding", "gzip") ... </programlisting> </example> @@ -159,7 +159,7 @@ modparam("options", "options_accept_encoding", "gzip") <title>Set <varname>db_url</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("mangler", "contact_flds_separator", "-") +modparam("siputils", "contact_flds_separator", "-") ... </programlisting> </example> @@ -188,7 +188,7 @@ modparam("mangler", "contact_flds_separator", "-") <title>Set <varname>options_accept_language</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("options", "options_accept_language", "de") +modparam("siputils", "options_accept_language", "de") ... </programlisting> </example> @@ -209,7 +209,7 @@ modparam("options", "options_accept_language", "de") <title>Set <varname>options_support</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("options", "options_support", "100rel") +modparam("siputils", "options_support", "100rel") ... </programlisting> </example>

1 0

git:master: carrierroute: port from 1.5 branch, r5877
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 72b7c0f963a46d36cccca961d04f1c0a0655f937 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72b7c0f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 14:14:59 2009 +0200 carrierroute: port from 1.5 branch, r5877 fix error behaviour for cr_dump_routes MI command, e.g. in OOM conditions --- modules/carrierroute/cr_fifo.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/carrierroute/cr_fifo.c b/modules/carrierroute/cr_fifo.c index 48b7267..6d1c271 100644 --- a/modules/carrierroute/cr_fifo.c +++ b/modules/carrierroute/cr_fifo.c @@ -155,8 +155,9 @@ struct mi_root* dump_fifo (struct mi_root* cmd_tree, void *param) { node = addf_mi_node_child( &rpl_tree->node, 0, 0, 0, "Printing tree for domain '%.*s' (%i)\n", tmp_str->len, tmp_str->s, rd->carriers[i]->domains[j]->id); if(node == NULL) goto error; - dump_tree_recursor (&rpl_tree->node, rd->carriers[i]->domains[j]->tree, ""); - } + if (dump_tree_recursor (&rpl_tree->node, rd->carriers[i]->domains[j]->tree, "") < 0) + goto error; + } } } } @@ -393,7 +394,7 @@ struct mi_root* delete_host (struct mi_root* cmd_tree, void * param) { * @param node pointer to the routing tree node * @param prefix carries the current scan prefix * - * @return mi node containing the route rules + * @return 0 for success, negative result for error */ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, char *prefix) { char s[256]; @@ -403,6 +404,7 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c struct route_rule *rr; struct route_rule_p_list * rl; double prob; + struct mi_node* tmp_node = NULL; strcpy (s, prefix); p = s + strlen (s); @@ -410,7 +412,9 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c for (i = 0; i < cr_match_mode; ++i) { if (node->child[i] != NULL) { *p = i + '0'; - dump_tree_recursor (msg->next, node->child[i], s); + /* if there is a problem in processing the child nodes .. return an error */ + if(dump_tree_recursor (msg->next, node->child[i], s) < 0) + return -1; } } *p = '\0'; @@ -421,21 +425,24 @@ static int dump_tree_recursor (struct mi_node* msg, struct dtrie_node_t *node, c } else { prob = rr->prob; } - addf_mi_node_child(msg->next, 0, 0, 0, "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'\n", + tmp_node = addf_mi_node_child(msg->next, 0, 0, 0, "%10s: %0.3f %%, '%.*s': %s, '%i', '%.*s', '%.*s', '%.*s'\n", strlen(prefix) > 0 ? prefix : "NULL", prob * 100, rr->host.len, rr->host.s, (rr->status ? "ON" : "OFF"), rr->strip, rr->local_prefix.len, rr->local_prefix.s, rr->local_suffix.len, rr->local_suffix.s, rr->comment.len, rr->comment.s); + if(!tmp_node) return -1; if(!rr->status && rr->backup && rr->backup->rr){ - addf_mi_node_child(msg->next, 0, 0, 0, " Rule is backed up by: %.*s\n", rr->backup->rr->host.len, rr->backup->rr->host.s); + tmp_node = addf_mi_node_child(msg->next, 0, 0, 0, " Rule is backed up by: %.*s\n", rr->backup->rr->host.len, rr->backup->rr->host.s); + if(!tmp_node) return -1; } if(rr->backed_up){ rl = rr->backed_up; i=0; while(rl){ if(rl->rr){ - addf_mi_node_child(msg->next, 0, 0, 0, " Rule is backup for: %.*s", rl->rr->host.len, rl->rr->host.s); + tmp_node = addf_mi_node_child(msg->next, 0, 0, 0, " Rule is backup for: %.*s", rl->rr->host.len, rl->rr->host.s); + if(!tmp_node) return -1; } rl = rl->next; i++;

1 0

git:master: memcached: fix error in docs, reported from Alex Balashov
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 1a1ec3377814512dc7704ad381243faf24f40ef3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a1ec33… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 11:46:30 2009 +0200 memcached: fix error in docs, reported from Alex Balashov --- modules_k/memcached/README | 225 +++++++++++++++------------ modules_k/memcached/doc/memcached_admin.xml | 2 +- 2 files changed, 130 insertions(+), 97 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1a1…

1 0

git:master: registrar(k): port from 1.5 branch, r5873
by Henning Westerholt 30 Jun '09

30 Jun '09

Module: sip-router Branch: master Commit: 37bf92a82b5ff14d38cc22d7d30cc09fd537b98f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37bf92a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jun 30 14:09:53 2009 +0200 registrar(k): port from 1.5 branch, r5873 "match_callid" should be initialized properly, otherwise "registered" may return false in some cases. --- modules_k/registrar/lookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 2f5644f..1e74594 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -179,7 +179,7 @@ int registered(struct sip_msg* _m, char* _t, char* _s) urecord_t* r; ucontact_t* ptr; int res; - int_str match_callid; + int_str match_callid=(int_str)0; if (_m->new_uri.s) uri = _m->new_uri; else uri = _m->first_line.u.request.uri;

1 0

new feature: execute mi commands via rpc
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Hello, there is a new module in repository that allow you to execute most of the mi commands from Kamailio modules (see readme) via RPC interface inherited from SER: http://sip-router.org/docbook/sip-router/branch/master/modules/mi_rpc/mi_rp… http://sip-router.org/docbook/sip-router/branch/master/rpc/ser_rpc.html One of the nicest things you can out of this is usage of sercmd - command line interface tool. It is located in utils/sercmd. Thanks to Andrei, sercmd does now tab completion for mi command. How to use it: - get sip router from git: git clone --depth 1 git://git.sip-router.org/sip-router cd sip-router make all - add to your config file: loadmodule "ctl.so" # located in 'modules_s' loadmodule "mi_rpc.so" # located in 'modules' - use sercmd cd utils/sercmd make ./sercmd Then you should get: sercmd> mi <tab><tab> arg nh_show_rtpp t_reply ul_rm_contact cleanup ps t_uac_cancel ul_show_contact debug pwd t_uac_dlg uptime dum refreshWatchers ul_add version kill shv_get ul_dump which nh_enable_ping shv_set ul_flush nh_enable_rtpp t_hash ul_rm sercmd> mi uptime 200 OK + Now:: Tue Jun 30 12:47:54 2009 + Up since:: Tue Jun 30 12:47:26 2009 + Up time:: 28 [sec] Via sercmd you can control lot of internals at runtime -- see 'help' command -- more about: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob_plain;f=ut… Enjoy, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

1 0

git:daniel/xavp: pv: export new PV class $xavp(name)
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Module: sip-router Branch: daniel/xavp Commit: d68a8b4db09c210f5281784a21731d6069605e58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d68a8b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:30:20 2009 +0200 pv: export new PV class $xavp(name) - allow management of XAVP from config file --- modules_k/pv/pv_xavp.c | 518 ++++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_xavp.h | 41 ++++ 2 files changed, 559 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d68…

1 0

git:daniel/xavp: tm: set/reset head of xavps on TM events
by Daniel-Constantin Mierla 30 Jun '09

30 Jun '09

Module: sip-router Branch: daniel/xavp Commit: 074517dbf60512194517666bbbf39125369b4624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=074517d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 30 12:16:35 2009 +0200 tm: set/reset head of xavps on TM events --- modules/tm/h_table.c | 19 +++++++++++++++++++ modules/tm/h_table.h | 8 +++++++- modules/tm/t_hooks.c | 10 ++++++++++ modules/tm/t_reply.c | 21 +++++++++++++++++++++ modules/tm/uac.c | 3 +++ 5 files changed, 60 insertions(+), 1 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 11fb1a8..d536942 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -201,6 +201,10 @@ void free_cell( struct cell* dead_cell ) destroy_avp_list_unsafe( &dead_cell->uri_avps_from ); if (dead_cell->uri_avps_to) destroy_avp_list_unsafe( &dead_cell->uri_avps_to ); +#ifdef WITH_XAVP + if (dead_cell->xavps_list) + xavp_destroy_list_unsafe( &dead_cell->xavps_list ); +#endif /* the cell's body */ shm_free_unsafe( dead_cell ); @@ -266,6 +270,9 @@ struct cell* build_cell( struct sip_msg* p_msg ) struct cell* new_cell; int sip_msg_len; avp_list_t* old; +#ifdef WITH_XAVP + sr_xavp_t** xold; +#endif /* allocs a new cell */ /* if syn_branch==0 add space for md5 (MD5_LEN -sizeof(struct cell.md5)) */ @@ -305,6 +312,12 @@ struct cell* build_cell( struct sip_msg* p_msg ) new_cell->user_avps_to = *old; *old = 0; +#ifdef WITH_XAVP + xold = xavp_set_list(&new_cell->xavps_list ); + new_cell->xavps_list = *xold; + *xold = 0; +#endif + /* We can just store pointer to domain avps in the transaction context, * because they are read-only */ @@ -347,9 +360,15 @@ error: destroy_avp_list(&new_cell->user_avps_to); destroy_avp_list(&new_cell->uri_avps_from); destroy_avp_list(&new_cell->uri_avps_to); +#ifdef WITH_XAVP + xavp_destroy_list(&new_cell->xavps_list); +#endif shm_free(new_cell); /* unlink transaction AVP list and link back the global AVP list (bogdan)*/ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif return NULL; } diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index d6c36e4..1528039 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -69,6 +69,9 @@ #include "../../types.h" #include "../../md5utils.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../xavp.h" +#endif #include "../../timer.h" #include "../../flags.h" #include "../../atomic_ops.h" @@ -356,7 +359,10 @@ typedef struct cell struct usr_avp *user_avps_to; struct usr_avp *domain_avps_from; struct usr_avp *domain_avps_to; - +#ifdef WITH_XAVP + sr_xavp_t *xavps_list; +#endif + /* protection against concurrent reply processing */ ser_lock_t reply_mutex; diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 6e149ea..ceb3c24 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -230,6 +230,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, { struct tm_callback *cbp; avp_list_t* backup_from, *backup_to, *backup_dom_from, *backup_dom_to, *backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif backup_uri_from = set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, &trans->uri_avps_from ); @@ -243,6 +246,10 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, &trans->domain_avps_from); backup_dom_to = set_avp_list(AVP_CLASS_DOMAIN | AVP_TRACK_TO, &trans->domain_avps_to); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&trans->xavps_list); +#endif + cbp=(struct tm_callback*)cb_lst->first; while(cbp){ membar_depends(); /* make sure the cache has the correct cbp @@ -261,6 +268,9 @@ void run_trans_callbacks_internal(struct tmcb_head_list* cb_lst, int type, set_avp_list(AVP_CLASS_USER | AVP_TRACK_FROM, backup_from ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_TO, backup_uri_to ); set_avp_list(AVP_CLASS_URI | AVP_TRACK_FROM, backup_uri_from ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 3d46f6f..3bcf8c9 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -114,6 +114,9 @@ #include "../../data_lump.h" #include "../../data_lump_rpl.h" #include "../../usr_avp.h" +#ifdef WITH_XAVP +#include "../../usr_avp.h" +#endif #include "../../atomic_ops.h" /* membar_write() */ #include "../../compiler_opt.h" #ifdef USE_DST_BLACKLIST @@ -684,6 +687,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) static avp_list_t* backup_user_from, *backup_user_to; static avp_list_t* backup_domain_from, *backup_domain_to; static avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + static sr_xavp_t **backup_xavps; +#endif static struct socket_info* backup_si; if (msg) { @@ -714,6 +720,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif /* set default send address to the saved value */ backup_si=bind_address; bind_address=t->uac[0].request.dst.send_sock; @@ -729,6 +738,9 @@ void faked_env( struct cell *t, struct sip_msg *msg) set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif bind_address=backup_si; } } @@ -1826,6 +1838,9 @@ int reply_received( struct sip_msg *p_msg ) avp_list_t* backup_user_from, *backup_user_to; avp_list_t* backup_domain_from, *backup_domain_to; avp_list_t* backup_uri_from, *backup_uri_to; +#ifdef WITH_XAVP + sr_xavp_t **backup_xavps; +#endif #ifdef USE_DNS_FAILOVER int branch_ret; int prev_branch; @@ -1972,6 +1987,9 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); +#ifdef WITH_XAVP + backup_xavps = xavp_set_list(&t->xavps_list); +#endif setbflagsval(0, uac->branch_flags); /* Pre- and post-script callbacks have already * been execueted by the core. (Miklos) @@ -1989,6 +2007,9 @@ int reply_received( struct sip_msg *p_msg ) set_avp_list( AVP_TRACK_TO | AVP_CLASS_USER, backup_user_to ); set_avp_list( AVP_TRACK_FROM | AVP_CLASS_DOMAIN, backup_domain_from ); set_avp_list( AVP_TRACK_TO | AVP_CLASS_DOMAIN, backup_domain_to ); +#ifdef WITH_XAVP + xavp_set_list(backup_xavps); +#endif } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */ diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 6dfd0fc..1a3ac5f 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -284,6 +284,9 @@ static inline int t_uac_prepare(uac_req_t *uac_r, /* better reset avp list now - anyhow, it's useless from * this point (bogdan) */ reset_avps(); +#ifdef WITH_XAVP + xavp_reset_list(); +#endif set_kr(REQ_FWDED);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009