sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:09128940: modules: readme files regenerated - ims_qos ...
by Kamailio Dev 12 Sep '16

12 Sep '16

Module: kamailio Branch: master Commit: 09128940ff8027e104b49559f3f4ea9f9d5c9c02 URL: https://github.com/kamailio/kamailio/commit/09128940ff8027e104b49559f3f4ea9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-09-12T10:01:32+02:00 modules: readme files regenerated - ims_qos ... --- Modified: modules/ims_qos/README --- Diff: https://github.com/kamailio/kamailio/commit/09128940ff8027e104b49559f3f4ea9… Patch: https://github.com/kamailio/kamailio/commit/09128940ff8027e104b49559f3f4ea9… --- diff --git a/modules/ims_qos/README b/modules/ims_qos/README index 94d92cb..aa3f209 100644 --- a/modules/ims_qos/README +++ b/modules/ims_qos/README @@ -332,10 +332,11 @@ modparam("ims_qos", "confirmed_qosrelease_headers", "X-Reason: QoS failed\r\n") midway during calls which causes the flow-description to no longer match the traffic. This parameter allows the flow-description AVP to use to the any keyword instead of certain IP:port combinations in the - SDP. The parameter is a regex that if set replaces all IPs that do not - match the regex with the any keyword in the flow-description AVP + SDP. The parameter is a regex that if set adds an extra filter for all + IPs that do not match the regex with the any keyword in the + flow-description AVP - Default value is "", no IPs replaced + Default value is "", no extra filters added Example 1.13. regex_sdp_ip_prefix_to_maintain_in_fd parameter usage ...

1 0

git:master:9b20faf2: modules/ims_qos: Modified regex_sdp_ip_prefix_to_maintain_in_fd functionality to add new filter instead of replace
by Richard Good 12 Sep '16

12 Sep '16

Module: kamailio Branch: master Commit: 9b20faf231506e7ad863ab660f54213d420671cb URL: https://github.com/kamailio/kamailio/commit/9b20faf231506e7ad863ab660f54213… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-09-12T09:57:56+02:00 modules/ims_qos: Modified regex_sdp_ip_prefix_to_maintain_in_fd functionality to add new filter instead of replace --- Modified: modules/ims_qos/doc/ims_qos_admin.xml Modified: modules/ims_qos/rx_avp.c --- Diff: https://github.com/kamailio/kamailio/commit/9b20faf231506e7ad863ab660f54213… Patch: https://github.com/kamailio/kamailio/commit/9b20faf231506e7ad863ab660f54213…

1 0

git:master:5cee9bf3: modules/ims_icscf: change business/logical errors from ERR to DBG
by jaybeepee 09 Sep '16

09 Sep '16

Module: kamailio Branch: master Commit: 5cee9bf3a2c14f174b7c0dbf4293f54b6d34e300 URL: https://github.com/kamailio/kamailio/commit/5cee9bf3a2c14f174b7c0dbf4293f54… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-09T14:39:44+02:00 modules/ims_icscf: change business/logical errors from ERR to DBG --- Modified: modules/ims_icscf/cxdx_uar.c --- Diff: https://github.com/kamailio/kamailio/commit/5cee9bf3a2c14f174b7c0dbf4293f54… Patch: https://github.com/kamailio/kamailio/commit/5cee9bf3a2c14f174b7c0dbf4293f54… --- diff --git a/modules/ims_icscf/cxdx_uar.c b/modules/ims_icscf/cxdx_uar.c index d3ceae1..1ccfb80 100644 --- a/modules/ims_icscf/cxdx_uar.c +++ b/modules/ims_icscf/cxdx_uar.c @@ -149,21 +149,21 @@ void async_cdp_uar_callback(int is_timeout, void *param, AAAMessage *uaa, long e } else { cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_USER_UNKNOWN); } - LM_ERR("RC_IMS_DIAMETER_ERROR_USER_UNKNOWN\n"); + LM_DBG("RC_IMS_DIAMETER_ERROR_USER_UNKNOWN\n"); result = CSCF_RETURN_FALSE; goto done; case RC_IMS_DIAMETER_ERROR_IDENTITIES_DONT_MATCH: - LM_ERR("RC_IMS_DIAMETER_ERROR_IDENTITIES_DONT_MATCH returning 403\n"); + LM_DBG("RC_IMS_DIAMETER_ERROR_IDENTITIES_DONT_MATCH returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_IDENTITIES_DONT_MATCH); result = CSCF_RETURN_FALSE; goto done; case RC_IMS_DIAMETER_ERROR_ROAMING_NOT_ALLOWED: - LM_ERR("RC_IMS_DIAMETER_ERROR_ROAMING_NOT_ALLOWED returning 403\n"); + LM_DBG("RC_IMS_DIAMETER_ERROR_ROAMING_NOT_ALLOWED returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_ROAMING_NOT_ALLOWED); result = CSCF_RETURN_FALSE; goto done; case RC_IMS_DIAMETER_ERROR_IDENTITY_NOT_REGISTERED: - LM_ERR("RC_IMS_DIAMETER_ERROR_IDENTITY_NOT_REGISTERED returning 403\n"); + LM_DBG("RC_IMS_DIAMETER_ERROR_IDENTITY_NOT_REGISTERED returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_IDENTITY_NOT_REGISTERED); result = CSCF_RETURN_FALSE; goto done; @@ -183,12 +183,12 @@ void async_cdp_uar_callback(int is_timeout, void *param, AAAMessage *uaa, long e break; case AAA_AUTHORIZATION_REJECTED: - LM_ERR("AAA_AUTHORIZATION_REJECTED returning 403\n"); + LM_DBG("AAA_AUTHORIZATION_REJECTED returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_AUTHORIZATION_REJECTED); result = CSCF_RETURN_FALSE; goto done; case AAA_UNABLE_TO_COMPLY: - LM_ERR("AAA_UNABLE_TO_COMPLY returning 403\n"); + LM_DBG("AAA_UNABLE_TO_COMPLY returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 500, MSG_500_UNABLE_TO_COMPLY); result = CSCF_RETURN_FALSE; goto done; @@ -197,7 +197,7 @@ void async_cdp_uar_callback(int is_timeout, void *param, AAAMessage *uaa, long e goto success; default: - LM_ERR("MSG_403_UNKOWN_RC returning 403\n"); + LM_DBG("MSG_403_UNKOWN_RC returning 403\n"); cscf_reply_transactional_async(t, t->uas.request, 403, MSG_403_UNKOWN_RC); result = CSCF_RETURN_FALSE; goto done;

1 0

git:master:998e8c15: modules/ims_qos: zero-initialise strcuture variables
by jaybeepee 09 Sep '16

09 Sep '16

Module: kamailio Branch: master Commit: 998e8c1524d25f11626290f28444b614a25eedd5 URL: https://github.com/kamailio/kamailio/commit/998e8c1524d25f11626290f28444b61… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-09T14:34:23+02:00 modules/ims_qos: zero-initialise strcuture variables --- Modified: modules/ims_qos/mod.c Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/998e8c1524d25f11626290f28444b61… Patch: https://github.com/kamailio/kamailio/commit/998e8c1524d25f11626290f28444b61… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 91566c8..c103b14 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -1279,6 +1279,7 @@ static int w_rx_aar_register(struct sip_msg *msg, char* route, char* str1, char* if (h->type == HDR_CONTACT_T && h->parsed) { for (c = ((contact_body_t*) h->parsed)->contacts; c; c = c->next) { ul.lock_udomain(domain_t, &vb->host, vb->port, vb->proto); + memset(&contact_info, 0, sizeof(struct pcontact_info)); contact_info.aor = c->uri; contact_info.via_host = vb->host; contact_info.via_port = vb->port; diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 95d1934..45d90ee 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -308,7 +308,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e LM_DBG("Registering for Usrloc callbacks on DELETE\n"); ul.lock_udomain(domain_t, &local_data->via_host, local_data->via_port, local_data->via_proto); - + memset(&contact_info, 0, sizeof(struct pcontact_info)); contact_info.received_host = local_data->recv_host; contact_info.received_port = local_data->recv_port; contact_info.received_proto = local_data->recv_proto;

1 0

git:master:0b0d99db: modules/ims_qos: correctly set protocol for media streams in flow descriptions
by jaybeepee 09 Sep '16

09 Sep '16

Module: kamailio Branch: master Commit: 0b0d99db812714c6bec35c2b1c590c8f9456c85e URL: https://github.com/kamailio/kamailio/commit/0b0d99db812714c6bec35c2b1c590c8… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-09-09T14:24:52+02:00 modules/ims_qos: correctly set protocol for media streams in flow descriptions --- Modified: modules/ims_qos/rx_avp.c Modified: modules/ims_qos/rx_avp.h --- Diff: https://github.com/kamailio/kamailio/commit/0b0d99db812714c6bec35c2b1c590c8… Patch: https://github.com/kamailio/kamailio/commit/0b0d99db812714c6bec35c2b1c590c8… --- diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 65fc3a2..04de41c 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -425,10 +425,10 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s /*media-sub-component*/ if (dlg_direction != DLG_MOBILE_ORIGINATING) { - media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport->s, ipA, portA, ipB, portB); + media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport, ipA, portA, ipB, portB); cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); } else { - media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport->s, ipB, portB, ipA, portA); + media_sub_component[media_sub_component_number] = rx_create_media_subcomponent_avp(number, transport, ipB, portB, ipA, portA); cdpb.AAAAddAVPToList(&list, media_sub_component[media_sub_component_number]); } @@ -668,15 +668,12 @@ int reg_match(char *pattern, char *string, regmatch_t *pmatch) return 0; } -AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, +AAA_AVP *rx_create_media_subcomponent_avp(int number, str* proto, str *ipA, str *portA, str *ipB, str *portB) { - str data; int len, len2; - // str flow_data = {0, 0}; - // str flow_data2 = {0, 0}; AAA_AVP *flow_description1 = 0, *flow_description2 = 0, *flow_number = 0; AAA_AVP *flow_usage = 0; @@ -685,14 +682,18 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, list.head = 0; char x[4]; char *proto_nr = 0; - if (strcasecmp(proto,"IP") == 0) { + if (proto->len == 2 && strncasecmp(proto->s,"IP", proto->len) == 0) { proto_nr = "ip"; - } else if (strcasecmp(proto,"UDP") == 0) { + } else if (proto->len == 2 && strncasecmp(proto->s,"UDP", proto->len) == 0) { proto_nr = "17"; - } else if (strcasecmp(proto,"TCP") == 0) { + } else if (proto->len == 3 && strncasecmp(proto->s,"TCP", proto->len) == 0) { proto_nr = "6"; + } else if (proto->len == 7 && strncasecmp(proto->s,"RTP/AVP", proto->len) == 0) { + proto_nr = "17"; /* for now we just use UDP for all RTP */ + } else if (proto->len == 8 && strncasecmp(proto->s,"RTP/SAVP", proto->len) == 0) { + proto_nr = "17"; /* for now we just use UDP for all RTP */ } else { - LOG(L_ERR, "Not yet implemented for protocol %s\n", proto); + LOG(L_ERR, "Not yet implemented for protocol %.*s\n", proto->len, proto->s); return 0; } int proto_len = strlen(proto_nr); diff --git a/modules/ims_qos/rx_avp.h b/modules/ims_qos/rx_avp.h index 8342aab..8e98a5f 100644 --- a/modules/ims_qos/rx_avp.h +++ b/modules/ims_qos/rx_avp.h @@ -84,7 +84,7 @@ int rx_add_media_component_description_avp(AAAMessage *msg, int number, str *med int rx_add_media_component_description_avp_register(AAAMessage *msg); -AAA_AVP *rx_create_media_subcomponent_avp(int number, char *proto, str *ipA, str *portA, str *ipB, str *portB); +AAA_AVP *rx_create_media_subcomponent_avp(int number, str *proto, str *ipA, str *portA, str *ipB, str *portB); AAA_AVP *rx_create_media_subcomponent_avp_register();

1 0

git:master:0af6ac1c: modules/ims_qos: restoring variable af_signaling_ip that was incorrectly removed
by Richard Good 09 Sep '16

09 Sep '16

Module: kamailio Branch: master Commit: 0af6ac1ca3177d21326d9531dc9a9afb84c1a332 URL: https://github.com/kamailio/kamailio/commit/0af6ac1ca3177d21326d9531dc9a9af… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-09-09T13:34:51+02:00 modules/ims_qos: restoring variable af_signaling_ip that was incorrectly removed --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0af6ac1ca3177d21326d9531dc9a9af… Patch: https://github.com/kamailio/kamailio/commit/0af6ac1ca3177d21326d9531dc9a9af… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 48c993c..91566c8 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -138,6 +138,9 @@ str rx_dest_realm = str_init("ims.smilecoms.com"); /* Only used if we want to force the Rx peer usually this is configured at a stack level and the first request uses realm routing */ str rx_forced_peer = str_init(""); +/* P-CSCF IP address to generate the flows for the UE<->PCSCF signaling path */ +str af_signaling_ip = str_init("127.0.0.1"); + /* commands wrappers and fixups */ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *id, int id_type); @@ -188,6 +191,7 @@ static param_export_t params[] = { { "rx_dest_realm", PARAM_STR, &rx_dest_realm}, { "rx_forced_peer", PARAM_STR, &rx_forced_peer}, { "rx_auth_expiry", INT_PARAM, &rx_auth_expiry}, + { "af_signaling_ip", PARAM_STR, &af_signaling_ip}, /* IP of this P-CSCF, to be used in the flow for the AF-signaling */ { "cdp_event_latency", INT_PARAM, &cdp_event_latency}, /*flag: report slow processing of CDP callback events or not */ { "cdp_event_threshold", INT_PARAM, &cdp_event_threshold}, /*time in ms above which we should report slow processing of CDP callback event*/ { "cdp_event_latency_log", INT_PARAM, &cdp_event_latency_loglevel}, /*log-level to use to report slow processing of CDP callback event*/

1 0

Kamailio Function issues
by yasir ay 09 Sep '16

09 Sep '16

Hai team, I couldnt remove contact header, i can't change my listen ip, i can't set my timr frame Pleas help me for proper customized sip routing for my voip termination Regards http://about.me/mhdyas

2 1

[kamailio/kamailio] move kamailio/utils/misc/vim/ to a git submodule (#763)
by Marcelo D Montu 08 Sep '16

08 Sep '16

The Vim plugin is very nice, and its use isn't restricted to machines where Kamailio is installed, as the config file can be edited via network (e.g.: using netrw plugin). Currently the most common approach to retrieve a Vim plugin is to clone its GitHub repo and use some plugin manager, such as [pathogen](https://github.com/tpope/vim-pathogen). But it clearly doesn't make sense to retrieve the complete Kamailio repo only to use the vim plugin; this probably caused the creation of [duplicates](https://github.com/eloycoto/vim-ser). I actually find that duplicate first, and then noticed on its README that there is an official (and newer) version here. Do you find acceptable to move it to a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules)? -- 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/issues/763

4 12

git:4.4:3ef7c98b: evapi: fixed the communication with dispatcher after initializing it as rpc worker
by Daniel-Constantin Mierla 08 Sep '16

08 Sep '16

Module: kamailio Branch: 4.4 Commit: 3ef7c98b352adba67aec25cbb99a0efa8da25600 URL: https://github.com/kamailio/kamailio/commit/3ef7c98b352adba67aec25cbb99a0ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-08T14:55:34+02:00 evapi: fixed the communication with dispatcher after initializing it as rpc worker (cherry picked from commit 72580f250a2322ac1d5e71a92826fd8b11225b04) --- Modified: modules/evapi/evapi_dispatch.c Modified: modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3ef7c98b352adba67aec25cbb99a0ef… Patch: https://github.com/kamailio/kamailio/commit/3ef7c98b352adba67aec25cbb99a0ef… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 502809b..846d650 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -221,6 +221,8 @@ int evapi_dispatch_notify(char *obuf, int olen) } } + LM_DBG("the message was sent to %d clients\n", n); + return n; } diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index b922cac..ab4fa6f 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -51,6 +51,7 @@ static char *_evapi_bind_param = NULL; static int _evapi_netstring_format_param = 1; static tm_api_t tmb; +static int _evapi_dispatcher_pid = -1; static int mod_init(void); static int child_init(int); @@ -164,16 +165,24 @@ static int child_init(int rank) } if (rank!=PROC_MAIN) { - evapi_close_notify_sockets_parent(); + if(_evapi_dispatcher_pid!=getpid()) { + evapi_close_notify_sockets_parent(); + } return 0; } - pid=fork_process(PROC_RPC, "EvAPI Dispatcher", 1); + pid=fork_process(PROC_NOCHLDINIT, "EvAPI Dispatcher", 1); if (pid<0) return -1; /* error */ if(pid==0) { /* child */ + _evapi_dispatcher_pid = getpid(); + /* do child init to allow execution of rpc like functions */ + if(init_child(PROC_RPC) < 0) { + LM_DBG("failed to do RPC child init for dispatcher\n"); + return -1; + } /* initialize the config framework */ if (cfg_child_init()) return -1;

1 0

git:master:72580f25: evapi: fixed the communication with dispatcher after initializing it as rpc worker
by Daniel-Constantin Mierla 08 Sep '16

08 Sep '16

Module: kamailio Branch: master Commit: 72580f250a2322ac1d5e71a92826fd8b11225b04 URL: https://github.com/kamailio/kamailio/commit/72580f250a2322ac1d5e71a92826fd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-08T14:53:48+02:00 evapi: fixed the communication with dispatcher after initializing it as rpc worker --- Modified: modules/evapi/evapi_dispatch.c Modified: modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/72580f250a2322ac1d5e71a92826fd8… Patch: https://github.com/kamailio/kamailio/commit/72580f250a2322ac1d5e71a92826fd8… --- diff --git a/modules/evapi/evapi_dispatch.c b/modules/evapi/evapi_dispatch.c index 1dfc578..57603c4 100644 --- a/modules/evapi/evapi_dispatch.c +++ b/modules/evapi/evapi_dispatch.c @@ -271,6 +271,8 @@ int evapi_dispatch_notify(evapi_msg_t *emsg) } } + LM_DBG("the message was sent to %d clients\n", n); + return n; } diff --git a/modules/evapi/evapi_mod.c b/modules/evapi/evapi_mod.c index cf29471..6cb4e4f 100644 --- a/modules/evapi/evapi_mod.c +++ b/modules/evapi/evapi_mod.c @@ -51,6 +51,7 @@ static char *_evapi_bind_param = NULL; static int _evapi_netstring_format_param = 1; static tm_api_t tmb; +static int _evapi_dispatcher_pid = -1; static int mod_init(void); static int child_init(int); @@ -180,16 +181,24 @@ static int child_init(int rank) } if (rank!=PROC_MAIN) { - evapi_close_notify_sockets_parent(); + if(_evapi_dispatcher_pid!=getpid()) { + evapi_close_notify_sockets_parent(); + } return 0; } - pid=fork_process(PROC_RPC, "EvAPI Dispatcher", 1); + pid=fork_process(PROC_NOCHLDINIT, "EvAPI Dispatcher", 1); if (pid<0) return -1; /* error */ if(pid==0) { /* child */ + _evapi_dispatcher_pid = getpid(); + /* do child init to allow execution of rpc like functions */ + if(init_child(PROC_RPC) < 0) { + LM_DBG("failed to do RPC child init for dispatcher\n"); + return -1; + } /* initialize the config framework */ if (cfg_child_init()) return -1;

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016