sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:d83cc933: modules: readme files regenerated - http_async_client ...

by Kamailio Dev

Module: kamailio Branch: master Commit: d83cc933342002bd652a40e96a5b475abdd583c1 URL: https://github.com/kamailio/kamailio/commit/d83cc933342002bd652a40e96a5b475… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-29T06:31:26+02:00 modules: readme files regenerated - http_async_client ... --- Modified: modules/http_async_client/README --- Diff: https://github.com/kamailio/kamailio/commit/d83cc933342002bd652a40e96a5b475… Patch: https://github.com/kamailio/kamailio/commit/d83cc933342002bd652a40e96a5b475… --- diff --git a/modules/http_async_client/README b/modules/http_async_client/README index 8d59bae..5757f7c 100644 --- a/modules/http_async_client/README +++ b/modules/http_async_client/README @@ -263,7 +263,7 @@ modparam("http_async_client", "curl_verbose", 1) Choose the memory manager used by curl: * shm: curl will use kamailio's SHM pool and memory manager - * sys: curl will use the system memory amd memory manager (malloc, + * sys: curl will use the system memory and memory manager (malloc, free, ...) Note: if this module is used in conjunction with another module using

7 years, 9 months

git:master:095d6b41: http_async_client: fixed small typo in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 095d6b41f83bb40610ae68a1390e49374ac7d26f URL: https://github.com/kamailio/kamailio/commit/095d6b41f83bb40610ae68a1390e493… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-29T06:25:42+02:00 http_async_client: fixed small typo in docs --- Modified: modules/http_async_client/doc/http_async_client_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/095d6b41f83bb40610ae68a1390e493… Patch: https://github.com/kamailio/kamailio/commit/095d6b41f83bb40610ae68a1390e493… --- diff --git a/modules/http_async_client/doc/http_async_client_admin.xml b/modules/http_async_client/doc/http_async_client_admin.xml index 215f704..b9db3ec 100644 --- a/modules/http_async_client/doc/http_async_client_admin.xml +++ b/modules/http_async_client/doc/http_async_client_admin.xml @@ -209,7 +209,7 @@ modparam("http_async_client", "curl_verbose", 1) <emphasis>shm</emphasis>: curl will use kamailio's SHM pool and memory manager </para></listitem> <listitem><para> - <emphasis>sys</emphasis>: curl will use the system memory amd memory manager (malloc, free, ...) + <emphasis>sys</emphasis>: curl will use the system memory and memory manager (malloc, free, ...) </para></listitem> </itemizedlist> <para>

7 years, 9 months

git:master:6ed325ea: modules: readme files regenerated - registrar ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 6ed325ea0d4af04b6c38b58225a88075707a65ab URL: https://github.com/kamailio/kamailio/commit/6ed325ea0d4af04b6c38b58225a8807… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-27T23:46:26+02:00 modules: readme files regenerated - registrar ... --- Modified: modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/6ed325ea0d4af04b6c38b58225a8807… Patch: https://github.com/kamailio/kamailio/commit/6ed325ea0d4af04b6c38b58225a8807…

7 years, 9 months

git:master:4af08be4: Merge pull request #725 from AndreasHuber-CH/contact_length

by GitHub

Module: kamailio Branch: master Commit: 4af08be47d02a10c9d6b62a1f24093ad912e9920 URL: https://github.com/kamailio/kamailio/commit/4af08be47d02a10c9d6b62a1f24093a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-27T23:35:19+02:00 Merge pull request #725 from AndreasHuber-CH/contact_length registrar: Fix check of contact length and make it configurable --- Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/registrar.c Modified: modules/registrar/registrar.h Modified: modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/4af08be47d02a10c9d6b62a1f24093a… Patch: https://github.com/kamailio/kamailio/commit/4af08be47d02a10c9d6b62a1f24093a…

7 years, 9 months

git:master:eb6b9c6b: registrar: Add module parameter "contact_max_size" to make max contact size configurable

by AndreasHuber-CH

Module: kamailio Branch: master Commit: eb6b9c6bbd3674dc9e2b6da80b010986dd300e3f URL: https://github.com/kamailio/kamailio/commit/eb6b9c6bbd3674dc9e2b6da80b01098… Author: AndreasHuber-CH <andreas.huber(a)nagra.com> Committer: AndreasHuber-CH <andreas.huber(a)nagra.com> Date: 2016-07-26T10:33:01+02:00 registrar: Add module parameter "contact_max_size" to make max contact size configurable The new module parameter "contact_max_size" allows changing the max size of contact URIs that are accepted in REGISTER requests. The default value of this parameter is 255 which was the value of the compile time constant that is replaced by this module parameter. If configured one must make sure that the DB actually supports the configured size in the column "contact". --- Modified: modules/registrar/doc/registrar_admin.xml Modified: modules/registrar/registrar.c Modified: modules/registrar/registrar.h Modified: modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/eb6b9c6bbd3674dc9e2b6da80b01098… Patch: https://github.com/kamailio/kamailio/commit/eb6b9c6bbd3674dc9e2b6da80b01098… --- diff --git a/modules/registrar/doc/registrar_admin.xml b/modules/registrar/doc/registrar_admin.xml index 15550d8..eb47652 100644 --- a/modules/registrar/doc/registrar_admin.xml +++ b/modules/registrar/doc/registrar_admin.xml @@ -929,6 +929,36 @@ modparam("registrar", "flow_timer", 25) </example> </section> + <section id="registrar.p.contact_max_size"> + <title><varname>contact_max_size</varname> (integer)</title> + <para> + Max size of URIs in <quote>Contact:</quote> header. + </para> + <para> + The size of URIs in <quote>Contact:</quote> headers are checked to be + lower or equal to this value. + A warning is logged and a 400 Bad Request is sent in response to REGISTER + requests with contact URIs that are longer than this value. + </para> + <para> + If a database is used then you must make sure that your database model supports + strings of the configured size in the column <quote>contact</quote> of the table + specified in <quote>save()</quote> function. + </para> + <para> + <emphasis> + Default value is 255. + </emphasis> + </para> + <example> + <title>Set <varname>contact_max_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "contact_max_size", 500) +... + </programlisting> + </example> + </section> </section> diff --git a/modules/registrar/registrar.c b/modules/registrar/registrar.c index b04dbb3..4277ed9 100644 --- a/modules/registrar/registrar.c +++ b/modules/registrar/registrar.c @@ -106,6 +106,8 @@ int reg_outbound_mode = 0; int reg_regid_mode = 0; int reg_flow_timer = 0; +int contact_max_size = 255; /* max size of contact URIs */ + str match_callid_name = str_init("match_callid"); str match_received_name = str_init("match_received"); str match_contact_name = str_init("match_contact"); @@ -225,6 +227,7 @@ static param_export_t params[] = { {"outbound_mode", INT_PARAM, &reg_outbound_mode }, {"regid_mode", INT_PARAM, &reg_regid_mode }, {"flow_timer", INT_PARAM, &reg_flow_timer }, + {"contact_max_size", INT_PARAM, &contact_max_size }, {0, 0, 0} }; diff --git a/modules/registrar/registrar.h b/modules/registrar/registrar.h index 5dda71e..6c4b2be 100644 --- a/modules/registrar/registrar.h +++ b/modules/registrar/registrar.h @@ -39,7 +39,7 @@ /* if DB support is used, this values must not exceed the * storage capacity of the DB columns! See db/schema/entities.xml */ -#define CONTACT_MAX_SIZE 255 +extern int contact_max_size; /* configurable using module parameter "contact_max_size" instead of compile time constant */ #define RECEIVED_MAX_SIZE 255 #define USERNAME_MAX_SIZE 64 #define DOMAIN_MAX_SIZE 128 diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index dd4ccce..8bc56cc 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -190,7 +190,7 @@ int check_contacts(struct sip_msg* _m, int* _s) } /* check also the length of all contacts */ for(c=((contact_body_t*)p->parsed)->contacts ; c ; c=c->next) { - if (c->uri.len > CONTACT_MAX_SIZE) { + if (c->uri.len > contact_max_size) { LM_WARN("contact uri is too long: [%.*s]\n", c->uri.len, c->uri.s); rerrno = R_CONTACT_LEN; return 1;

7 years, 9 months

git:master:c0697d76: registrar: Check max URI size of contact also for first contact header

by AndreasHuber-CH

Module: kamailio Branch: master Commit: c0697d76fc2ae8ea9676aa9a9b57db442b9c678f URL: https://github.com/kamailio/kamailio/commit/c0697d76fc2ae8ea9676aa9a9b57db4… Author: AndreasHuber-CH <andreas.huber(a)nagra.com> Committer: AndreasHuber-CH <andreas.huber(a)nagra.com> Date: 2016-07-26T09:00:35+02:00 registrar: Check max URI size of contact also for first contact header The URI size of contacts is checked against a max size to ensure that it fits into the database column. This check was already present before but was done only for the contact header fields other than the first header field which made that REGISTER with a single contact were not checked for max size and were truncated later when stored to the database. With this fix all contact URIs of all contact header fields are checked against the max size. --- Modified: modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/c0697d76fc2ae8ea9676aa9a9b57db4… Patch: https://github.com/kamailio/kamailio/commit/c0697d76fc2ae8ea9676aa9a9b57db4… --- diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index 8856ce4..dd4ccce 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -179,10 +179,10 @@ int check_contacts(struct sip_msg* _m, int* _s) *_s = 1; } else { /* The first Contact HF is not star */ - /* Message must contain no star Contact HF */ - p = _m->contact->next; + p = _m->contact; while(p) { if (p->type == HDR_CONTACT_T) { + /* Message must contain no star Contact HF */ if (((contact_body_t*)p->parsed)->star == 1) { LM_WARN("star contact cannot be mixed with other contacts\n"); rerrno = R_STAR_CONT; @@ -193,7 +193,7 @@ int check_contacts(struct sip_msg* _m, int* _s) if (c->uri.len > CONTACT_MAX_SIZE) { LM_WARN("contact uri is too long: [%.*s]\n", c->uri.len, c->uri.s); rerrno = R_CONTACT_LEN; - return 1; + return 1; } if (c->received && c->received->len>RECEIVED_MAX_SIZE) { LM_WARN("received attribute of contact is too long\n");

7 years, 9 months

git:master:cc0b07d2: registrar: Add warnings if contact is invalid and REGISTER will be rejected

by AndreasHuber-CH

Module: kamailio Branch: master Commit: cc0b07d2bcadbd95b2f0dbfdcc873306acca8f2d URL: https://github.com/kamailio/kamailio/commit/cc0b07d2bcadbd95b2f0dbfdcc87330… Author: AndreasHuber-CH <andreas.huber(a)nagra.com> Committer: AndreasHuber-CH <andreas.huber(a)nagra.com> Date: 2016-07-26T08:41:20+02:00 registrar: Add warnings if contact is invalid and REGISTER will be rejected Added some warnings in case a REGISTER is rejected because of an invalid contact header field. Before, kamailio might answer a 400 Bad Request for a too long contact URI for example without logging any message. --- Modified: modules/registrar/sip_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/cc0b07d2bcadbd95b2f0dbfdcc87330… Patch: https://github.com/kamailio/kamailio/commit/cc0b07d2bcadbd95b2f0dbfdcc87330… --- diff --git a/modules/registrar/sip_msg.c b/modules/registrar/sip_msg.c index 36c4682..8856ce4 100644 --- a/modules/registrar/sip_msg.c +++ b/modules/registrar/sip_msg.c @@ -154,12 +154,14 @@ int check_contacts(struct sip_msg* _m, int* _s) /* The first Contact HF is star */ /* Expires must be zero */ if (get_expires_hf(_m) != 0) { + LM_WARN("expires must be 0 for star contact\n"); rerrno = R_STAR_EXP; return 1; } /* Message must contain no contacts */ if (((contact_body_t*)_m->contact->parsed)->contacts) { + LM_WARN("star contact cannot be mixed with other contacts\n"); rerrno = R_STAR_CONT; return 1; } @@ -168,6 +170,7 @@ int check_contacts(struct sip_msg* _m, int* _s) p = _m->contact->next; while(p) { if (p->type == HDR_CONTACT_T) { + LM_WARN("star contact cannot be mixed with other contacts\n"); rerrno = R_STAR_CONT; return 1; } @@ -181,13 +184,19 @@ int check_contacts(struct sip_msg* _m, int* _s) while(p) { if (p->type == HDR_CONTACT_T) { if (((contact_body_t*)p->parsed)->star == 1) { + LM_WARN("star contact cannot be mixed with other contacts\n"); rerrno = R_STAR_CONT; return 1; } - /* check also the lenght of all contacts */ + /* check also the length of all contacts */ for(c=((contact_body_t*)p->parsed)->contacts ; c ; c=c->next) { - if (c->uri.len > CONTACT_MAX_SIZE - || (c->received && c->received->len>RECEIVED_MAX_SIZE) ) { + if (c->uri.len > CONTACT_MAX_SIZE) { + LM_WARN("contact uri is too long: [%.*s]\n", c->uri.len, c->uri.s); + rerrno = R_CONTACT_LEN; + return 1; + } + if (c->received && c->received->len>RECEIVED_MAX_SIZE) { + LM_WARN("received attribute of contact is too long\n"); rerrno = R_CONTACT_LEN; return 1; }

7 years, 9 months

[kamailio/kamailio] registrar: Fix check of contact length and make it configurable (#725)

by AndreasHuber-CH

I split the pull request in three commits to seperate the fix from the new feature, but they go together so I propose them in the same pull request: cc0b07d: I added some log message that would have helped me to understand a 400 Bad Request response. c0697d7: I fixed a bug that were the contact size is not checked on the first header field and 200 OK is sent instead of 400 Bad Request for too long contact URIs but the uri ends up beein truncated by the database. eb6b9c6: I made the contact size configurable to allow longer contacts You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/725 -- Commit Summary -- * registrar: Add warnings if contact is invalid and REGISTER will be rejected * registrar: Check max URI size of contact also for first contact header * registrar: Add module parameter "contact_max_size" to make max contact size configurable -- File Changes -- M modules/registrar/doc/registrar_admin.xml (30) M modules/registrar/registrar.c (3) M modules/registrar/registrar.h (2) M modules/registrar/sip_msg.c (19) -- Patch Links -- https://github.com/kamailio/kamailio/pull/725.patch https://github.com/kamailio/kamailio/pull/725.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/725

7 years, 9 months

possible issue on exit

by Luis Azedo

Hi, there seems to be an issue exiting kamailio. can someone confirm if this is a known issue ? Thanks ? Jul 21 04:10:36 wdc-kz-00 kamailio[19730]: NOTICE: <core> [main.c:739]: handle_sigs(): Thank you for flying kamailio!!! Jul 21 04:10:36 wdc-kz-00 kamailio[19956]: INFO: <core> [main.c:850]: sig_usr(): signal 15 received ..... Jul 21 04:10:36 wdc-kz-00 kamailio[19940]: INFO: <core> [main.c:850]: sig_usr(): signal 15 received Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: ERROR: ctl [ctl.c:382]: mod_destroy(): ERROR: ctl: could not delete unix socket /tmp/kamailio_ctl: Operation not permitted (1) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: <core> [main.c:611]: cleanup(): Memory still-in-use summary (pkg): Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: summarizing all alloc'ed. fragments: Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 2 size= 64 bytes from <core>: ut.c: get_abs_pathname(264) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 5 size= 80 bytes from <core>: select.c: register_select_table(465) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 1 size= 24 bytes from kex: mi_core.c: init_mi_uptime(74) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 10 size= 184 bytes from <core>: socket_info.c: fix_hostname(1378) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 10 size= 880 bytes from <core>: socket_info.c: fix_sock_str(438) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 20 size= 688 bytes from <core>: name_alias.h: add_alias(97) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 1 size= 240 bytes from pv: pv_svar.c: set_var_value(114) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 1 size= 232 bytes from <core>: parser/msg_parser.c: get_hdr_field(133) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 1 size= 64 bytes from <core>: parser/msg_parser.c: parse_headers(343) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 10 size= 80 bytes from <core>: socket_info.c: fix_socket_list(1580) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 5 size= 568 bytes from tmx: t_var.c: pv_parse_t_var_name(362) Jul 21 04:10:37 wdc-kz-00 kamailio[19730]: INFO: fm_status: count= 3 size= 192 bytes from <core>: cfg.y: mk_case_stm(3709)

7 years, 9 months

git:master:f0293351: Merge pull request #722 from athonet-open/ims_charging_fix_ro_issues

by GitHub

Module: kamailio Branch: master Commit: f0293351591d7751def6768ba716ba98faa1154b URL: https://github.com/kamailio/kamailio/commit/f0293351591d7751def6768ba716ba9… Author: jaybeepee <jason.penton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-25T09:24:29+02:00 Merge pull request #722 from athonet-open/ims_charging_fix_ro_issues ims_charging: fix Ro issues --- Modified: modules/ims_charging/ccr.c Modified: modules/ims_charging/ims_ro.c Modified: modules/ims_charging/ro_session_hash.c Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/f0293351591d7751def6768ba716ba9… Patch: https://github.com/kamailio/kamailio/commit/f0293351591d7751def6768ba716ba9… --- diff --git a/modules/ims_charging/ccr.c b/modules/ims_charging/ccr.c index a2fa489..82e5ae8 100644 --- a/modules/ims_charging/ccr.c +++ b/modules/ims_charging/ccr.c @@ -21,7 +21,7 @@ int Ro_write_event_type_avps(AAA_AVP_LIST * avp_list, event_type_t * x) { goto error; if (x->expires) - if (!cdp_avp->epcapp.add_Expires(avp_list, *(x->expires))) + if (!cdp_avp->epcapp.add_Expires(&aList, *(x->expires))) goto error; if (!cdp_avp->epcapp.add_Event_Type(avp_list, &aList, AVP_FREE_DATA)) //TODO: used to be DONT FREE diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index df56bad..c0c586f 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -638,6 +638,7 @@ void send_ccr_interim(struct ro_session* ro_session, unsigned int used, unsigned } if (ret != 1) { + ccr = 0; // If an error is returned from cdp AAASendMessage, the message has been freed there goto error; } // cdpb.AAASessionsUnlock(auth->hash); diff --git a/modules/ims_charging/ro_session_hash.c b/modules/ims_charging/ro_session_hash.c index d63697d..3967b0c 100644 --- a/modules/ims_charging/ro_session_hash.c +++ b/modules/ims_charging/ro_session_hash.c @@ -220,7 +220,7 @@ struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_ new_ro_session->reserved_secs = requested_secs; new_ro_session->valid_for = validity_timeout; - new_ro_session->hop_by_hop = 1; + new_ro_session->hop_by_hop = 0; new_ro_session->next = 0; new_ro_session->dlg_h_entry = dlg_h_entry; new_ro_session->dlg_h_id = dlg_h_id; diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index ded2a4b..57bf55c 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -280,7 +280,7 @@ void resume_ro_session_ontimeout(struct interim_ccr *i_req, int timeout_or_error used_secs = rint((now - ((timeout_or_error==1 && i_req->ro_session->last_event_timestamp_backup>0)?i_req->ro_session->last_event_timestamp_backup : i_req->ro_session->last_event_timestamp)) / (float) 1000000); /* check to make sure diameter server is giving us sane values */ - if (i_req->new_credit > i_req->credit_valid_for) { + if (i_req->credit_valid_for !=0 && i_req->new_credit > i_req->credit_valid_for) { LM_WARN("That's weird, Diameter server gave us credit with a lower validity period :D. Setting reserved time to validity period instead \n"); i_req->new_credit = i_req->credit_valid_for; } @@ -473,6 +473,9 @@ void ro_session_ontimeout(struct ro_tl *tl) { case delayed_delete: destroy_ro_session(ro_session); return; + case pending: + /* call is not answered yet. No point asking more credit. Just wait for dialog to progress somehow */ + return; default: LM_ERR("Diameter call session - event [%d]\n", ro_session->event_type);

7 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016