sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

Re: [sr-dev] [kamailio/kamailio] usrloc: add more attributes to the result of ul.dump (a57465f)

by Charles Chance

@miconda - am I ok to backport this? -- 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/commit/a57465ff47d46fb5d64c692a72f4276…

7 years

git:master:785a3ccc: tm: run TMCB_RESPONSE_OUT callback only if the response code is still the active one

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 785a3ccc743f429107c3dfae78d43705918aa4e6 URL: https://github.com/kamailio/kamailio/commit/785a3ccc743f429107c3dfae78d4370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-09T15:54:46+01:00 tm: run TMCB_RESPONSE_OUT callback only if the response code is still the active one --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/785a3ccc743f429107c3dfae78d4370… Patch: https://github.com/kamailio/kamailio/commit/785a3ccc743f429107c3dfae78d4370… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 7cac44ede2..e6bc4dbff1 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1978,8 +1978,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ LOCK_REPLIES( t ); - run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, - t->uas.request, relayed_msg, TMCB_NONE_F); + if(relayed_msg->REPLY_STATUS==uas_rb->activ_type) { + run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, + t->uas.request, relayed_msg, TMCB_NONE_F); + } UNLOCK_REPLIES( t ); } if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT))){

7 years

git:master:33302f87: tm: use define for unset flags of run_trans_callbacks_with_buf()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 33302f87cb2bd8b94a1e338d8a3171a41a055bf2 URL: https://github.com/kamailio/kamailio/commit/33302f87cb2bd8b94a1e338d8a3171a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-09T14:55:47+01:00 tm: use define for unset flags of run_trans_callbacks_with_buf() --- Modified: src/modules/tm/t_append_branches.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_hooks.h Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/33302f87cb2bd8b94a1e338d8a3171a… Patch: https://github.com/kamailio/kamailio/commit/33302f87cb2bd8b94a1e338d8a3171a… --- diff --git a/src/modules/tm/t_append_branches.c b/src/modules/tm/t_append_branches.c index 9477f8f6b0..7ec2008ffa 100644 --- a/src/modules/tm/t_append_branches.c +++ b/src/modules/tm/t_append_branches.c @@ -189,7 +189,7 @@ int t_append_branches(void) { if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_OUT))) run_trans_callbacks_with_buf( TMCB_REQUEST_OUT, &t->uac[nr_branches].request, - faked_req, 0, -orig_msg->REQ_METHOD); + faked_req, 0, TMCB_NONE_F); } else /* new branch added */ added_branches |= 1<<branch_ret; diff --git a/src/modules/tm/t_fwd.c b/src/modules/tm/t_fwd.c index df9eef4f49..4ebafee167 100644 --- a/src/modules/tm/t_fwd.c +++ b/src/modules/tm/t_fwd.c @@ -1585,7 +1585,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg , } else { if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_SENT))) run_trans_callbacks_with_buf(TMCB_REQUEST_SENT, &uac->request, - p_msg, 0,0); + p_msg, 0, TMCB_NONE_F); /* start retr. only if the send succeeded */ if (start_retr( &uac->request )!=0){ LM_CRIT("BUG: retransmission already started for: %p\n", @@ -1754,7 +1754,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg, if (unlikely(has_tran_tmcbs(t, TMCB_REQUEST_OUT))) run_trans_callbacks_with_buf( TMCB_REQUEST_OUT, &t->uac[i].request, - p_msg, 0, -p_msg->REQ_METHOD); + p_msg, 0, TMCB_NONE_F); } else /* new branch added */ added_branches |= 1<<branch_ret; diff --git a/src/modules/tm/t_hooks.h b/src/modules/tm/t_hooks.h index f002a008d0..3e133f38cf 100644 --- a/src/modules/tm/t_hooks.h +++ b/src/modules/tm/t_hooks.h @@ -328,6 +328,7 @@ struct cell; ). */ +#define TMCB_NONE_F 0 #define TMCB_RETR_F 1 #define TMCB_LOCAL_F 2 diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 355f4d2e7e..7cac44ede2 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -515,7 +515,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, } else { if(unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_READY))) { run_trans_callbacks_with_buf(TMCB_RESPONSE_READY, rb, - trans->uas.request, FAKED_REPLY, code); + trans->uas.request, FAKED_REPLY, TMCB_NONE_F); } } cleanup_uac_timers( trans ); @@ -532,7 +532,7 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, if (code==100) { if(unlikely(has_tran_tmcbs(trans, TMCB_REQUEST_PENDING))) run_trans_callbacks_with_buf(TMCB_REQUEST_PENDING, rb, - trans->uas.request, FAKED_REPLY, code); + trans->uas.request, FAKED_REPLY, TMCB_NONE_F); } /* send it out */ @@ -1946,7 +1946,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (relay >= 0) { if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_READY))){ run_trans_callbacks_with_buf(TMCB_RESPONSE_READY, uas_rb, - t->uas.request, relayed_msg, relayed_code); + t->uas.request, relayed_msg, TMCB_NONE_F); } /* Set retransmission timer before the reply is sent out to avoid * race conditions @@ -1979,7 +1979,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ LOCK_REPLIES( t ); run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, - t->uas.request, relayed_msg, relayed_code); + t->uas.request, relayed_msg, TMCB_NONE_F); UNLOCK_REPLIES( t ); } if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT))){

7 years

git:master:4b19cda7: db_mysql: coherent indentation and whitespacing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4b19cda766732adc7788b7a5ebcf256c58a35c32 URL: https://github.com/kamailio/kamailio/commit/4b19cda766732adc7788b7a5ebcf256… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-09T07:03:02+01:00 db_mysql: coherent indentation and whitespacing --- Modified: src/modules/db_mysql/db_mysql.c Modified: src/modules/db_mysql/db_mysql.h Modified: src/modules/db_mysql/km_db_mysql.c Modified: src/modules/db_mysql/km_db_mysql.h Modified: src/modules/db_mysql/km_dbase.c Modified: src/modules/db_mysql/km_dbase.h Modified: src/modules/db_mysql/km_my_con.h Modified: src/modules/db_mysql/km_res.c Modified: src/modules/db_mysql/km_res.h Modified: src/modules/db_mysql/km_row.c Modified: src/modules/db_mysql/km_row.h Modified: src/modules/db_mysql/km_val.c Modified: src/modules/db_mysql/km_val.h Modified: src/modules/db_mysql/my_cmd.c Modified: src/modules/db_mysql/my_cmd.h Modified: src/modules/db_mysql/my_con.c Modified: src/modules/db_mysql/my_con.h Modified: src/modules/db_mysql/my_fld.c Modified: src/modules/db_mysql/my_fld.h Modified: src/modules/db_mysql/my_res.c Modified: src/modules/db_mysql/my_res.h Modified: src/modules/db_mysql/my_uri.c Modified: src/modules/db_mysql/my_uri.h --- Diff: https://github.com/kamailio/kamailio/commit/4b19cda766732adc7788b7a5ebcf256… Patch: https://github.com/kamailio/kamailio/commit/4b19cda766732adc7788b7a5ebcf256…

7 years

git:master:60db119b: core: warning when a task is pushed but no workers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 60db119bf8388f047cb7f7e2ce9f2e740b5abb8d URL: https://github.com/kamailio/kamailio/commit/60db119bf8388f047cb7f7e2ce9f2e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-09T06:42:49+01:00 core: warning when a task is pushed but no workers - helper functions to get the number of workers --- Modified: src/core/async_task.c Modified: src/core/async_task.h --- Diff: https://github.com/kamailio/kamailio/commit/60db119bf8388f047cb7f7e2ce9f2e7… Patch: https://github.com/kamailio/kamailio/commit/60db119bf8388f047cb7f7e2ce9f2e7… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index 956bd9ae8b..ab2376a446 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -53,6 +53,25 @@ int async_task_run(int idx); /** * */ +int async_task_workers_get(void) +{ + return _async_task_workers; +} + +/** + * + */ +int async_task_workers_active(void) +{ + if(_async_task_workers<=0) + return 0; + + return 1; +} + +/** + * + */ int async_task_init_sockets(void) { if (socketpair(PF_UNIX, SOCK_DGRAM, 0, _async_task_sockets) < 0) { @@ -195,8 +214,10 @@ int async_task_push(async_task_t *task) { int len; - if(_async_task_workers<=0) + if(_async_task_workers<=0) { + LM_WARN("async task pushed, but no async workers - ignoring\n"); return 0; + } len = write(_async_task_sockets[1], &task, sizeof(async_task_t*)); if(len<=0) { diff --git a/src/core/async_task.h b/src/core/async_task.h index 620009b4f6..55c558c30d 100644 --- a/src/core/async_task.h +++ b/src/core/async_task.h @@ -37,5 +37,7 @@ int async_task_initialized(void); int async_task_set_workers(int n); int async_task_push(async_task_t *task); int async_task_set_usleep(int n); +int async_task_workers_get(void); +int async_task_workers_active(void); #endif

7 years

git:master:103173e6: phonenum: set record after phone number lookup and return pv attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 103173e6258a4c2a6d8c65306320fe2e01d036f2 URL: https://github.com/kamailio/kamailio/commit/103173e6258a4c2a6d8c65306320fe2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-08T11:59:31+01:00 phonenum: set record after phone number lookup and return pv attributes --- Modified: src/modules/phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/103173e6258a4c2a6d8c65306320fe2… Patch: https://github.com/kamailio/kamailio/commit/103173e6258a4c2a6d8c65306320fe2…

7 years

git:master:5e54b72f: misc/examples: updates for basic and advanced configs for v5.1

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5e54b72fe8afa6710a51c65ed942b671ab0249d9 URL: https://github.com/kamailio/kamailio/commit/5e54b72fe8afa6710a51c65ed942b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-08T09:49:35+01:00 misc/examples: updates for basic and advanced configs for v5.1 --- Modified: misc/examples/pkg/kamailio-basic.cfg Modified: misc/examples/pkg/kamailio-oob.cfg --- Diff: https://github.com/kamailio/kamailio/commit/5e54b72fe8afa6710a51c65ed942b67… Patch: https://github.com/kamailio/kamailio/commit/5e54b72fe8afa6710a51c65ed942b67… --- diff --git a/misc/examples/pkg/kamailio-basic.cfg b/misc/examples/pkg/kamailio-basic.cfg index 34b1466963..c53fe8af5c 100644 --- a/misc/examples/pkg/kamailio-basic.cfg +++ b/misc/examples/pkg/kamailio-basic.cfg @@ -1,10 +1,10 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.0 - default configuration script +# Kamailio (OpenSER) SIP Server v5.1 - default basic configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # -# Direct your questions about this file to: <sr-users(a)lists.sip-router.org> +# Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at http://www.kamailio.org/wiki/ # for an explanation of possible statements, functions and parameters. @@ -129,18 +129,14 @@ port=5060 enable_tls=yes #!endif -# life time of TCP connection when there is no traffic -# - a bit higher than registration expires to cope with UA behind NAT +/* life time of TCP connection when there is no traffic + * - a bit higher than registration expires to cope with UA behind NAT */ tcp_connection_lifetime=3605 ####### Modules Section ######## -# set paths to location of modules (to sources or installation folders) -#!ifdef WITH_SRCPATH -mpath="modules" -#!else -mpath="/usr/local/lib/kamailio/modules/" -#!endif +/* set the path to location of modules */ +# mpath="/usr/local/lib/kamailio/modules/" #!ifdef WITH_MYSQL loadmodule "db_mysql.so" @@ -329,18 +325,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH); diff --git a/misc/examples/pkg/kamailio-oob.cfg b/misc/examples/pkg/kamailio-oob.cfg index 5a82680166..c76d5c47d7 100644 --- a/misc/examples/pkg/kamailio-oob.cfg +++ b/misc/examples/pkg/kamailio-oob.cfg @@ -1,10 +1,10 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.0 - default configuration script +# Kamailio (OpenSER) SIP Server v5.1 - default advanced configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # -# Direct your questions about this file to: <sr-users(a)lists.sip-router.org> +# Direct your questions about this file to: <sr-users(a)lists.kamailio.org> # # Refer to the Core CookBook at http://www.kamailio.org/wiki/ # for an explanation of possible statements, functions and parameters. @@ -512,18 +512,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH);

7 years

git:master:25b96858: Merge pull request #1307 from armenb/uac_max_message_size

by GitHub

Module: kamailio Branch: master Commit: 25b96858e0f89d13cd2093e15fa8d1178c691278 URL: https://github.com/kamailio/kamailio/commit/25b96858e0f89d13cd2093e15fa8d11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-11-08T09:49:21+01:00 Merge pull request #1307 from armenb/uac_max_message_size uac: increase UAC message size to 32kbytes --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/25b96858e0f89d13cd2093e15fa8d11… Patch: https://github.com/kamailio/kamailio/commit/25b96858e0f89d13cd2093e15fa8d11… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index e0baf13a41..78dc725453 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -42,7 +42,7 @@ #include "uac_send.h" #define MAX_UACH_SIZE 2048 -#define MAX_UACB_SIZE 4086 +#define MAX_UACB_SIZE 32768 #define MAX_UACD_SIZE 128 /** TM bind */ @@ -823,4 +823,4 @@ int w_uac_req_send(struct sip_msg *msg, char *s1, char *s2) int ki_uac_req_send(sip_msg_t *msg) { return uac_req_send(); -} \ No newline at end of file +}

7 years

git:master:189630e9: uac: increase UAC message size to 32kbytes

by Armen Babikyan

Module: kamailio Branch: master Commit: 189630e9df209431cb800617d98d215bfd3031a4 URL: https://github.com/kamailio/kamailio/commit/189630e9df209431cb800617d98d215… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2017-11-08T00:36:21-08:00 uac: increase UAC message size to 32kbytes --- Modified: src/modules/uac/uac_send.c --- Diff: https://github.com/kamailio/kamailio/commit/189630e9df209431cb800617d98d215… Patch: https://github.com/kamailio/kamailio/commit/189630e9df209431cb800617d98d215… --- diff --git a/src/modules/uac/uac_send.c b/src/modules/uac/uac_send.c index e0baf13a41..78dc725453 100644 --- a/src/modules/uac/uac_send.c +++ b/src/modules/uac/uac_send.c @@ -42,7 +42,7 @@ #include "uac_send.h" #define MAX_UACH_SIZE 2048 -#define MAX_UACB_SIZE 4086 +#define MAX_UACB_SIZE 32768 #define MAX_UACD_SIZE 128 /** TM bind */ @@ -823,4 +823,4 @@ int w_uac_req_send(struct sip_msg *msg, char *s1, char *s2) int ki_uac_req_send(sip_msg_t *msg) { return uac_req_send(); -} \ No newline at end of file +}

7 years

[kamailio/kamailio] uac: increase UAC message size to 32kbytes (#1307)

by Armen Babikyan

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1307 -- Commit Summary -- * uac: increase UAC message size to 32kbytes -- File Changes -- M src/modules/uac/uac_send.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1307.patch https://github.com/kamailio/kamailio/pull/1307.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/1307

7 years

← Newer
1
...
36
37
38
39
40
41
42
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2017