sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

git:master:a7b1016a: rtpengine: LM_NOTICE to LM_DBG

by Stefan Mititelu

Module: kamailio Branch: master Commit: a7b1016ae64bd6e0977a621f12a82a6e19a64f81 URL: https://github.com/kamailio/kamailio/commit/a7b1016ae64bd6e0977a621f12a82a6… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T10:08:56+02:00 rtpengine: LM_NOTICE to LM_DBG Change LM_NOTICE to LM_DBG when failed to find looked up node in hastable. These logs appeared mostly for new calls, when inserting new entries in the hashtable. This is normal behaviour. --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a7b1016ae64bd6e0977a621f12a82a6… Patch: https://github.com/kamailio/kamailio/commit/a7b1016ae64bd6e0977a621f12a82a6… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index e703df1..5481f49 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -2816,7 +2816,7 @@ select_rtpp_node_old(str callid, str viabranch, int do_test, enum rtpe_operation node = rtpengine_hash_table_lookup(callid, viabranch, op); if (!node) { - LM_NOTICE("rtpengine hash table lookup failed to find node for calllen=%d callid=%.*s viabranch=%.*s\n", + LM_DBG("rtpengine hash table lookup failed to find node for calllen=%d callid=%.*s viabranch=%.*s\n", callid.len, callid.len, callid.s, viabranch.len, viabranch.s); return NULL; } else {

8 years, 9 months

git:master:4f4c4488: rtpengine: Fix node selection for branching cases

by Stefan Mititelu

Module: kamailio Branch: master Commit: 4f4c44880ec22a5d7d1c9478f0299974c33a7501 URL: https://github.com/kamailio/kamailio/commit/4f4c44880ec22a5d7d1c9478f029997… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T10:08:56+02:00 rtpengine: Fix node selection for branching cases Update node selection when rtpengine_delete() is called to select existing node, when the viabranch is NULL. Useful in branching scenarios. --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_hash.c Modified: modules/rtpengine/rtpengine_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/4f4c44880ec22a5d7d1c9478f029997… Patch: https://github.com/kamailio/kamailio/commit/4f4c44880ec22a5d7d1c9478f029997…

8 years, 9 months

git:master:8ef89248: modules/sipt add charging indication

by Torrey Searle

Module: kamailio Branch: master Commit: 8ef89248cf8547371889734cf33bef827aacc73c URL: https://github.com/kamailio/kamailio/commit/8ef89248cf8547371889734cf33bef8… Author: Torrey Searle <torrey(a)voxbone.com> Committer: Torrey Searle <torrey(a)voxbone.com> Date: 2016-02-23T09:04:12+01:00 modules/sipt add charging indication --- Modified: modules/sipt/README Modified: modules/sipt/doc/sipt_admin.xml Modified: modules/sipt/sipt.c Modified: modules/sipt/ss7.h Modified: modules/sipt/ss7_parser.c Removed: modules/sipt/doc/sipt.txt --- Diff: https://github.com/kamailio/kamailio/commit/8ef89248cf8547371889734cf33bef8… Patch: https://github.com/kamailio/kamailio/commit/8ef89248cf8547371889734cf33bef8…

8 years, 9 months

git:master:16f5fbf7: pkg/kamailio/deb: version set to 4.4.0-pre1

by Victor Seva

Module: kamailio Branch: master Commit: 16f5fbf747c2725d70f2ab7aecfcdf1bd76b91c3 URL: https://github.com/kamailio/kamailio/commit/16f5fbf747c2725d70f2ab7aecfcdf1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-02-23T08:55:17+01:00 pkg/kamailio/deb: version set to 4.4.0-pre1 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog --- Diff: https://github.com/kamailio/kamailio/commit/16f5fbf747c2725d70f2ab7aecfcdf1… Patch: https://github.com/kamailio/kamailio/commit/16f5fbf747c2725d70f2ab7aecfcdf1… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index e290f1d..7ad726d 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.4.0~pre1) unstable; urgency=medium + + * version set to 4.4.0-pre1 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Tue, 23 Feb 2016 08:53:36 +0100 + kamailio (4.4.0~pre0) unstable; urgency=medium * version set to 4.4.0-pre0

8 years, 9 months

git:master:131d8999: rtpengine: fix queried_nodes_limit logic

by Stefan Mititelu

Module: kamailio Branch: master Commit: 131d8999c7efe43b50b4ede1a8426105ed96c399 URL: https://github.com/kamailio/kamailio/commit/131d8999c7efe43b50b4ede1a842610… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T09:54:38+02:00 rtpengine: fix queried_nodes_limit logic Right now, even if the selected node returns error, the same node is still selected and still queried for maximum of queried_nodes_limit times. Don't retry to query the previous nodes, upon error returned (i.e. Parallel session limit reached"). Instead, remember the queried nodes and try to select between un-queried ones. Thus, rtpengine_offer() will select a proper, available node which will be inserted in the hashtable and further used. --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/131d8999c7efe43b50b4ede1a842610… Patch: https://github.com/kamailio/kamailio/commit/131d8999c7efe43b50b4ede1a842610…

8 years, 9 months

git:master:b531e175: rtpengine: fix hashtable insert logic

by Stefan Mititelu

Module: kamailio Branch: master Commit: b531e175895cbb0f629e5a47c523ee8b569746d8 URL: https://github.com/kamailio/kamailio/commit/b531e175895cbb0f629e5a47c523ee8… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-02-23T09:54:38+02:00 rtpengine: fix hashtable insert logic Add hastable entry only when rtpengine responded with non-error to received command. This is useful when rtpengine machine responds with errors like "Paralel session limit reached". In this case, one doesn't want to add the entry, but to try another node. --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b531e175895cbb0f629e5a47c523ee8… Patch: https://github.com/kamailio/kamailio/commit/b531e175895cbb0f629e5a47c523ee8… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 30db81a..8726e05 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -2379,6 +2379,51 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ goto error; } + /* add hastable entry with the node => */ + if (!rtpengine_hash_table_lookup(callid, viabranch)) { + // build the entry + struct rtpengine_hash_entry *entry = shm_malloc(sizeof(struct rtpengine_hash_entry)); + if (!entry) { + LM_ERR("rtpengine hash table fail to create entry for calllen=%d callid=%.*s viabranch=%.*s\n", + callid.len, callid.len, callid.s, viabranch.len, viabranch.s); + goto skip_hash_table_insert; + } + memset(entry, 0, sizeof(struct rtpengine_hash_entry)); + + // fill the entry + if (callid.s && callid.len > 0) { + if (shm_str_dup(&entry->callid, &callid) < 0) { + LM_ERR("rtpengine hash table fail to duplicate calllen=%d callid=%.*s\n", + callid.len, callid.len, callid.s); + rtpengine_hash_table_free_entry(entry); + goto skip_hash_table_insert; + } + } + if (viabranch.s && viabranch.len > 0) { + if (shm_str_dup(&entry->viabranch, &viabranch) < 0) { + LM_ERR("rtpengine hash table fail to duplicate calllen=%d viabranch=%.*s\n", + callid.len, viabranch.len, viabranch.s); + rtpengine_hash_table_free_entry(entry); + goto skip_hash_table_insert; + } + } + entry->node = node; + entry->next = NULL; + entry->tout = get_ticks() + hash_table_tout; + + // insert the key<->entry from the hashtable + if (!rtpengine_hash_table_insert(callid, viabranch, entry)) { + LM_ERR("rtpengine hash table fail to insert node=%.*s for calllen=%d callid=%.*s viabranch=%.*s\n", + node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s, viabranch.len, viabranch.s); + rtpengine_hash_table_free_entry(entry); + goto skip_hash_table_insert; + } else { + LM_DBG("rtpengine hash table insert node=%.*s for calllen=%d callid=%.*s viabranch=%.*s\n", + node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s, viabranch.len, viabranch.s); + } + } + +skip_hash_table_insert: if (body_out) *body_out = body; @@ -2732,47 +2777,6 @@ select_rtpp_node_new(str callid, str viabranch, int do_test) lock_release(active_rtpp_set->rset_lock); } - /* build the entry */ - struct rtpengine_hash_entry *entry = shm_malloc(sizeof(struct rtpengine_hash_entry)); - if (!entry) { - LM_ERR("rtpengine hash table fail to create entry for calllen=%d callid=%.*s viabranch=%.*s\n", - callid.len, callid.len, callid.s, viabranch.len, viabranch.s); - return node; - } - memset(entry, 0, sizeof(struct rtpengine_hash_entry)); - - /* fill the entry */ - if (callid.s && callid.len > 0) { - if (shm_str_dup(&entry->callid, &callid) < 0) { - LM_ERR("rtpengine hash table fail to duplicate calllen=%d callid=%.*s\n", - callid.len, callid.len, callid.s); - rtpengine_hash_table_free_entry(entry); - return node; - } - } - if (viabranch.s && viabranch.len > 0) { - if (shm_str_dup(&entry->viabranch, &viabranch) < 0) { - LM_ERR("rtpengine hash table fail to duplicate calllen=%d viabranch=%.*s\n", - callid.len, viabranch.len, viabranch.s); - rtpengine_hash_table_free_entry(entry); - return node; - } - } - entry->node = node; - entry->next = NULL; - entry->tout = get_ticks() + hash_table_tout; - - /* insert the key<->entry from the hashtable */ - if (!rtpengine_hash_table_insert(callid, viabranch, entry)) { - LM_ERR("rtpengine hash table fail to insert node=%.*s for calllen=%d callid=%.*s viabranch=%.*s\n", - node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s, viabranch.len, viabranch.s); - rtpengine_hash_table_free_entry(entry); - return node; - } else { - LM_DBG("rtpengine hash table insert node=%.*s for calllen=%d callid=%.*s viabranch=%.*s\n", - node->rn_url.len, node->rn_url.s, callid.len, callid.len, callid.s, viabranch.len, viabranch.s); - } - /* return selected node */ return node; }

8 years, 9 months

git:master:e4bd3c1d: Makefile.defs: version set to 4.4.0-pre1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4bd3c1d97bb04bfb8f84619481bc7dfb0d8030f URL: https://github.com/kamailio/kamailio/commit/e4bd3c1d97bb04bfb8f84619481bc7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-23T08:40:46+01:00 Makefile.defs: version set to 4.4.0-pre1 --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/e4bd3c1d97bb04bfb8f84619481bc7d… Patch: https://github.com/kamailio/kamailio/commit/e4bd3c1d97bb04bfb8f84619481bc7d… --- diff --git a/Makefile.defs b/Makefile.defs index 5495343..58f82f0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -97,7 +97,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 4 SUBLEVEL = 0 -EXTRAVERSION = -pre0 +EXTRAVERSION = -pre1 # memory manager switcher # 0 - f_malloc (fast malloc)

8 years, 9 months

git:master:b214541f: Merge pull request #514 from phil-lavin/feature-trying-master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b214541fc93669a6a9248eae34be17cb97520719 URL: https://github.com/kamailio/kamailio/commit/b214541fc93669a6a9248eae34be17c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-02-22T23:20:07+01:00 Merge pull request #514 from phil-lavin/feature-trying-master pua_dialoginfo: support for sending "Trying" state for callee --- Modified: modules/presence/presentity.c Modified: modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/b214541fc93669a6a9248eae34be17c… Patch: https://github.com/kamailio/kamailio/commit/b214541fc93669a6a9248eae34be17c…

8 years, 9 months

git:master:1c0242fe: presence: Fully implement table locking for updating the presentity table

by Phil Lavin

Module: kamailio Branch: master Commit: 1c0242fecb1a5ea9a3fde54b8ce331886e564d39 URL: https://github.com/kamailio/kamailio/commit/1c0242fecb1a5ea9a3fde54b8ce3318… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-02-19T12:07:41Z presence: Fully implement table locking for updating the presentity table - Implement table locking for all routes through update_presentity in order to avoid a number of different race conditions which resulted in extraneous data being put into the presentity table. --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/1c0242fecb1a5ea9a3fde54b8ce3318… Patch: https://github.com/kamailio/kamailio/commit/1c0242fecb1a5ea9a3fde54b8ce3318… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 0f3c3e5..1c385b5 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -426,6 +426,15 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, goto error; } + if (pa_dbf.start_transaction) + { + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + LM_DBG("inserting %d cols into table\n",n_query_cols); if (pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0) @@ -468,22 +477,8 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if (pa_dbf.replace(pa_db, query_cols, query_vals, n_query_cols, 4, 0) < 0) { LM_ERR("replacing record in database\n"); - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - LM_ERR("in abort_transaction\n"); - } goto error; } - - if (pa_dbf.end_transaction) - { - if (pa_dbf.end_transaction(pa_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } } if( publ_send200ok(msg, presentity->expires, presentity->etag)< 0) @@ -503,6 +498,15 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, goto error; } + if (pa_dbf.start_transaction) + { + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } + if(EVENT_DIALOG_SLA(presentity->event->evp)) { @@ -837,6 +841,15 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if(pres_uri.s) pkg_free(pres_uri.s); + if (pa_dbf.end_transaction) + { + if (pa_dbf.end_transaction(pa_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } + return 0; send_412: @@ -867,6 +880,15 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, if(pres_uri.s) pkg_free(pres_uri.s); + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + { + LM_ERR("in abort_transaction\n"); + goto error; + } + } + return ret; }

8 years, 9 months

git:master:897e775a: pua_dialoginfo: support for sending "Trying" state for callee

by Phil Lavin

Module: kamailio Branch: master Commit: 897e775a6353ab1e4738ad3b0c3d1c1e53980277 URL: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-02-19T12:07:35Z pua_dialoginfo: support for sending "Trying" state for callee - Implement callee_trying parameter in pua_dialoginfo which causes a "Trying" state to be sent for both the caller and callee when a new dialog is created. --- Modified: modules/pua_dialoginfo/doc/pua_dialoginfo.xml Modified: modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml Modified: modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… Patch: https://github.com/kamailio/kamailio/commit/897e775a6353ab1e4738ad3b0c3d1c1… --- diff --git a/modules/pua_dialoginfo/doc/pua_dialoginfo.xml b/modules/pua_dialoginfo/doc/pua_dialoginfo.xml index f4d7a0d..b3001de 100644 --- a/modules/pua_dialoginfo/doc/pua_dialoginfo.xml +++ b/modules/pua_dialoginfo/doc/pua_dialoginfo.xml @@ -38,6 +38,13 @@ <surname>Darilion</surname> <affiliation><orgname>IPCom</orgname></affiliation> </editor> + <editor> + <firstname>Phil</firstname> + <surname>Lavin</surname> + <address> + <email>phil.lavin(a)synety.com</email> + </address> + </editor> </authorgroup> <copyright> <year>2006</year> diff --git a/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml b/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml index e08402d..505378c 100644 --- a/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml +++ b/modules/pua_dialoginfo/doc/pua_dialoginfo_admin.xml @@ -461,6 +461,24 @@ modparam("pua_dialoginfo", "pubruri_callee_dlg_var", "pubruri_callee") </example> </section> + <section> + <title><varname>callee_trying</varname> (int)</title> + <para> + If this parameter is set, a "Trying" state will be sent for both the + caller and callee, rather than just the caller. + </para> + <para> + <emphasis>Default value is <quote>0</quote>.</emphasis> + </para> + <example> + <title>Set <varname>callee_trying</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_dialoginfo", "callee_trying", 1) +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c b/modules/pua_dialoginfo/pua_dialoginfo.c index 446d980..2e050d3 100644 --- a/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/modules/pua_dialoginfo/pua_dialoginfo.c @@ -63,6 +63,7 @@ MODULE_VERSION #define DEF_USE_PUBRURI_AVPS 0 #define DEF_PUBRURI_CALLER_AVP 0 #define DEF_PUBRURI_CALLEE_AVP 0 +#define DEF_CALLEE_TRYING 0 /* define PUA_DIALOGINFO_DEBUG to activate more verbose @@ -91,6 +92,7 @@ int caller_confirmed = DEF_CALLER_ALWAYS_CONFIRMED; int include_req_uri = DEF_INCLUDE_REQ_URI; int send_publish_flag = DEF_SEND_PUBLISH_FLAG; int use_pubruri_avps = DEF_USE_PUBRURI_AVPS; +int callee_trying = DEF_CALLEE_TRYING; char * pubruri_caller_avp = DEF_PUBRURI_CALLER_AVP; char * pubruri_callee_avp = DEF_PUBRURI_CALLEE_AVP; @@ -119,6 +121,7 @@ static param_export_t params[]={ {"pubruri_callee_avp", PARAM_STRING, &pubruri_callee_avp }, {"pubruri_caller_dlg_var", PARAM_STR, &caller_dlg_var }, {"pubruri_callee_dlg_var", PARAM_STR, &callee_dlg_var }, + {"callee_trying", INT_PARAM, &callee_trying }, {0, 0, 0 } }; @@ -599,6 +602,14 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0); + if (callee_trying) + { + dialog_publish_multi("Trying", dlginfo->pubruris_callee, + (include_req_uri)?&(dlg->req_uri):&(dlg->to_uri), + &(dlg->from_uri), + &(dlg->callid), 0, dlginfo->lifetime, + 0, 0, 0, 0, (send_publish_flag==-1)?1:0); + } } static void

8 years, 9 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016