sr-dev November 2017

sr-dev@lists.kamailio.org

26 participants
481 discussions

git:5.0:0725f750: dialog: set the end time stamp immediately after going into deleted state

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: 0725f750e1981be8e2058ce1a48e90eb7862e8bd URL: https://github.com/kamailio/kamailio/commit/0725f750e1981be8e2058ce1a48e90e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-10T09:35:53+01:00 dialog: set the end time stamp immediately after going into deleted state - checks to see if time stamps are set when testing if dialogs lasted too long in intermediary states (cherry picked from commit 74825c896dacd3f39948395cebfcf7b6e0730b51) --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/0725f750e1981be8e2058ce1a48e90e… Patch: https://github.com/kamailio/kamailio/commit/0725f750e1981be8e2058ce1a48e90e… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 886219543c..d5d8fbb5d5 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -453,6 +453,10 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) event = DLG_EVENT_RPL3xx; next_state_dlg( dlg, event, &old_state, &new_state, &unref); + if(new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + /* set end time */ + dlg->end_ts = (unsigned int)(time(0)); + } if(dlg_run_event_route(dlg, (rpl==FAKED_REPLY)?NULL:rpl, old_state, new_state)<0) { /* dialog is gone */ @@ -527,11 +531,6 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) goto done; } - if(new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { - /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); - } - if ( new_state==DLG_STATE_DELETED && (old_state==DLG_STATE_UNCONFIRMED || old_state==DLG_STATE_EARLY) ) { diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 8c5c7a6acb..73947263e7 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -229,21 +229,24 @@ int dlg_clean_run(ticks_t ti) while (dlg) { tdlg = dlg; dlg = dlg->next; - if(tdlg->state==DLG_STATE_UNCONFIRMED && tdlg->init_ts<tm-300) { + if(tdlg->state==DLG_STATE_UNCONFIRMED && tdlg->init_ts>0 + && tdlg->init_ts<tm-300) { /* dialog in early state older than 5min */ LM_NOTICE("dialog in early state is too old (%p ref %d)\n", tdlg, tdlg->ref); unlink_unsafe_dlg(&d_table->entries[i], tdlg); destroy_dlg(tdlg); } - if(tdlg->state==DLG_STATE_CONFIRMED_NA && tdlg->start_ts<tm-60) { + if(tdlg->state==DLG_STATE_CONFIRMED_NA && tdlg->start_ts>0 + && tdlg->start_ts<tm-60) { if(update_dlg_timer(&tdlg->tl, 10)<0) { LM_ERR("failed to update dialog lifetime in long non-ack state\n"); } tdlg->lifetime = 10; tdlg->dflags |= DLG_FLAG_CHANGED; } - if(tdlg->state==DLG_STATE_DELETED && tdlg->end_ts<tm-300) { + if(tdlg->state==DLG_STATE_DELETED && tdlg->end_ts>0 + && tdlg->end_ts<tm-300) { /* dialog in deleted state older than 5min */ LM_NOTICE("dialog in delete state is too old (%p ref %d)\n", tdlg, tdlg->ref);

7 years

git:master:313265ac: dialog: use a variable for timeout of dialogs in end state

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 313265ace229ed5d6ebd75ff6eff959e78820880 URL: https://github.com/kamailio/kamailio/commit/313265ace229ed5d6ebd75ff6eff959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-10T09:27:16+01:00 dialog: use a variable for timeout of dialogs in end state --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/313265ace229ed5d6ebd75ff6eff959… Patch: https://github.com/kamailio/kamailio/commit/313265ace229ed5d6ebd75ff6eff959… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index c65e95b9f2..3fc51f9b9f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -109,6 +109,7 @@ static int _dlg_track_cseq_updates = 0; int dlg_ka_failed_limit = 1; int dlg_early_timeout = 300; int dlg_noack_timeout = 60; +int dlg_end_timeout = 300; int dlg_enable_dmq = 0; @@ -309,6 +310,7 @@ static param_export_t mod_params[]={ { "event_callback", PARAM_STR, &dlg_event_callback }, { "early_timeout", PARAM_INT, &dlg_early_timeout }, { "noack_timeout", PARAM_INT, &dlg_noack_timeout }, + { "end_timeout", PARAM_INT, &dlg_end_timeout }, { 0,0,0 } }; diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 1f108f0f8a..df25d933cf 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -50,6 +50,7 @@ extern int dlg_enable_dmq; extern int dlg_early_timeout; extern int dlg_noack_timeout; +extern int dlg_end_timeout; /*! global dialog table */ struct dlg_table *d_table = 0; @@ -249,7 +250,7 @@ int dlg_clean_run(ticks_t ti) tdlg->dflags |= DLG_FLAG_CHANGED; } if(tdlg->state==DLG_STATE_DELETED && tdlg->end_ts>0 - && tdlg->end_ts<tm-300) { + && tdlg->end_ts<tm-dlg_end_timeout) { /* dialog in deleted state older than 5min */ LM_NOTICE("dialog in delete state is too old (%p ref %d)\n", tdlg, tdlg->ref);

7 years

git:master:74825c89: dialog: set the end time stamp immediately after going into deleted state

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 74825c896dacd3f39948395cebfcf7b6e0730b51 URL: https://github.com/kamailio/kamailio/commit/74825c896dacd3f39948395cebfcf7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-11-10T09:23:34+01:00 dialog: set the end time stamp immediately after going into deleted state - checks to see if time stamps are set when testing if dialogs lasted too long in intermediary states --- Modified: src/modules/dialog/dlg_handlers.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/74825c896dacd3f39948395cebfcf7b… Patch: https://github.com/kamailio/kamailio/commit/74825c896dacd3f39948395cebfcf7b… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index dcd06a845d..b6ce4d2bbd 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -456,6 +456,10 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) event = DLG_EVENT_RPL3xx; next_state_dlg( dlg, event, &old_state, &new_state, &unref); + if(new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { + /* set end time */ + dlg->end_ts = (unsigned int)(time(0)); + } if(dlg_run_event_route(dlg, (rpl==FAKED_REPLY)?NULL:rpl, old_state, new_state)<0) { /* dialog is gone */ @@ -530,11 +534,6 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) goto done; } - if(new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) { - /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); - } - if ( new_state==DLG_STATE_DELETED && (old_state==DLG_STATE_UNCONFIRMED || old_state==DLG_STATE_EARLY) ) { diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index e9b0af65ea..1f108f0f8a 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -232,7 +232,7 @@ int dlg_clean_run(ticks_t ti) while (dlg) { tdlg = dlg; dlg = dlg->next; - if(tdlg->state==DLG_STATE_UNCONFIRMED + if(tdlg->state==DLG_STATE_UNCONFIRMED && tdlg->init_ts>0 && tdlg->init_ts<tm-dlg_early_timeout) { /* dialog in early state older than 5min */ LM_NOTICE("dialog in early state is too old (%p ref %d)\n", @@ -240,7 +240,7 @@ int dlg_clean_run(ticks_t ti) unlink_unsafe_dlg(&d_table->entries[i], tdlg); destroy_dlg(tdlg); } - if(tdlg->state==DLG_STATE_CONFIRMED_NA + if(tdlg->state==DLG_STATE_CONFIRMED_NA && tdlg->start_ts>0 && tdlg->start_ts<tm-dlg_noack_timeout) { if(update_dlg_timer(&tdlg->tl, 10)<0) { LM_ERR("failed to update dialog lifetime in long non-ack state\n"); @@ -248,7 +248,8 @@ int dlg_clean_run(ticks_t ti) tdlg->lifetime = 10; tdlg->dflags |= DLG_FLAG_CHANGED; } - if(tdlg->state==DLG_STATE_DELETED && tdlg->end_ts<tm-300) { + if(tdlg->state==DLG_STATE_DELETED && tdlg->end_ts>0 + && tdlg->end_ts<tm-300) { /* dialog in deleted state older than 5min */ LM_NOTICE("dialog in delete state is too old (%p ref %d)\n", tdlg, tdlg->ref);

7 years

acc to db has stopped working

by Juha Heinanen

I noticed that accounting to database has stopped working. I don't know when it has happened, but at least I have the problem with master. My acc config is like this: modparam("acc", "db_url", "mysql://user:pass@127.0.0.1/sip_proxy_usage") modparam("acc", "db_flag", 7) modparam("acc", "failed_transaction_flag", 8) modparam("acc", "failed_filter", "407") modparam("acc", "db_table_acc", "accounting") modparam("acc", "acc_sip_code_column", "response_code") modparam("acc", "acc_sip_reason_column", "response_reason") modparam("acc", "db_insert_mode", 2) modparam("acc", "reason_from_hf", 1) If I change db_flag to log_flag, accounting to syslog works fine. With db_flag, nothing is inserted to db and no error are produced to syslog or mysql error.log. Has something changed in acc db config that I have not noticed? -- Juha

7 years

[kamailio/kamailio] dmq & dmq_usrloc : let server_address & notification_address use the same IP and port (#1109)

by 张顺通

if server_address & notification_address use same ip and different port(see below)，in dmq.list_nodes will have two node for one kamailio(one node for notify_server 5360 and one for dmq local 5260), question is when send REGISTER to port 5160, REGISTER will copy from port 5260 to 5360 on the same kamailio,this is not what i want. dmq & dmq_usrloc cfg(**different port**): listen=eth0:5160 listen=eth0:5260 listen=eth0:5360 modparam("dmq", "server_address", "sip:10.6.1.200:5260") modparam("dmq", "notification_address", "sip:10.6.1.200:5360") modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 2) # ----- dmq_usrloc params ----- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_msg_contacts", 50) modparam("dmq_usrloc", "batch_msg_size", 500000) And when I let server_address & notification_address use same IP & Port, check in function add_server_and_notify will report error("error adding notification node"),child_init will return failed. So I suggest that the following changes, let server_address & notification_address can use the same IP and port： @@ -315,11 +315,15 @@ dmq_node_t* add_server_and_notify(str *paddr) for (index = 0; index < host_cnt; index++) { pstr->s = puri_list [index]; pstr->len = strlen (puri_list [index]); - if (!find_dmq_node_uri(node_list, pstr)) { // check for duplicates + if (!(pnode = find_dmq_node_uri(node_list, pstr))) { // check for duplicates pnode = add_dmq_node (node_list, pstr); if (pnode && !pfirst) { pfirst = pnode; } - } + } else { + if (!pfirst) { + pfirst = pnode; + } + } } } After Such A change, dmq.list_nodes will only have on node for (notify_server & server_addr(local)). Is there any problem with this modification? Thanks $./sbin/kamailio -v version: kamailio 5.0.1 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. -- 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/1109

7 years

[kamailio/kamailio] dmq: let server_address & notification_address can use the same IP and port (#1308)

by 张顺通

#### 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 issue : https://github.com/kamailio/kamailio/issues/1109 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1308 -- Commit Summary -- * dmq: let server_address & notification_address can use the same IP and port #1109 -- File Changes -- M src/modules/dmq/notification_peer.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1308.patch https://github.com/kamailio/kamailio/pull/1308.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/1308

7 years

git:5.0:c94fbc25: dmq_usrloc: include server_id in replicated contacts

by Charles Chance

Module: kamailio Branch: 5.0 Commit: c94fbc25cb5394114611b3360c306387f082fcf1 URL: https://github.com/kamailio/kamailio/commit/c94fbc25cb5394114611b3360c30638… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-09T15:28:02Z dmq_usrloc: include server_id in replicated contacts --- Modified: src/modules/dmq_usrloc/usrloc_sync.c --- Diff: https://github.com/kamailio/kamailio/commit/c94fbc25cb5394114611b3360c30638… Patch: https://github.com/kamailio/kamailio/commit/c94fbc25cb5394114611b3360c30638… --- diff --git a/src/modules/dmq_usrloc/usrloc_sync.c b/src/modules/dmq_usrloc/usrloc_sync.c index 1ef1382cc5..96000ccafc 100644 --- a/src/modules/dmq_usrloc/usrloc_sync.c +++ b/src/modules/dmq_usrloc/usrloc_sync.c @@ -318,12 +318,12 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* static ucontact_info_t ci; unsigned int action, expires, cseq, flags, cflags, q, last_modified, - methods, reg_id; + methods, reg_id, server_id; str aor=STR_NULL, ruid=STR_NULL, c=STR_NULL, received=STR_NULL, path=STR_NULL, callid=STR_NULL, user_agent=STR_NULL, instance=STR_NULL; action = expires = cseq = flags = cflags = q = last_modified - = methods = reg_id = 0; + = methods = reg_id = server_id = 0; srjson_InitDoc(&jdoc, NULL); if(parse_from_header(msg)<0) { @@ -412,6 +412,8 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* methods = SRJSON_GET_UINT(it); } else if (strcmp(it->string, "reg_id")==0) { reg_id = SRJSON_GET_UINT(it); + } else if (strcmp(it->string, "server_id")==0) { + server_id = SRJSON_GET_UINT(it); } else { LM_ERR("unrecognized field in json object\n"); } @@ -432,6 +434,7 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* ci.methods = methods; ci.instance = instance; ci.reg_id = reg_id; + ci.server_id = server_id; ci.tcpconn_id = -1; ci.last_modified = last_modified; @@ -548,6 +551,7 @@ int usrloc_dmq_send_contact(ucontact_t* ptr, str aor, int action, dmq_node_t* no srjson_AddNumberToObject(&jdoc, jdoc.root, "last_modified", ptr->last_modified); srjson_AddNumberToObject(&jdoc, jdoc.root, "methods", ptr->methods); srjson_AddNumberToObject(&jdoc, jdoc.root, "reg_id", ptr->reg_id); + srjson_AddNumberToObject(&jdoc, jdoc.root, "server_id", ptr->server_id); jdoc.buf.s = srjson_PrintUnformatted(&jdoc, jdoc.root); if(jdoc.buf.s==NULL) {

7 years

git:5.0:93d063ba: usrloc: add more attributes to the result of ul.dump

by Charles Chance

Module: kamailio Branch: 5.0 Commit: 93d063ba0d278a609c714a62ddbeec33162099b4 URL: https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec3… Author: shuntongzhang <shuntongzhang(a)gmail.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2017-11-09T15:16:01Z usrloc: add more attributes to the result of ul.dump (cherry picked from commit a57465ff47d46fb5d64c692a72f42767598adbb4) --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec3… Patch: https://github.com/kamailio/kamailio/commit/93d063ba0d278a609c714a62ddbeec3… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 7411be6b93..6133db8acd 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -180,14 +180,29 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding reg_id"); return -1; } + if(rpc->struct_add(vh, "d", "Server-Id", c->server_id)<0) + { + rpc->fault(ctx, 500, "Internal error adding server_id"); + return -1; + } + if(rpc->struct_add(vh, "d", "Tcpconn-Id", c->tcpconn_id)<0) + { + rpc->fault(ctx, 500, "Internal error adding tcpconn_id"); + return -1; + } + if(rpc->struct_add(vh, "d", "Keepalive", c->keepalive)<0) + { + rpc->fault(ctx, 500, "Internal error adding keepalive"); + return -1; + } if(rpc->struct_add(vh, "d", "Last-Keepalive", (int)c->last_keepalive)<0) { - rpc->fault(ctx, 500, "Internal error adding reg_id"); + rpc->fault(ctx, 500, "Internal error adding last_keepalive"); return -1; } if(rpc->struct_add(vh, "d", "Last-Modified", (int)c->last_modified)<0) { - rpc->fault(ctx, 500, "Internal error adding reg_id"); + rpc->fault(ctx, 500, "Internal error adding last_modified"); return -1; } return 0;

7 years

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

by Charles Chance

Thanks -- 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

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

by Daniel-Constantin Mierla

Yes. -- 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

← Newer
1
...
35
36
37
38
39
40
41
...
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