sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:69e57b92: rtpengine: change cookie to hostname_pid_seqno
by Lucian Balaceanu 02 Jun '16

02 Jun '16

Module: kamailio Branch: master Commit: 69e57b9260c6c09380fdb9cfd074ea67a459230a URL: https://github.com/kamailio/kamailio/commit/69e57b9260c6c09380fdb9cfd074ea6… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-06-02T13:50:02+03:00 rtpengine: change cookie to hostname_pid_seqno - pid_seqno in gencookie() is not a unique identifictor in a multi kamailio setup --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/69e57b9260c6c09380fdb9cfd074ea6… Patch: https://github.com/kamailio/kamailio/commit/69e57b9260c6c09380fdb9cfd074ea6… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 5481f49..a37ab6f 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -97,6 +97,8 @@ MODULE_VERSION #define NAT_UAC_TEST_S_1918 0x08 #define NAT_UAC_TEST_RPORT 0x10 +#define COOKIE_SIZE 128 +#define HOSTNAME_SIZE 100 #define DEFAULT_RTPP_SET_ID 0 #define MAX_RTPP_TRIED_NODES 50 @@ -2016,12 +2018,15 @@ static void mod_destroy(void) } - static char * gencookie(void) { - static char cook[34]; + static char cook[COOKIE_SIZE]; + char hostname[HOSTNAME_SIZE]; + + if (gethostname(hostname, HOSTNAME_SIZE - 1) < 0) + strcpy(hostname, "host"); + snprintf(cook, COOKIE_SIZE, "%s_%d_%u ", hostname, (int)mypid, myseqn); - sprintf(cook, "%d_%u ", (int)mypid, myseqn); myseqn++; return cook; }

3 3

http_client api test
by Olle E. Johansson 02 Jun '16

02 Jun '16

Hi! In order to be able to test the API for the http_client I have created a separate module. I couldn’t let it live in the same directory, so I created a new module directory for it. If I keep it in the same directory the Makefile automatically links it with the http_client so-file, which is not what I want. I would like to store it somewhere - I can either commit is a module that doesn’t compile by default, store it in a hidden branch and forget about it or get help in fixing the Makefile so it can optionally compile in the same directory. Which would be the way forward? Right now it doesn’t do much more than bind to the API, but hopefully it will soon be able to test all the provided API functions. /O

2 4

git:master:7e5ee1bf: presence: documentation for retrieve_order_by parameter
by Daniel-Constantin Mierla 02 Jun '16

02 Jun '16

Module: kamailio Branch: master Commit: 7e5ee1bf147bd53c7491e2236928d00b05626cb7 URL: https://github.com/kamailio/kamailio/commit/7e5ee1bf147bd53c7491e2236928d00… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-02T08:41:04+02:00 presence: documentation for retrieve_order_by parameter --- Modified: modules/presence/README Modified: modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7e5ee1bf147bd53c7491e2236928d00… Patch: https://github.com/kamailio/kamailio/commit/7e5ee1bf147bd53c7491e2236928d00…

1 0

git:master:8c5432e5: presence: new parameter to set the order by string for fetching records
by Daniel-Constantin Mierla 02 Jun '16

02 Jun '16

Module: kamailio Branch: master Commit: 8c5432e5285564d6104189d6358774b8d8f3382b URL: https://github.com/kamailio/kamailio/commit/8c5432e5285564d6104189d6358774b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-02T08:34:16+02:00 presence: new parameter to set the order by string for fetching records - used when retrieve_order is 1 - new param: retrieve_order_by - default value is 'priority' --- Modified: modules/presence/notify.c Modified: modules/presence/presence.c Modified: modules/presence/presence.h Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/8c5432e5285564d6104189d6358774b… Patch: https://github.com/kamailio/kamailio/commit/8c5432e5285564d6104189d6358774b… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 93d4274..2a9b4d7 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -660,7 +660,7 @@ str* get_p_notify_body(str pres_uri, pres_ev_t* event, str* etag, } if(pres_retrieve_order==1) { - query_str = str_priority_col; + query_str = pres_retrieve_order_by; } else { query_str = str_received_time_col; } diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 0b62527..fe40745 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -161,6 +161,7 @@ int pres_notifier_processes = 1; int pres_force_delete = 0; str pres_xavp_cfg = {0}; int pres_retrieve_order = 0; +str pres_retrieve_order_by = str_init("priority"); int db_table_lock_type = 1; db_locking_t db_table_lock = DB_LOCKING_WRITE; @@ -224,6 +225,7 @@ static param_export_t params[]={ { "subs_remove_match", PARAM_INT, &pres_subs_remove_match}, { "xavp_cfg", PARAM_STR, &pres_xavp_cfg}, { "retrieve_order", PARAM_INT, &pres_retrieve_order}, + { "retrieve_order_by", PARAM_STR, &pres_retrieve_order_by}, { "sip_uri_match", PARAM_INT, &pres_uri_match}, {0,0,0} }; diff --git a/modules/presence/presence.h b/modules/presence/presence.h index 1f11073..0068c9b 100644 --- a/modules/presence/presence.h +++ b/modules/presence/presence.h @@ -91,6 +91,7 @@ extern int pres_notifier_processes; extern int pres_force_delete; extern str pres_xavp_cfg; extern int pres_retrieve_order; +extern str pres_retrieve_order_by; extern int phtable_size; extern phtable_t* pres_htable; diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 71adc36..8b0472b 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -1149,7 +1149,7 @@ char* get_sphere(str* pres_uri) } if(pres_retrieve_order==1) { - query_str = str_priority_col; + query_str = pres_retrieve_order_by; } else { query_str = str_received_time_col; }

1 0

[kamailio/kamailio] module/sipcapture added missed diversion. (#651)
by Alexandr Dubovikov 01 Jun '16

01 Jun '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/651 -- Commit Summary -- * added missed diversion. * diversion_user -> diversion -- File Changes -- M modules/sipcapture/sipcapture.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/651.patch https://github.com/kamailio/kamailio/pull/651.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/651

2 3

git:master:701dc853: Merge pull request #651 from adubovikov/master
by Alexandr Dubovikov 01 Jun '16

01 Jun '16

Module: kamailio Branch: master Commit: 701dc8530ddca76a89fd13c3d408cf78d99423a1 URL: https://github.com/kamailio/kamailio/commit/701dc8530ddca76a89fd13c3d408cf7… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-06-01T16:57:23+02:00 Merge pull request #651 from adubovikov/master module/sipcapture added missed diversion. --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/701dc8530ddca76a89fd13c3d408cf7… Patch: https://github.com/kamailio/kamailio/commit/701dc8530ddca76a89fd13c3d408cf7… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 83eae4d..55a96c0 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -94,7 +94,7 @@ MODULE_VERSION #define TABLE_LEN 256 -#define NR_KEYS 40 +#define NR_KEYS 41 #define RTCP_NR_KEYS 12 #define MAX_HEADERS 16 @@ -181,7 +181,7 @@ static str callid_aleg_column = str_init("callid_aleg"); static str via_1_column = str_init("via_1"); static str via_1_branch_column = str_init("via_1_branch"); static str cseq_column = str_init("cseq"); -static str diversion_column = str_init("diversion_user"); +static str diversion_column = str_init("diversion"); static str reason_column = str_init("reason"); static str content_type_column = str_init("content_type"); static str authorization_column = str_init("auth"); @@ -1451,15 +1451,20 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu db_vals[38].nul = 0; db_vals[38].val.str_val = sco->ruri_domain; - db_keys[39] = &msg_column; - db_vals[39].type = DB1_BLOB; + db_keys[39] = &diversion_column; + db_vals[39].type = DB1_STR; db_vals[39].nul = 0; + db_vals[39].val.str_val = sco->diversion; + + db_keys[40] = &msg_column; + db_vals[40].type = DB1_BLOB; + db_vals[40].nul = 0; /*we don't have empty spaces now */ tmp.s = sco->msg.s; tmp.len = sco->msg.len; - db_vals[39].val.blob_val = tmp; + db_vals[40].val.blob_val = tmp; if (dtable){ table = dtable;

1 0

git:master:0f5a419d: diversion_user -> diversion
by Alexandr Dubovikov 01 Jun '16

01 Jun '16

Module: kamailio Branch: master Commit: 0f5a419d2888c91b29cc01544b9cb32f29db1a37 URL: https://github.com/kamailio/kamailio/commit/0f5a419d2888c91b29cc01544b9cb32… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-06-01T16:12:36+02:00 diversion_user -> diversion --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0f5a419d2888c91b29cc01544b9cb32… Patch: https://github.com/kamailio/kamailio/commit/0f5a419d2888c91b29cc01544b9cb32… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 41cc636..55a96c0 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -181,7 +181,7 @@ static str callid_aleg_column = str_init("callid_aleg"); static str via_1_column = str_init("via_1"); static str via_1_branch_column = str_init("via_1_branch"); static str cseq_column = str_init("cseq"); -static str diversion_column = str_init("diversion_user"); +static str diversion_column = str_init("diversion"); static str reason_column = str_init("reason"); static str content_type_column = str_init("content_type"); static str authorization_column = str_init("auth");

1 0

git:master:eac041d4: added missed diversion.
by Alexandr Dubovikov 01 Jun '16

01 Jun '16

Module: kamailio Branch: master Commit: eac041d488c69b34a06cfa5b5b55e7b44f89ea13 URL: https://github.com/kamailio/kamailio/commit/eac041d488c69b34a06cfa5b5b55e7b… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-06-01T16:03:22+02:00 added missed diversion. thanks lcligny for report --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/eac041d488c69b34a06cfa5b5b55e7b… Patch: https://github.com/kamailio/kamailio/commit/eac041d488c69b34a06cfa5b5b55e7b… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 83eae4d..41cc636 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -94,7 +94,7 @@ MODULE_VERSION #define TABLE_LEN 256 -#define NR_KEYS 40 +#define NR_KEYS 41 #define RTCP_NR_KEYS 12 #define MAX_HEADERS 16 @@ -1451,15 +1451,20 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu db_vals[38].nul = 0; db_vals[38].val.str_val = sco->ruri_domain; - db_keys[39] = &msg_column; - db_vals[39].type = DB1_BLOB; + db_keys[39] = &diversion_column; + db_vals[39].type = DB1_STR; db_vals[39].nul = 0; + db_vals[39].val.str_val = sco->diversion; + + db_keys[40] = &msg_column; + db_vals[40].type = DB1_BLOB; + db_vals[40].nul = 0; /*we don't have empty spaces now */ tmp.s = sco->msg.s; tmp.len = sco->msg.len; - db_vals[39].val.blob_val = tmp; + db_vals[40].val.blob_val = tmp; if (dtable){ table = dtable;

1 0

[kamailio/kamailio] ims_registrar_pcscf: fix getContactP() for is_registered_fallback2ip param. (#649)
by Dragos Oancea 01 Jun '16

01 Jun '16

With this change script function pcscf_is_registered() will actually find the contact (Volte) . Changes made to reflect the docs : http://www.kamailio.org/docs/modules/devel/modules/ims_registrar_pcscf.html… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/649 -- Commit Summary -- * ims_registrar_pcscf: fix getContactP() for is_registered_fallback2ip param - so that script function pcscf_is_registered() actually finds the contact . -- File Changes -- M modules/ims_registrar_pcscf/service_routes.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/649.patch https://github.com/kamailio/kamailio/pull/649.diff --- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/649

3 3

git:master:b262f704: Merge pull request #649 from athonet-open/fix-ims_registrar_pcscf
by ng-voice GmbH 01 Jun '16

01 Jun '16

Module: kamailio Branch: master Commit: b262f704c0cab19c8ada39c36c6f7cf51cd72be6 URL: https://github.com/kamailio/kamailio/commit/b262f704c0cab19c8ada39c36c6f7cf… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: ng-voice GmbH <info(a)ng-voice.com> Date: 2016-06-01T13:05:36+02:00 Merge pull request #649 from athonet-open/fix-ims_registrar_pcscf ims_registrar_pcscf: fix getContactP() for is_registered_fallback2ip param. --- Modified: modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/b262f704c0cab19c8ada39c36c6f7cf… Patch: https://github.com/kamailio/kamailio/commit/b262f704c0cab19c8ada39c36c6f7cf… --- diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index 3d29d61..bcdb368 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -228,6 +228,9 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st search_ci.received_port = _m->rcv.src_port; search_ci.received_proto = _m->rcv.proto; search_ci.searchflag = SEARCH_RECEIVED; + if (is_registered_fallback2ip == 1) { + search_ci.searchflag = SEARCH_NORMAL; + } search_ci.via_host = host; search_ci.via_port = port; search_ci.via_prot = proto; @@ -255,6 +258,7 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st LM_INFO("Contact not found based on Contact-header, trying IP/Port/Proto\n"); // received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); // received_host.s = srcip; + search_ci.searchflag = SEARCH_RECEIVED; if (ul.get_pcontact(_d, &search_ci, &c) == 1) { LM_DBG("No entry in usrloc for %.*s:%i (Proto %i) found!\n", received_host.len, received_host.s, _m->rcv.src_port, _m->rcv.proto); } else { @@ -264,6 +268,17 @@ pcontact_t * getContactP(struct sip_msg* _m, udomain_t* _d, enum pcontact_reg_st } } + if ((c == NULL) && (is_registered_fallback2ip == 2)) { + LM_INFO("Contact not found based on IP/Port/Proto, trying Contact-header\n"); + search_ci.searchflag = SEARCH_NORMAL; + if (ul.get_pcontact(_d, &search_ci, &c) == 1) { + } else { + if (checkcontact(_m, c) != 0) { + c = NULL; + } + } + } + asserted_identity = NULL; registration_contact = NULL; if (c) {

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 2016