- sr-dev - kamailio.org

git:5.2:696e5981: ims_charging: initialize ro_forced_peer variable
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 696e5981bdb791f4662076a42687a2087d33b605 URL: https://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:38:56Z ims_charging: initialize ro_forced_peer variable (cherry picked from commit 7cae3e5e0df27bf3481cbf0680bf86902359a97c) --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… Patch: https://github.com/kamailio/kamailio/commit/696e5981bdb791f4662076a42687a20… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index fd65f98683..150a525884 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -76,7 +76,7 @@ struct tm_binds tmb; /* Only used if we want to force the Ro peer usually this is configured at a stack level and the first request uses realm routing */ //char* rx_forced_peer_s = ""; -str ro_forced_peer; +str ro_forced_peer = str_init(""); int ro_auth_expiry = 7200; int cdp_event_latency = 1; /*flag: report slow processing of CDP callback events or not - default enabled */ int cdp_event_threshold = 500; /*time in ms above which we should report slow processing of CDP callback event - default 500ms*/

1 0

git:5.2:32c110ce: cdp: better compatiblity with certain Diameter servers
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 32c110cea12f3653b4d110d307e17df42bd79b6a URL: https://github.com/kamailio/kamailio/commit/32c110cea12f3653b4d110d307e17df… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:38:56Z cdp: better compatiblity with certain Diameter servers - better compatiblity with certain Diameter servers - some Diameter servers do not include Supported-Vendor-Id AVP in their reply - assume in this case that the server will support our proposed applications (cherry picked from commit 1a462ed4cffddd5f691b33adb859c286a0c074df) --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/32c110cea12f3653b4d110d307e17df… Patch: https://github.com/kamailio/kamailio/commit/32c110cea12f3653b4d110d307e17df… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index ed49a3ad30..b83654bf1d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -678,7 +678,8 @@ void add_peer_application(peer *p, int id, int vendor, app_type type) p->applications[p->applications_cnt].id = id; p->applications[p->applications_cnt].vendor = vendor; p->applications[p->applications_cnt].type = type; - LM_DBG("Application %i of maximum %i\n", p->applications_cnt, p->applications_max); + LM_DBG("Application number %i with id %d and vendor %d added, maximum %i\n", + p->applications_cnt, id, vendor, p->applications_max); p->applications_cnt++; } @@ -715,6 +716,12 @@ void save_peer_applications(peer *p,AAAMessage *msg) supported_vendor_id_avp_cnt = count_Supported_Vendor_Id_AVPS(msg); + if (supported_vendor_id_avp_cnt == 0) { + LM_INFO("No Supported-Vendor-Id AVP found, assuming compability with %d vendor(s) from our CER msg\n", + config->supported_vendors_cnt); + supported_vendor_id_avp_cnt = 1; + } + for(avp=msg->avpList.head;avp;avp = avp->next) switch (avp->code){ @@ -728,6 +735,8 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt+=2;/* wasteful, but let's skip decoding */ break; } + LM_DBG("Total count of applications is %d\n", total_cnt); + p->applications_cnt = 0; p->applications = shm_malloc(sizeof(app_config)*total_cnt); p->applications_max = total_cnt; @@ -745,7 +754,6 @@ void save_peer_applications(peer *p,AAAMessage *msg) add_peer_application(p,id,0,DP_AUTHORIZATION); avp_vendor = AAAFindMatchingAVP(msg,0,AVP_Supported_Vendor_Id,0,0); while (avp_vendor) { - vendor = get_4bytes(avp_vendor->data.s); LM_DBG("Found Supported Vendor for Application %i: %i\n", DP_AUTHORIZATION, vendor); add_peer_application(p,id,vendor,DP_AUTHORIZATION);

1 0

git:master:7cae3e5e: ims_charging: initialize ro_forced_peer variable
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 7cae3e5e0df27bf3481cbf0680bf86902359a97c URL: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:31:13Z ims_charging: initialize ro_forced_peer variable --- Modified: src/modules/ims_charging/ims_charging_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… Patch: https://github.com/kamailio/kamailio/commit/7cae3e5e0df27bf3481cbf0680bf869… --- diff --git a/src/modules/ims_charging/ims_charging_mod.c b/src/modules/ims_charging/ims_charging_mod.c index fd65f98683..150a525884 100644 --- a/src/modules/ims_charging/ims_charging_mod.c +++ b/src/modules/ims_charging/ims_charging_mod.c @@ -76,7 +76,7 @@ struct tm_binds tmb; /* Only used if we want to force the Ro peer usually this is configured at a stack level and the first request uses realm routing */ //char* rx_forced_peer_s = ""; -str ro_forced_peer; +str ro_forced_peer = str_init(""); int ro_auth_expiry = 7200; int cdp_event_latency = 1; /*flag: report slow processing of CDP callback events or not - default enabled */ int cdp_event_threshold = 500; /*time in ms above which we should report slow processing of CDP callback event - default 500ms*/

1 0

git:master:1a462ed4: cdp: better compatiblity with certain Diameter servers
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 1a462ed4cffddd5f691b33adb859c286a0c074df URL: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T15:36:48Z cdp: better compatiblity with certain Diameter servers - better compatiblity with certain Diameter servers - some Diameter servers do not include Supported-Vendor-Id AVP in their reply - assume in this case that the server will support our proposed applications --- Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… Patch: https://github.com/kamailio/kamailio/commit/1a462ed4cffddd5f691b33adb859c28… --- diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index ed49a3ad30..b83654bf1d 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -678,7 +678,8 @@ void add_peer_application(peer *p, int id, int vendor, app_type type) p->applications[p->applications_cnt].id = id; p->applications[p->applications_cnt].vendor = vendor; p->applications[p->applications_cnt].type = type; - LM_DBG("Application %i of maximum %i\n", p->applications_cnt, p->applications_max); + LM_DBG("Application number %i with id %d and vendor %d added, maximum %i\n", + p->applications_cnt, id, vendor, p->applications_max); p->applications_cnt++; } @@ -715,6 +716,12 @@ void save_peer_applications(peer *p,AAAMessage *msg) supported_vendor_id_avp_cnt = count_Supported_Vendor_Id_AVPS(msg); + if (supported_vendor_id_avp_cnt == 0) { + LM_INFO("No Supported-Vendor-Id AVP found, assuming compability with %d vendor(s) from our CER msg\n", + config->supported_vendors_cnt); + supported_vendor_id_avp_cnt = 1; + } + for(avp=msg->avpList.head;avp;avp = avp->next) switch (avp->code){ @@ -728,6 +735,8 @@ void save_peer_applications(peer *p,AAAMessage *msg) total_cnt+=2;/* wasteful, but let's skip decoding */ break; } + LM_DBG("Total count of applications is %d\n", total_cnt); + p->applications_cnt = 0; p->applications = shm_malloc(sizeof(app_config)*total_cnt); p->applications_max = total_cnt; @@ -745,7 +754,6 @@ void save_peer_applications(peer *p,AAAMessage *msg) add_peer_application(p,id,0,DP_AUTHORIZATION); avp_vendor = AAAFindMatchingAVP(msg,0,AVP_Supported_Vendor_Id,0,0); while (avp_vendor) { - vendor = get_4bytes(avp_vendor->data.s); LM_DBG("Found Supported Vendor for Application %i: %i\n", DP_AUTHORIZATION, vendor); add_peer_application(p,id,vendor,DP_AUTHORIZATION);

1 0

git:5.2:ade49058: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: ade490584600be4715ea7a6fd93ba9fbcdce5be8 URL: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:23Z ims_charging: fix missing line-breaks for log messages (cherry picked from commit 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e) --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f… Patch: https://github.com/kamailio/kamailio/commit/ade490584600be4715ea7a6fd93ba9f…

1 0

git:5.2:25940655: cdp: add missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.2 Commit: 25940655eebdb3a3b50aee01f29b23701d71d538 URL: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:23Z cdp: add missing line-breaks for log messages (cherry picked from commit 32a0d8073eb1b7f01190d305d318b43268811be8) --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… Patch: https://github.com/kamailio/kamailio/commit/25940655eebdb3a3b50aee01f29b237… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 4e9272980f..a0c5f26ad8 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -40,7 +40,7 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) AAA_AVP *mscc_avp = mscc_avp_list.head; while (mscc_avp != NULL ) { - LM_DBG("MSCC AVP code is [%i] and data length is [%i]", mscc_avp->code, mscc_avp->data.len); + LM_DBG("MSCC AVP code is [%i] and data length is [%i]\n", mscc_avp->code, mscc_avp->data.len); switch (mscc_avp->code) { case AVP_Granted_Service_Unit: y = AAAUngroupAVPS(mscc_avp->data); diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 5d26605c70..ed49a3ad30 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -695,7 +695,7 @@ int count_Supported_Vendor_Id_AVPS(AAAMessage *msg) break; avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); } - LM_DBG("Found %i Supported_Vendor AVPS", avp_vendor_cnt); + LM_DBG("Found %i Supported_Vendor AVPS\n", avp_vendor_cnt); return avp_vendor_cnt; } diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index c33554457a..5aed0a36f4 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -396,7 +396,7 @@ static int receive_fd(int pipe_fd, int* fd,peer **p) *fd = *tmp; }else{ if(!cmsg) - LM_ERR("receive_fd: no descriptor passed, empty control message"); + LM_ERR("receive_fd: no descriptor passed, empty control message\n"); else LM_ERR("receive_fd: no descriptor passed, cmsg=%p," "len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); @@ -768,7 +768,7 @@ int receive_loop(peer *original_peer) } LM_DBG("select_recv(): Send pipe says [%p] %d\n",msg,cnt); if (sp->tcp_socket<0){ - LM_ERR("select_recv(): got a signal to send something, but the connection was not opened"); + LM_ERR("select_recv(): got a signal to send something, but the connection was not opened\n"); } else { while( (cnt=write(sp->tcp_socket,msg->buf.s,msg->buf.len))==-1 ) { if (errno==EINTR) @@ -883,7 +883,7 @@ int peer_connect(peer *p) /* try to set the local socket used to connect to the peer */ if (p->src_addr.s && p->src_addr.len > 0) { - LM_DBG("peer_connect(): connetting to peer via src addr=%.*s",p->src_addr.len, p->src_addr.s); + LM_DBG("peer_connect(): connecting to peer via src addr=%.*s\n",p->src_addr.len, p->src_addr.s); memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; hints.ai_socktype = SOCK_STREAM; diff --git a/src/modules/cdp/worker.c b/src/modules/cdp/worker.c index 30d7a1b0fe..64ba70679f 100644 --- a/src/modules/cdp/worker.c +++ b/src/modules/cdp/worker.c @@ -258,11 +258,11 @@ int put_task(peer *p, AAAMessage *msg) { length_percentage = num_tasks/tasks->max*100; if(length_percentage > workerq_length_threshold_percentage) { LM_WARN("Queue length has exceeded length threshold percentage" - " [%i] and is length [%i]", length_percentage, num_tasks); + " [%i] and is length [%i]\n", length_percentage, num_tasks); } } //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Added task to task queue. Queue length [%i]", num_tasks); + //LM_ERR("Added task to task queue. Queue length [%i]\n", num_tasks); return 1; @@ -300,7 +300,7 @@ task_t take_task() { lock_release(tasks->lock); //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Taken task from task queue. Queue length [%i]", num_tasks); + //LM_ERR("Taken task from task queue. Queue length [%i]\n", num_tasks); return t;

1 0

git:5.3:5284b907: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.3 Commit: 5284b907357aa0dab0aa8eb655eeac81a7af60e9 URL: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:04Z ims_charging: fix missing line-breaks for log messages (cherry picked from commit 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e) --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8… Patch: https://github.com/kamailio/kamailio/commit/5284b907357aa0dab0aa8eb655eeac8…

1 0

git:5.3:ccf7347e: cdp: add missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: 5.3 Commit: ccf7347e9f756b36e5baa65d93dab520098d3993 URL: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:52:04Z cdp: add missing line-breaks for log messages (cherry picked from commit 32a0d8073eb1b7f01190d305d318b43268811be8) --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… Patch: https://github.com/kamailio/kamailio/commit/ccf7347e9f756b36e5baa65d93dab52… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 4e9272980f..a0c5f26ad8 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -40,7 +40,7 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) AAA_AVP *mscc_avp = mscc_avp_list.head; while (mscc_avp != NULL ) { - LM_DBG("MSCC AVP code is [%i] and data length is [%i]", mscc_avp->code, mscc_avp->data.len); + LM_DBG("MSCC AVP code is [%i] and data length is [%i]\n", mscc_avp->code, mscc_avp->data.len); switch (mscc_avp->code) { case AVP_Granted_Service_Unit: y = AAAUngroupAVPS(mscc_avp->data); diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 5d26605c70..ed49a3ad30 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -695,7 +695,7 @@ int count_Supported_Vendor_Id_AVPS(AAAMessage *msg) break; avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); } - LM_DBG("Found %i Supported_Vendor AVPS", avp_vendor_cnt); + LM_DBG("Found %i Supported_Vendor AVPS\n", avp_vendor_cnt); return avp_vendor_cnt; } diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index c33554457a..5aed0a36f4 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -396,7 +396,7 @@ static int receive_fd(int pipe_fd, int* fd,peer **p) *fd = *tmp; }else{ if(!cmsg) - LM_ERR("receive_fd: no descriptor passed, empty control message"); + LM_ERR("receive_fd: no descriptor passed, empty control message\n"); else LM_ERR("receive_fd: no descriptor passed, cmsg=%p," "len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); @@ -768,7 +768,7 @@ int receive_loop(peer *original_peer) } LM_DBG("select_recv(): Send pipe says [%p] %d\n",msg,cnt); if (sp->tcp_socket<0){ - LM_ERR("select_recv(): got a signal to send something, but the connection was not opened"); + LM_ERR("select_recv(): got a signal to send something, but the connection was not opened\n"); } else { while( (cnt=write(sp->tcp_socket,msg->buf.s,msg->buf.len))==-1 ) { if (errno==EINTR) @@ -883,7 +883,7 @@ int peer_connect(peer *p) /* try to set the local socket used to connect to the peer */ if (p->src_addr.s && p->src_addr.len > 0) { - LM_DBG("peer_connect(): connetting to peer via src addr=%.*s",p->src_addr.len, p->src_addr.s); + LM_DBG("peer_connect(): connecting to peer via src addr=%.*s\n",p->src_addr.len, p->src_addr.s); memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; hints.ai_socktype = SOCK_STREAM; diff --git a/src/modules/cdp/worker.c b/src/modules/cdp/worker.c index 30d7a1b0fe..64ba70679f 100644 --- a/src/modules/cdp/worker.c +++ b/src/modules/cdp/worker.c @@ -258,11 +258,11 @@ int put_task(peer *p, AAAMessage *msg) { length_percentage = num_tasks/tasks->max*100; if(length_percentage > workerq_length_threshold_percentage) { LM_WARN("Queue length has exceeded length threshold percentage" - " [%i] and is length [%i]", length_percentage, num_tasks); + " [%i] and is length [%i]\n", length_percentage, num_tasks); } } //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Added task to task queue. Queue length [%i]", num_tasks); + //LM_ERR("Added task to task queue. Queue length [%i]\n", num_tasks); return 1; @@ -300,7 +300,7 @@ task_t take_task() { lock_release(tasks->lock); //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Taken task from task queue. Queue length [%i]", num_tasks); + //LM_ERR("Taken task from task queue. Queue length [%i]\n", num_tasks); return t;

1 0

git:master:508786fc: ims_charging: fix missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 508786fcdbbc120215b3e7dd90d92ab40c3b1e4e URL: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:51:27Z ims_charging: fix missing line-breaks for log messages --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/dialog.c Modified: src/modules/ims_charging/diameter_ro.c Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ims_ro.c Modified: src/modules/ims_charging/ro_db_handler.c Modified: src/modules/ims_charging/ro_session_hash.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab… Patch: https://github.com/kamailio/kamailio/commit/508786fcdbbc120215b3e7dd90d92ab…

1 0

git:master:32a0d807: cdp: add missing line-breaks for log messages
by Henning Westerholt 10 Jun '20

10 Jun '20

Module: kamailio Branch: master Commit: 32a0d8073eb1b7f01190d305d318b43268811be8 URL: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-10T11:51:27Z cdp: add missing line-breaks for log messages --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/peerstatemachine.c Modified: src/modules/cdp/receiver.c Modified: src/modules/cdp/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… Patch: https://github.com/kamailio/kamailio/commit/32a0d8073eb1b7f01190d305d318b43… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 4e9272980f..a0c5f26ad8 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -40,7 +40,7 @@ void update_gsu_response_timers(cdp_cc_acc_session_t* session, AAAMessage* msg) AAA_AVP *mscc_avp = mscc_avp_list.head; while (mscc_avp != NULL ) { - LM_DBG("MSCC AVP code is [%i] and data length is [%i]", mscc_avp->code, mscc_avp->data.len); + LM_DBG("MSCC AVP code is [%i] and data length is [%i]\n", mscc_avp->code, mscc_avp->data.len); switch (mscc_avp->code) { case AVP_Granted_Service_Unit: y = AAAUngroupAVPS(mscc_avp->data); diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 5d26605c70..ed49a3ad30 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -695,7 +695,7 @@ int count_Supported_Vendor_Id_AVPS(AAAMessage *msg) break; avp_vendor = AAAFindMatchingAVP(msg,avp_vendor->next,AVP_Supported_Vendor_Id,0,0); } - LM_DBG("Found %i Supported_Vendor AVPS", avp_vendor_cnt); + LM_DBG("Found %i Supported_Vendor AVPS\n", avp_vendor_cnt); return avp_vendor_cnt; } diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index c33554457a..5aed0a36f4 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -396,7 +396,7 @@ static int receive_fd(int pipe_fd, int* fd,peer **p) *fd = *tmp; }else{ if(!cmsg) - LM_ERR("receive_fd: no descriptor passed, empty control message"); + LM_ERR("receive_fd: no descriptor passed, empty control message\n"); else LM_ERR("receive_fd: no descriptor passed, cmsg=%p," "len=%d\n", cmsg, (unsigned)cmsg->cmsg_len); @@ -768,7 +768,7 @@ int receive_loop(peer *original_peer) } LM_DBG("select_recv(): Send pipe says [%p] %d\n",msg,cnt); if (sp->tcp_socket<0){ - LM_ERR("select_recv(): got a signal to send something, but the connection was not opened"); + LM_ERR("select_recv(): got a signal to send something, but the connection was not opened\n"); } else { while( (cnt=write(sp->tcp_socket,msg->buf.s,msg->buf.len))==-1 ) { if (errno==EINTR) @@ -883,7 +883,7 @@ int peer_connect(peer *p) /* try to set the local socket used to connect to the peer */ if (p->src_addr.s && p->src_addr.len > 0) { - LM_DBG("peer_connect(): connetting to peer via src addr=%.*s",p->src_addr.len, p->src_addr.s); + LM_DBG("peer_connect(): connecting to peer via src addr=%.*s\n",p->src_addr.len, p->src_addr.s); memset (&hints, 0, sizeof(hints)); hints.ai_flags = AI_NUMERICHOST; hints.ai_socktype = SOCK_STREAM; diff --git a/src/modules/cdp/worker.c b/src/modules/cdp/worker.c index 30d7a1b0fe..64ba70679f 100644 --- a/src/modules/cdp/worker.c +++ b/src/modules/cdp/worker.c @@ -258,11 +258,11 @@ int put_task(peer *p, AAAMessage *msg) { length_percentage = num_tasks/tasks->max*100; if(length_percentage > workerq_length_threshold_percentage) { LM_WARN("Queue length has exceeded length threshold percentage" - " [%i] and is length [%i]", length_percentage, num_tasks); + " [%i] and is length [%i]\n", length_percentage, num_tasks); } } //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Added task to task queue. Queue length [%i]", num_tasks); + //LM_ERR("Added task to task queue. Queue length [%i]\n", num_tasks); return 1; @@ -300,7 +300,7 @@ task_t take_task() { lock_release(tasks->lock); //int num_tasks = tasks->end - tasks->start; - //LM_ERR("Taken task from task queue. Queue length [%i]", num_tasks); + //LM_ERR("Taken task from task queue. Queue length [%i]\n", num_tasks); return t;

1 0

git:master:97593d20: sipdump: make month in the file name from 1 to 12
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: 97593d20875d26c38511f564fd7071bf79baa56b URL: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T20:02:21+02:00 sipdump: make month in the file name from 1 to 12 - tm_mon is from 0-11 --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… Patch: https://github.com/kamailio/kamailio/commit/97593d20875d26c38511f564fd7071b… --- diff --git a/src/modules/sipdump/sipdump_write.c b/src/modules/sipdump/sipdump_write.c index 29face97c4..6730d4f602 100644 --- a/src/modules/sipdump/sipdump_write.c +++ b/src/modules/sipdump/sipdump_write.c @@ -202,7 +202,7 @@ static int sipdump_rotate_file(void) n = snprintf(_sipdump_fpath+_sipdump_fpath_prefix.len, SIPDUMP_FPATH_SIZE-_sipdump_fpath_prefix.len, "%d-%02d-%02d--%02d-%02d-%02d.data", - 1900+ti.tm_year, ti.tm_mon, ti.tm_mday, + 1900+ti.tm_year, ti.tm_mon+1, ti.tm_mday, ti.tm_hour, ti.tm_min, ti.tm_sec); LM_DBG("writing to file: %s (%d)\n", _sipdump_fpath, n); _sipdump_file = fopen( _sipdump_fpath, "w" );

1 0

missing SAR messages
by Georgi Rosenov Stefanov 09 Jun '20

09 Jun '20

I expect to 2000 of xlog("L_ERR", "GEORGI pcscf_save_pending"); on each try no matter how many registrations/sec I do

1 0

git:5.3:249d558c: pkg/docker: updated alpine docker packaging submodule
by Sergey Safarov 09 Jun '20

09 Jun '20

Module: kamailio Branch: 5.3 Commit: 249d558c0e3ae0c0e24d508d2e7a9c2853078a8f URL: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-09T14:02:50+03:00 pkg/docker: updated alpine docker packaging submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… Patch: https://github.com/kamailio/kamailio/commit/249d558c0e3ae0c0e24d508d2e7a9c2… --- diff --git a/pkg/docker b/pkg/docker index a6955b1834..9fa73e31e6 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit a6955b1834dbd3180bbc1cc256ba8aac0269739b +Subproject commit 9fa73e31e6b636148c57a1270692eb8bb967ee77

1 0

[kamailio/kamailio] Intermittent failed assertion in app_python3 (#2335)
by Alex Balashov 09 Jun '20

09 Jun '20

Submitting this on behalf of Jacob Greene, who posted a day or two ago: https://lists.kamailio.org/pipermail/sr-users/2020-May/109315.html Version in production is Debian 9 and Kamailio 5.3.4 from Debian packages: ``` ii kamailio 5.3.4+bpo9 amd64 very fast, dynamic and configurable SIP server ii kamailio-postgres-modules:amd64 5.3.4+bpo9 amd64 PostgreSQL database connectivity module for the Kamailio SIP server ii kamailio-presence-modules:amd64 5.3.4+bpo9 amd64 SIP presence modules for Kamailio ii kamailio-python3-modules:amd64 5.3.4+bpo9 amd64 The app_python3 module for the Kamailio SIP server rc kamailio-xml-modules:amd64 5.2.6+stretch amd64 XML based extensions for Kamailio's Management Interface ``` Anyway, a Kamailio child process periodically exits -- about ten times a day -- with a `SIGABRT` set off by a failed assertion somewhere inside the `app_python3` bureaucracy: ``` (gdb) where #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 #1 0x00007f2c2f76042a in __GI_abort () at abort.c:89 #2 0x00007f2c2f757e67 in __assert_fail_base (fmt=<optimized out>, assertion=assertion@entry=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=file@entry=0x7f2c2892bd9c "apy_kemi.c", line=line@entry=1819, function=function@entry=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:92 #3 0x00007f2c2f757f12 in __GI___assert_fail (assertion=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=0x7f2c2892bd9c "apy_kemi.c", line=1819, function=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:101 #4 0x00007f2c2890bd57 in sr_apy_kemi_exec_func () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #5 0x00007f2c288d525c in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #6 0x00007f2c282ad259 in PyCFunction_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #7 0x00007f2c283de739 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #8 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #9 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #10 0x00007f2c283dcadf in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #11 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #12 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #13 0x00007f2c284a0153 in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #14 0x00007f2c28333558 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #15 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #16 0x00007f2c2845b95c in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #17 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #18 0x00007f2c2849eb77 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 #19 0x00007f2c2891c136 in apy_exec () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #20 0x00007f2c288dfe94 in sr_kemi_config_engine_python () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so #21 0x0000558ec29ba7b4 in sr_kemi_route () #22 0x0000558ec2ab7c03 in receive_msg () #23 0x0000558ec2997e4a in udp_rcv_loop () #24 0x0000558ec28de718 in main_loop () #25 0x0000558ec28e7a39 in main () ``` The fuller backtrace for the top few frames: ``` Thread 1 (Thread 0x7f2c3031db40 (LWP 26211)): #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:51 set = {__val = {0, 140720998929208, 139827752272384, 139827751795724, 140724530937856, 94071669029552, 94071669029653, 94071669029552, 94071669029552, 94071669029661, 94071669029852, 94071669029552, 94071669029852, 0, 0, 0}} pid = <optimized out> tid = <optimized out> #1 0x00007f2c2f76042a in __GI_abort () at abort.c:89 save_stage = 2 act = {__sigaction_handler = {sa_handler = 0x558ec469d990, sa_sigaction = 0x558ec469d990}, sa_mask = {__val = { 139827751803746, 140720998929248, 109, 139827755099200, 1819, 139827635998896, 139827635638836, 139827752272384, 139827751811289, 139827755115808, 139827751803256, 139827752815328, 139827752801040, 94071641717939, 139827763892224, 139827635994024}}, sa_flags = 1819, sa_restorer = 0x7f2c2892d0b0} sigs = {__val = {32, 0 <repeats 15 times>}} #2 0x00007f2c2f757e67 in __assert_fail_base (fmt=<optimized out>, assertion=assertion@entry=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=file@entry=0x7f2c2892bd9c "apy_kemi.c", line=line@entry=1819, function=function@entry=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:92 str = 0x558ec466a760 "" total = 4096 #3 0x00007f2c2f757f12 in __GI___assert_fail (assertion=0x7f2c2892bda8 "PyBytes_Check(pframe->f_code->co_name)", file=0x7f2c2892bd9c "apy_kemi.c", line=1819, function=0x7f2c2892d0b0 "sr_apy_kemi_exec_func") at assert.c:101 No locals. #4 0x00007f2c2890bd57 in sr_apy_kemi_exec_func () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #5 0x00007f2c288d525c in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #6 0x00007f2c282ad259 in PyCFunction_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #7 0x00007f2c283de739 in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #8 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #9 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #10 0x00007f2c283dcadf in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #11 0x00007f2c283de6ad in PyEval_EvalFrameEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #12 0x00007f2c284a0074 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #13 0x00007f2c284a0153 in PyEval_EvalCodeEx () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #14 0x00007f2c28333558 in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #15 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #16 0x00007f2c2845b95c in ?? () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #17 0x00007f2c2840fa37 in PyObject_Call () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #18 0x00007f2c2849eb77 in PyEval_CallObjectWithKeywords () from /usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0 No symbol table info available. #19 0x00007f2c2891c136 in apy_exec () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #20 0x00007f2c288dfe94 in sr_kemi_config_engine_python () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_python3.so No symbol table info available. #21 0x0000558ec29ba7b4 in sr_kemi_route () No symbol table info available. #22 0x0000558ec2ab7c03 in receive_msg () No symbol table info available. #23 0x0000558ec2997e4a in udp_rcv_loop () No symbol table info available. #24 0x0000558ec28de718 in main_loop () No symbol table info available. #25 0x0000558ec28e7a39 in main () No symbol table info available. ``` For what it's worth, line 1819 in `apy_kemi.c` in the latest 5.3 `HEAD` (which I'm not sure this binary package reflects) is: ``` 1801 if(unlikely(cfg_get(core, core_cfg, latency_limit_action)>0) 1802 && is_printable(cfg_get(core, core_cfg, latency_log))) { 1803 gettimeofday(&tve, &tz); 1804 tdiff = (tve.tv_sec - tvb.tv_sec) * 1000000 1805 + (tve.tv_usec - tvb.tv_usec); 1806 if(tdiff >= cfg_get(core, core_cfg, latency_limit_action)) { 1807 pstate = PyThreadState_GET(); 1808 if (pstate != NULL && pstate->frame != NULL) { 1809 pframe = pstate->frame; 1810 } 1811 1812 LOG(cfg_get(core, core_cfg, latency_log), 1813 "alert - action KSR.%s%s%s(...)" 1814 " took too long [%u ms] (file:%s func:%s line:%d)\n", 1815 (ket->mname.len>0)?ket->mname.s:"", 1816 (ket->mname.len>0)?".":"", ket->fname.s, tdiff, 1817 (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", 1818 (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", 1819 (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); 1820 } 1821 } 1822 1823 return ret; 1824 } 1825 ``` That's inside `sr_apy_kemi_exec_func()`. Some suspicion falls upon this Python function: ``` def set_send_socket(self): KSR.info('[socket] forced_socket is: {}'.format(KSR.pv.get('$fs'))) if KSR.pv.get('$fs'): KSR.info('[socket] socket already set') return elif not self.is_local(): KSR.info('[socket] set socket to 5065') KSR.corex.set_send_socket(MY_IP + ':5065') else: KSR.info('[socket] set socket to 5060') KSR.corex.set_send_socket(MY_IP + ':5060') KSR.info('[socket] socket set') ``` ... simply because the last message out of KEMI which appears prior to the crash is one of its log emissions ... ``` May 21 18:20:25 proxy1 /usr/sbin/kamailio[26210]: INFO: 1697311439-5060-88(a)BA.CFC.EH.IF - {NOTIFY}: <core> [core/kemi.c:104]: sr_kemi_core_info(): domain exists result: None May 21 18:20:25 proxy1 /usr/sbin/kamailio[26211]: INFO: 1361696919-5060-39(a)BA.CFC.EH.BFC - {NOTIFY}: <core> [core/kemi.c:104]: sr_kemi_core_info(): [socket] forced_socket is: None May 21 18:20:25 proxy1 /usr/sbin/kamailio[26213]: INFO: 813204231-5060-53(a)BA.BF.J.CBF - {NOTIFY}: <core> [core/receive.c:518]: receive_msg(): reply-route executed in: 260 usec May 21 18:20:25 proxy1 /usr/sbin/kamailio[26212]: INFO: 1941306664-5060-17(a)BA.CFC.EH.CAG - {NOTIFY}: <core> [core/receive.c:518]: receive_msg(): reply-route executed in: 412 usec May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: ALERT: <core> [main.c:766]: handle_sigs(): child process 26210 exited by a signal 6 May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: ALERT: <core> [main.c:769]: handle_sigs(): core was not generated May 21 18:20:25 proxy1 /usr/sbin/kamailio[26209]: INFO: <core> [main.c:792]: handle_sigs(): terminating due to SIGCHLD ``` However, it's hard to troubleshoot without debug symbols and due to the third-party binary libraries, of course. Furthermore, the problem is not possible to reproduce on demand, though its incidence does seem to correlate to higher call volumes. Would building from source to provide more flexibility be recommended at this stage? -- 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/2335

4 4

git:master:b02c2470: app_python: check if f_code field in frame is set before using in log message
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: b02c247023ea3ea0ef9753efdb04aff7d5d3bbb4 URL: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:53:22+02:00 app_python: check if f_code field in frame is set before using in log message --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… Patch: https://github.com/kamailio/kamailio/commit/b02c247023ea3ea0ef9753efdb04aff… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 5320b02155..43a47d28ad 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -1814,9 +1814,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u us] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyString_AsString(pframe->f_code->co_filename):"", - (pframe)?PyString_AsString(pframe->f_code->co_name):"", - (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + (pframe && pframe->f_code)?PyString_AsString(pframe->f_code->co_filename):"", + (pframe && pframe->f_code)?PyString_AsString(pframe->f_code->co_name):"", + (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:master:e680dd6e: app_python3: use safer function PyBytes_AsString() instead of macro
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: e680dd6ed672e63012e960c68c0030e3f188654b URL: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:49:22+02:00 app_python3: use safer function PyBytes_AsString() instead of macro - check if f_code filed in frame is set before using in log message - GH #2335 --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… Patch: https://github.com/kamailio/kamailio/commit/e680dd6ed672e63012e960c68c0030e… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 2c4d73eb72..7af949de6e 100644 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -1822,9 +1822,9 @@ PyObject *sr_apy_kemi_exec_func(PyObject *self, PyObject *args, int idx) " took too long [%u ms] (file:%s func:%s line:%d)\n", (ket->mname.len>0)?ket->mname.s:"", (ket->mname.len>0)?".":"", ket->fname.s, tdiff, - (pframe)?PyBytes_AS_STRING(pframe->f_code->co_filename):"", - (pframe)?PyBytes_AS_STRING(pframe->f_code->co_name):"", - (pframe)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); + (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_filename):"", + (pframe && pframe->f_code)?PyBytes_AsString(pframe->f_code->co_name):"", + (pframe && pframe->f_code)?PyCode_Addr2Line(pframe->f_code, pframe->f_lasti):0); } }

1 0

git:master:0607cd0b: kemix: function to get the body length
by Daniel-Constantin Mierla 09 Jun '20

09 Jun '20

Module: kamailio Branch: master Commit: 0607cd0b42ff2c692e8a096a73df41017449bde5 URL: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-09T10:44:24+02:00 kemix: function to get the body length --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… Patch: https://github.com/kamailio/kamailio/commit/0607cd0b42ff2c692e8a096a73df410… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index fdedda04be..4bd6f839d1 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -739,6 +739,30 @@ static sr_kemi_xval_t* ki_kx_getw_body(sip_msg_t *msg) return ki_kx_get_body_mode(msg, SR_KEMI_XVAL_NULL_PRINT); } +/** + * + */ +static int ki_kx_get_bodylen(sip_msg_t *msg) +{ + str s; + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + return 0; + } + + s.s = get_body(msg); + + if(s.s == NULL) { + return 0; + } + s.len = msg->buf + msg->len - s.s; + if(s.len <=0) { + return 0; + } + + return s.len; +} + /** * */ @@ -1116,6 +1140,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_bodylen"), + SR_KEMIP_INT, ki_kx_get_bodylen, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("kx"), str_init("get_timestamp"), SR_KEMIP_INT, ki_kx_get_timestamp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

Send large responses with tcp_send() results in full write queue
by Alex Hermann 09 Jun '20

09 Jun '20

Hi, I'm using tcp_send() to send responses to incoming RPC requests over TCP. This works fine when responses are small, but tends to fail on larger responses on somewhat slower links or clients (it fails whenever the links is not on the loopback interface, even on sub-ms RTT links). The error message thrown in the logs is: ERROR: <core> [core/tcp_main.c:618]: _wbufq_add(): (32007 bytes): write queue full or timeout (18042, total 18042, last write 0 s ago) I verified the error is due to a full buffer, not a timeout. I would like the tcp_send() not to fail on a full send buffer. Instead of failing, it should wait until there is enough space in the buffer again and send the data. Timeout should still be honoured though. >From the code this looks like a "feature", but I would classify this as a bug. The receiver is still receiving, the timeout is not hit but Kamailio just decides not to send any more data because its (by default small) buffer is full. If the buffer is full, it should wait until enough space becomes free again, not fail before the timeout triggers. The chunks of data that are sent via tcp_send() are always smaller than tcpconn_wq_max, so they should fit in an empty write buffer. I'd prefer not to increase tcpconn_wq_max as this will be a never ending story, the responses will keep growing over time. They're already in the 10's of MB at this time. Retrying tcp_send() is not an option. After the first failure, the connection is closed and there is no way for the server (Kamailio) to open a new connection to the RPC client. tcp_async is enabled, as that's needed/preferred for the SIP processing. Is there a way around the (full) write buffer for the caller of tcp_send()? -- Alex Hermann

3 3

git:5.3:ef221027: pdb: use memcpy() for PDB_BUFTOSHORT macro
by Daniel-Constantin Mierla 08 Jun '20

08 Jun '20

Module: kamailio Branch: 5.3 Commit: ef221027a448d77337225e376362b26b2618f050 URL: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-08T19:43:18+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 (cherry picked from commit be57be33d0e48d412ddab9801ee4d6d906329d70) --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… Patch: https://github.com/kamailio/kamailio/commit/ef221027a448d77337225e376362b26… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

1 0

[kamailio/kamailio] PDB return wrong values (#2345)
by Earn330 08 Jun '20

08 Jun '20

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data ### Possible Solutions  ### Additional Information ``` version: kamailio 5.3.4 (x86_64/linux) a35a2f-dirty flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: a35a2f -dirty compiled with gcc 4.9.2 ``` * **Operating System**: ``` Debian GNU/Linux 8 Linux voip-lab-proxy02 3.16.0-4-amd64 #1 SMP Debian 3.16.43-2+deb8u5 (2017-09-19) x86_64 GNU/Linux ``` -- 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/2345

3 5

[kamailio/kamailio] tools/kemi: add script to generate mock api for kemi python testing (#2350)
by tsearle 08 Jun '20

08 Jun '20

#### 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/2350 -- Commit Summary -- * tools/kemi: add script to generate mock api for kemi python testing -- File Changes -- A misc/tools/kemi/python_mock/README.md (24) A misc/tools/kemi/python_mock/kemi_mock.py (177) A misc/tools/kemi/python_mock/test.py (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2350.patch https://github.com/kamailio/kamailio/pull/2350.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/2350

4 5

ICMP port-unreachable for UDP INVITEs
by Sergey Safarov 08 Jun '20

08 Jun '20

HI. Could you help me understand this maillist message. https://lists.kamailio.org/pipermail/sr-dev/2020-April/056608.html Is that mean - on modern kernel with correct settings Kamailio, sendto() will fail after ICMP message and then Kamailio is able send INVITE to other destination? Sergey

2 1

git:master:f4ec9239: tools/kemi: add script to generate mock api for kemi python testing
by Henning Westerholt 08 Jun '20

08 Jun '20

Module: kamailio Branch: master Commit: f4ec923976cbab5c1451b65268aaca65a33919fd URL: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-08T17:39:41+02:00 tools/kemi: add script to generate mock api for kemi python testing --- Added: misc/tools/kemi/python_mock/README.md Added: misc/tools/kemi/python_mock/kemi_mock.py Added: misc/tools/kemi/python_mock/test.py --- Diff: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6… Patch: https://github.com/kamailio/kamailio/commit/f4ec923976cbab5c1451b65268aaca6…

1 0

git:master:2d2594d3: remove unused import
by Henning Westerholt 08 Jun '20

08 Jun '20

Module: kamailio Branch: master Commit: 2d2594d3cdeead550ccd472f9d0288b72b98d689 URL: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… Author: tsearle <tsearle(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-08T17:39:41+02:00 remove unused import --- Modified: misc/tools/kemi/python_mock/kemi_mock.py --- Diff: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… Patch: https://github.com/kamailio/kamailio/commit/2d2594d3cdeead550ccd472f9d0288b… --- diff --git a/misc/tools/kemi/python_mock/kemi_mock.py b/misc/tools/kemi/python_mock/kemi_mock.py index 4717c5057e..aa96fadfd9 100755 --- a/misc/tools/kemi/python_mock/kemi_mock.py +++ b/misc/tools/kemi/python_mock/kemi_mock.py @@ -6,7 +6,6 @@ import json import sys -import os from collections import defaultdict

1 0

missing SAR messages
by Georgi Rosenov Stefanov 08 Jun '20

08 Jun '20

These are my findings 2000 - 10/s(1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 2250 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 1124 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 1124 2000 - 10/s(2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 2250 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 1125 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 1125 2000 - 100/s (1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 323 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 160 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 160 2000 - 100/s (2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 323 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 160 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 160 2000 - 500/s (1 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 379 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 114 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 120 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 0 2000 - 500/s (2 try) /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save_pending"); #GEORGI 349 /usr/local/etc/kamailio/pcscf/route/register.cfg: xlog("L_ERR", "GEORGI pcscf_save"); #GEORGI 114 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI Not REGISTERED save pre_reg_sar_reply\n"); 0 /usr/local/etc/kamailio/scscf/kamailio.cfg: xlog("L_ERR", "GEORGI save reg_sar_replay\n"); 153

2 1

Removing Record-Route header
by Andrey Deykunov 08 Jun '20

08 Jun '20

Hi guys, I'm using Kamailio 5.3.1 in the AWS cloud. For this purpose I'm setting up a 'nat_public_ipaddr' in the 'advertise' feature: listen=tls:<%= @ipaddr %>:5061 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5061 listen=tcp:<%= @ipaddr %>:5060 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5060 listen=udp:<%= @ipaddr %>:5060 advertise <%= node['hpbx'][ 'nat_public_ipaddr'] %>:5060 When I need relaying an incoming message to one of our internal services (for example B2BUA, VMAIL etc) I'm setting up an internal address '@ipaddr' in the Via header instead of 'nat_public_ipaddr' : set_advertised_address("<%= @ipaddr %>"); set_advertised_port(5060); All works fine, but Kamailio adds a 'Record-Route' header containing 'nat_public_ipaddr' automatically into such messages. How can I remove this header or insert my internal address instead before relaying the message? Is it possible? Thanks, Andrey

2 2

git:master:120e87d4: app_jsdt: regenerated the static exports table
by Daniel-Constantin Mierla 07 Jun '20

07 Jun '20

Module: kamailio Branch: master Commit: 120e87d465c7093f24414718cd01fbda944a1a03 URL: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_jsdt: regenerated the static exports table --- Modified: src/modules/app_jsdt/app_jsdt_kemi_export.c Modified: src/modules/app_jsdt/app_jsdt_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd… Patch: https://github.com/kamailio/kamailio/commit/120e87d465c7093f24414718cd01fbd…

1 0

git:master:49e80dbe: app_squirrel: updated squirrel interpreter to latest git version
by Daniel-Constantin Mierla 07 Jun '20

07 Jun '20

Module: kamailio Branch: master Commit: 49e80dbe4b47f3252445fbad6e12d7150304f5a3 URL: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_squirrel: updated squirrel interpreter to latest git version --- Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp --- Diff: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… Patch: https://github.com/kamailio/kamailio/commit/49e80dbe4b47f3252445fbad6e12d71… --- diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp index 7f7599bbfb..919bd9e924 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp +++ b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdstring.cpp @@ -181,7 +181,7 @@ static SQInteger _string_printf(HSQUIRRELVM v) return -1; SQPRINTFUNCTION printfunc = sq_getprintfunc(v); - if(printfunc) printfunc(v,dest); + if(printfunc) printfunc(v,_SC("%s"),dest); return 0; } diff --git a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp index b008a44d5e..d326be1af9 100644 --- a/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp +++ b/src/modules/app_sqlang/squirrel/sqstdlib/sqstdsystem.cpp @@ -19,6 +19,10 @@ #define scremove remove #define screname rename #endif +#ifdef IOS + #include <spawn.h> + extern char **environ; +#endif static SQInteger _system_getenv(HSQUIRRELVM v) { @@ -30,18 +34,22 @@ static SQInteger _system_getenv(HSQUIRRELVM v) return 0; } - static SQInteger _system_system(HSQUIRRELVM v) { const SQChar *s; if(SQ_SUCCEEDED(sq_getstring(v,2,&s))){ - sq_pushinteger(v,scsystem(s)); + #ifdef IOS + pid_t pid; + posix_spawn(&pid, s, NULL, NULL, NULL, environ); + sq_pushinteger(v, 0); + #else + sq_pushinteger(v,scsystem(s)); + #endif return 1; } return sq_throwerror(v,_SC("wrong param")); } - static SQInteger _system_clock(HSQUIRRELVM v) { sq_pushfloat(v,((SQFloat)clock())/(SQFloat)CLOCKS_PER_SEC); diff --git a/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp b/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp index b39be72a77..dcf823d735 100644 --- a/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp +++ b/src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp @@ -671,7 +671,7 @@ bool SQVM::IsFalse(SQObjectPtr &o) #if !defined(SQUSEDOUBLE) || (defined(SQUSEDOUBLE) && defined(_SQ64)) || (_integer(o) == 0) ) //OT_NULL|OT_INTEGER|OT_BOOL #else - || (((type(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL + || (((sq_type(o) != OT_FLOAT) && (_integer(o) == 0))) ) //OT_NULL|OT_INTEGER|OT_BOOL #endif { return true; @@ -1605,6 +1605,7 @@ SQInteger prevstackbase = _stackbase; } break; default: + Raise_Error(_SC("attempt to call '%s'"), GetTypeName(closure)); return false; } #ifdef _DEBUG

1 0

git:master:cb55929b: app_jsdt: utils/app_jsdt_ctl - increase the static table size to 1536
by Daniel-Constantin Mierla 07 Jun '20

07 Jun '20

Module: kamailio Branch: master Commit: cb55929b8ce39aee2af193e59034e43af7a44781 URL: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-07T19:17:32+02:00 app_jsdt: utils/app_jsdt_ctl - increase the static table size to 1536 --- Modified: src/modules/app_jsdt/utils/app_jsdt_ctl --- Diff: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… Patch: https://github.com/kamailio/kamailio/commit/cb55929b8ce39aee2af193e59034e43… --- diff --git a/src/modules/app_jsdt/utils/app_jsdt_ctl b/src/modules/app_jsdt/utils/app_jsdt_ctl index 26e37aa4ca..ee859f1812 100755 --- a/src/modules/app_jsdt/utils/app_jsdt_ctl +++ b/src/modules/app_jsdt/utils/app_jsdt_ctl @@ -2,7 +2,7 @@ # generate the .h file -KEMI_MAX_SIZE=1024 +KEMI_MAX_SIZE=1536 cat > ../app_jsdt_kemi_export.h <<EOF /**

1 0

[kamailio/kamailio] acc: skip cdr generation for certain calls (#2348)
by Carlos Cruz Luengo 07 Jun '20

07 Jun '20

### Description I haven't found a way to skip CDR generation per call once [cdr_enable modparam](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.cdr… is enabled. ### Expected behavior I have implemented via irontec/kamailio@38964a31d6c0158b7c9bb3abb4e9eb72aa8cd960 adding a new modparam with the dlg_var name that will prevent CDR generation for calls with that dlg_var set. #### Actual observed behavior Once CDR generation is enabled with [cdr_enable modparam](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.cdr… all calls generate CDR. ### Additional Information I can make a PR adapting that patch and documenting new modparam, as long as there is no way of achieving it that I have missed and if you find it useful. Thank you and regards, -- 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/2348

2 2

[kamailio/kamailio] dispatcher: don't reset load table when adding/removing a destination… (#2342)
by Federico Cabiddu 07 Jun '20

07 Jun '20

… or reloading the list   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description When a destination is added/removed or the whole list is reloaded, the calls that are being routed to another destination will fail. This because ds_load_replace is returning an error not finding in the table the entry for the call being rerouted. Another side effect of this is that when adding/removing destinations the actual load of the endpoints will be wrong since the current calls will never be deleted. I've removed the calls to ds_clean_slots and modified ds_load_replace to not exit when the old destination is not found (the endpoint could have been removed after the failover list had been created) and to return a new error code (-2) when the new destination is not found (for the same reason). Finally I've modified ds_update_dst to skip the current selected destination and select the next if ds_load_replace returns -2. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2342 -- Commit Summary -- * dispatcher: don't reset load table when adding/removing a destination or reloading the list -- File Changes -- M src/modules/dispatcher/dispatch.c (37) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2342.patch https://github.com/kamailio/kamailio/pull/2342.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/2342

3 4

git:5.3:88676c2f: dispatcher: don't reset load table when adding/removing a destination or reloading the list
by Henning Westerholt 07 Jun '20

07 Jun '20

Module: kamailio Branch: 5.3 Commit: 88676c2f083c2d7e52ae6b42f5cbe83f64357865 URL: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:13:21Z dispatcher: don't reset load table when adding/removing a destination or reloading the list (cherry picked from commit 4099a6caf856c9af4d7d89aec73db143efbcd40b) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… Patch: https://github.com/kamailio/kamailio/commit/88676c2f083c2d7e52ae6b42f5cbe83… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 36cf884b48..d66a48e919 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -870,7 +870,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1118,7 +1118,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1609,22 +1608,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2317,6 +2318,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2329,6 +2331,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2376,12 +2379,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2432,7 +2441,7 @@ int ds_add_dst(int group, str *address, int flags) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2487,7 +2496,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

1 0

git:5.3:ac47ce90: dispatcher: sync on load management operations
by Henning Westerholt 07 Jun '20

07 Jun '20

Module: kamailio Branch: 5.3 Commit: ac47ce9019616ffda2d206f42fbecb142a5fc55d URL: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:13:14Z dispatcher: sync on load management operations - use locks to increment/decrement call load and get least loaded dst - GH #2322 (cherry picked from commit d14833d9d1ad6cc92c65e279b7dd89b3b922f129) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… Patch: https://github.com/kamailio/kamailio/commit/ac47ce9019616ffda2d206f42fbecb1… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index aaa7b4a2d5..36cf884b48 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,22 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 +/* increment call load */ +#define DS_LOAD_INC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + (dgrp)->dlist[didx].dload++; \ + lock_release(&(dgrp)->lock); \ + } while(0) + +/* decrement call load */ +#define DS_LOAD_DEC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + if(likely((dgrp)->dlist[didx].dload > 0)) { \ + (dgrp)->dlist[didx].dload--; \ + } \ + lock_release(&(dgrp)->lock); \ + } while(0) + static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; @@ -1506,6 +1522,7 @@ int ds_get_leastloaded(ds_set_t *dset) k = -1; t = 0x7fffffff; /* high load */ + lock_get(&dset->lock); \ for(j = 0; j < dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) && (dset->dlist[j].attrs.maxload == 0 @@ -1517,6 +1534,7 @@ int ds_get_leastloaded(ds_set_t *dset) } } } + lock_release(&dset->lock); \ return k; } @@ -1538,7 +1556,7 @@ int ds_load_add(struct sip_msg *msg, ds_set_t *dset, int setid, int dst) msg->callid->body.s); return -1; } - dset->dlist[dst].dload++; + DS_LOAD_INC(dset, dst); return 0; } @@ -1606,8 +1624,7 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -1646,8 +1663,7 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); return 0; }

1 0

git:5.2:c9ad77e7: dispatcher: don't reset load table when adding/removing a destination or reloading the list
by Henning Westerholt 07 Jun '20

07 Jun '20

Module: kamailio Branch: 5.2 Commit: c9ad77e7d0ff7fb6ff4b9763cdea9b84f5ba739e URL: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:20:48Z dispatcher: don't reset load table when adding/removing a destination or reloading the list - manual backport from 4099a6caf856c9a --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… Patch: https://github.com/kamailio/kamailio/commit/c9ad77e7d0ff7fb6ff4b9763cdea9b8… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 4561649ebc..77294c7782 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -851,7 +851,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1096,7 +1096,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1587,22 +1586,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2310,6 +2311,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2322,6 +2324,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2369,12 +2372,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; }

1 0

git:5.2:75fdcec6: dispatcher: sync on load management operations
by Henning Westerholt 07 Jun '20

07 Jun '20

Module: kamailio Branch: 5.2 Commit: 75fdcec6241fc4439805f7781114d1f44cbe2528 URL: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-07T09:16:04Z dispatcher: sync on load management operations - use locks to increment/decrement call load and get least loaded dst - GH #2322 - manual backport of d14833d9d1a --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… Patch: https://github.com/kamailio/kamailio/commit/75fdcec6241fc4439805f7781114d1f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 71bbb6239f..4561649ebc 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,22 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 +/* increment call load */ +#define DS_LOAD_INC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + (dgrp)->dlist[didx].dload++; \ + lock_release(&(dgrp)->lock); \ + } while(0) + +/* decrement call load */ +#define DS_LOAD_DEC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + if(likely((dgrp)->dlist[didx].dload > 0)) { \ + (dgrp)->dlist[didx].dload--; \ + } \ + lock_release(&(dgrp)->lock); \ + } while(0) + static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; @@ -1484,6 +1500,7 @@ int ds_get_leastloaded(ds_set_t *dset) k = -1; t = 0x7fffffff; /* high load */ + lock_get(&dset->lock); \ for(j = 0; j < dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) && (dset->dlist[j].attrs.maxload == 0 @@ -1495,6 +1512,7 @@ int ds_get_leastloaded(ds_set_t *dset) } } } + lock_release(&dset->lock); \ return k; } @@ -1516,7 +1534,7 @@ int ds_load_add(struct sip_msg *msg, ds_set_t *dset, int setid, int dst) msg->callid->body.s); return -1; } - dset->dlist[dst].dload++; + DS_LOAD_INC(dset, dst); return 0; } @@ -1584,8 +1602,7 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -1673,8 +1690,7 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); return 0; }

1 0

git:5.2:50f60972: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.2 Commit: 50f60972abbde849c3e637cece7b08777ff3a515 URL: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T19:46:32+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… Patch: https://github.com/kamailio/kamailio/commit/50f60972abbde849c3e637cece7b087… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 69b4fb247d..d7c1a25a5f 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -424,7 +424,8 @@ modparam("siptrace", "trace_delayed", 1) The local interface in the form of SIP URI from where to send the duplicated traffic. In the absence of this parameter Kamailio - automatically picks an interface. + automatically picks an interface. This parameter is only used for HEP + forwarding, not for SIP forwarding mode. Example 1.17. Set force_send_sock parameter ...

1 0

git:5.2:144aeaa5: siptrace: extend docs that force_send_socket parameter is only used for HEP mode
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.2 Commit: 144aeaa5fd7392f5ebcb4e601c3a23d5f7ba86fe URL: https://github.com/kamailio/kamailio/commit/144aeaa5fd7392f5ebcb4e601c3a23d… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T17:35:44Z siptrace: extend docs that force_send_socket parameter is only used for HEP mode (cherry picked from commit 1b27855539f42f5dece0232c90ee0857ca012ebd) --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/144aeaa5fd7392f5ebcb4e601c3a23d… Patch: https://github.com/kamailio/kamailio/commit/144aeaa5fd7392f5ebcb4e601c3a23d… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 0359b0c1c8..f81cf2cc74 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -462,7 +462,8 @@ modparam("siptrace", "trace_delayed", 1) <para> The local interface in the form of SIP URI from where to send the duplicated traffic. In the absence of this parameter - &kamailio; automatically picks an interface. + &kamailio; automatically picks an interface. This parameter is + only used for HEP forwarding, not for SIP forwarding mode. </para> <example> <title>Set <varname>force_send_sock</varname> parameter</title>

1 0

git:5.3:0dd7f9e9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 0dd7f9e939c2cc54b338a1432847622f7c4e385f URL: https://github.com/kamailio/kamailio/commit/0dd7f9e939c2cc54b338a1432847622… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T19:31:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/0dd7f9e939c2cc54b338a1432847622… Patch: https://github.com/kamailio/kamailio/commit/0dd7f9e939c2cc54b338a1432847622… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index df5b99f7cc..65a3226c89 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -427,7 +427,8 @@ modparam("siptrace", "trace_delayed", 1) The local interface in the form of SIP URI from where to send the duplicated traffic. In the absence of this parameter Kamailio - automatically picks an interface. + automatically picks an interface. This parameter is only used for HEP + forwarding, not for SIP forwarding mode. Example 1.17. Set force_send_sock parameter ...

1 0

git:5.3:1b278555: siptrace: extend docs that force_send_socket parameter is only used for HEP mode
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 1b27855539f42f5dece0232c90ee0857ca012ebd URL: https://github.com/kamailio/kamailio/commit/1b27855539f42f5dece0232c90ee085… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T17:29:59Z siptrace: extend docs that force_send_socket parameter is only used for HEP mode --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1b27855539f42f5dece0232c90ee085… Patch: https://github.com/kamailio/kamailio/commit/1b27855539f42f5dece0232c90ee085… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index f5be1c663c..57c4b2a8ae 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -455,7 +455,8 @@ modparam("siptrace", "trace_delayed", 1) <para> The local interface in the form of SIP URI from where to send the duplicated traffic. In the absence of this parameter - &kamailio; automatically picks an interface. + &kamailio; automatically picks an interface. This parameter is + only used for HEP forwarding, not for SIP forwarding mode. </para> <example> <title>Set <varname>force_send_sock</varname> parameter</title>

1 0

git:master:c44ccd0e: modules: readme files regenerated - pv_headers ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: c44ccd0e66715f33620ddfc93cfeeb4dcc65a5fc URL: https://github.com/kamailio/kamailio/commit/c44ccd0e66715f33620ddfc93cfeeb4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T19:01:14+02:00 modules: readme files regenerated - pv_headers ... [skip ci] --- Modified: src/modules/pv_headers/README --- Diff: https://github.com/kamailio/kamailio/commit/c44ccd0e66715f33620ddfc93cfeeb4… Patch: https://github.com/kamailio/kamailio/commit/c44ccd0e66715f33620ddfc93cfeeb4… --- diff --git a/src/modules/pv_headers/README b/src/modules/pv_headers/README index ec6e766ba5..828c7d1a13 100644 --- a/src/modules/pv_headers/README +++ b/src/modules/pv_headers/README @@ -27,7 +27,7 @@ Victor Seva 3. Parameters - 3.1. xavp_name (string) + 3.1. xavi_name (string) 3.2. header_value_size (int) 3.3. header_collect_flag (int) 3.4. header_apply_flag (int) @@ -49,7 +49,7 @@ Victor Seva List of Examples - 1.1. Set xavp_name parameter + 1.1. Set xavi_name parameter 1.2. Set header_value_size parameter 1.3. Set header_collect_flag parameter 1.4. Set header_apply_flag parameter @@ -69,7 +69,7 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. xavp_name (string) + 3.1. xavi_name (string) 3.2. header_value_size (int) 3.3. header_collect_flag (int) 3.4. header_apply_flag (int) @@ -92,7 +92,7 @@ Chapter 1. Admin Guide 1. Overview The main goal of the module is to offload the intermediate header - processing into the XAVP dynamic container as well as provide with high + processing into the XAVI dynamic container as well as provide with high level methods and pseudovariables to simplify SIP message header modifications. @@ -116,7 +116,7 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. xavp_name (string) + 3.1. xavi_name (string) 3.2. header_value_size (int) 3.3. header_collect_flag (int) 3.4. header_apply_flag (int) @@ -124,19 +124,19 @@ Chapter 1. Admin Guide 3.6. split_headers (string) 3.7. auto_msg (int) -3.1. xavp_name (string) +3.1. xavi_name (string) - Name of the XAVP there the collected headers are stored. + Name of the XAVI where the collected headers are stored. Default value is “headers”. - Example 1.1. Set xavp_name parameter + Example 1.1. Set xavi_name parameter ... -modparam("pv_headers", "xavp_name", "pvh") +modparam("pv_headers", "xavi_name", "headers") ... - Result: $xavp(headers[0]=>From) $xavp(headers[0]=>To) - $xavp(headers[0]=>Call-ID) + Result: $xavi(headers[0]=>From) $xavi(headers[0]=>To) + $xavi(headers[0]=>Call-ID) 3.2. header_value_size (int) @@ -228,7 +228,7 @@ modparam("pv_headers", "split_headers", "Diversion") Example 1.7. Set auto_msg parameter ... -modparam("pvh", "auto_msg", 1) +modparam("pv_headers", "auto_msg", 1) ... 4. Functions

1 0

git:master:3b1f5b9c: pv_headers: migrate to $xavi
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 3b1f5b9c89846d6ffc67acb9eca376d0f424b5ca URL: https://github.com/kamailio/kamailio/commit/3b1f5b9c89846d6ffc67acb9eca376d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T18:54:04+02:00 pv_headers: migrate to $xavi * $x_hdr(HEADER) is case insensitive now as it should be * rework pvh_set_header(): use core pv_get_spec_* use PV_IDX_NONE to detect no index case remove values instead of adding NULL if PV_IDX_ALL --- Modified: src/modules/pv_headers/doc/params.xml Modified: src/modules/pv_headers/doc/pv_headers_admin.xml Modified: src/modules/pv_headers/pv_headers.c Modified: src/modules/pv_headers/pv_headers.h Modified: src/modules/pv_headers/pvh_func.c Modified: src/modules/pv_headers/pvh_hash.c Modified: src/modules/pv_headers/pvh_xavp.c Modified: src/modules/pv_headers/pvh_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/3b1f5b9c89846d6ffc67acb9eca376d… Patch: https://github.com/kamailio/kamailio/commit/3b1f5b9c89846d6ffc67acb9eca376d…

1 0

[kamailio/kamailio] insert new timestamp to cdr table (#2349)
by mohsen 05 Jun '20

05 Jun '20

Hi I want to add a new culomn to acc table. I named it ring_time and in every call i put the ring time to it like this: `$dlg_var(ringtime) = $Ts;` then I add a extra column in config like this: `modparam("acc", "log_extra", "src_user=$fU;src_domain=$fd;src_ip=$si;" "dst_ouser=$tU;dst_user=$rU;dst_domain=$rd;ring_time=$dlg_var(ringtime)")` but when I try to test it always i get: `db_mysql [km_dbase.c:122]: db_mysql_submit_query(): driver error on query: Incorrect datetime value: '1591361996' for column `kamailio`.`acc`.`ring_time` at row 1 (1292) Jun 5 17:29:59 kamailio /usr/sbin/kamailio[22901]: ERROR: {2 102 INVITE 105a0f4a3d99a0a5558355e54b43f4e1@192.168.1.121:5060} <core> [db_query.c:244]: db_do_insert_cmd(): error while submitting query Jun 5 17:29:59 kamailio /usr/sbin/kamailio[22901]: ERROR: {2 102 INVITE 105a0f4a3d99a0a5558355e54b43f4e1@192.168.1.121:5060} acc [acc.c:477]: acc_db_request(): failed to insert into database` -- 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/2349

2 2

git:5.3:16a94677: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 16a94677a5aeaa499eaf09eab4cd057a720b3200 URL: https://github.com/kamailio/kamailio/commit/16a94677a5aeaa499eaf09eab4cd057… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T14:31:20+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/cnxcc/README --- Diff: https://github.com/kamailio/kamailio/commit/16a94677a5aeaa499eaf09eab4cd057… Patch: https://github.com/kamailio/kamailio/commit/16a94677a5aeaa499eaf09eab4cd057… --- diff --git a/src/modules/cnxcc/README b/src/modules/cnxcc/README index d2e317de72..425a473f16 100644 --- a/src/modules/cnxcc/README +++ b/src/modules/cnxcc/README @@ -188,18 +188,32 @@ modparam("cnxcc", "credit_check_period", 1) Associates the call with a customer id and sets the max credit, connect cost, cost per second, initial pulse and final pulse. The discount is - calculated in pulses (30/6, 1/1, etc) and subtracted from the pool of + calculated in pulses (1/1, 60/1, etc) and subtracted from the pool of credit. The customer value can be provided as a string or a variable holding a - string. + string. This value identifies all calls from the same customer. + + The maxcredit (float) value is the maximum credit available for the + current call. + + The connect (float) value is the connect cost for the current call. + + The cps (float) value is the cost per second for the current call. + + The ipuse (integer) value is the initial pulse and establishes the + minimum time to be charged. For example, value 1 establishes a charge + per second and value 60 sets a charge per minute. If it is taken as + value 60, even if the duration is 5 seconds, 1 minute will be charged. - The maxcredit, connect and cps can be double (float) or integer values, - they have to be provided as static string values of variables holding - string values. + The fpulse (integer) value is the final pulse and establishes, from the + initial pulse, the time range to be charged. For example, the value 1 + establishes a charge per second, 5 sets a charge in blocks of 5 + seconds, 60 sets a full minute charge. - The ipulse and fpulse values are integer values, they can be also given - via variables holding integers. + 1/1 will make a charge per seconds for the entire call. 60/1 will make + a charge per seconds with the first full minute. 60/60 always perform a + full minute charge. Return code: * 1 - successful @@ -210,12 +224,15 @@ modparam("cnxcc", "credit_check_period", 1) ... cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(connect) = "3.0"; # connect const -$var(cps) = "0.5"; # cost per second -$var(initial_p) = 60; # initial pulse -$var(final_p) = 1; # final pulse +$var(customer) = "john-doe"; # customer id +$var(credit) = "100"; # max credit for all calls with the same + # customer id +$var(connect) = "3.0"; # connect cost or initial cost for the call +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse (60 = the first minute will be + # charged even if the call is shorter) +$var(final_p) = 1; # final pulse (after the first minute, it will + # be charge in ranges of 1 second) cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); ...

1 0

git:5.3:c1b9bf21: cnxcc: minor changes
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: c1b9bf212829f89702fd34cf62c493060d7c5616 URL: https://github.com/kamailio/kamailio/commit/c1b9bf212829f89702fd34cf62c4930… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:21:01+02:00 cnxcc: minor changes * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * use localtime_r() for a safer multi-thread usage * replaced deprecated STR_PARAM with PARAM_STR * clean includes * clang-format (cherry picked from commit e98457faf2098ca2f16a831a4a68d2a26e301b0a) --- Modified: src/modules/cnxcc/cnxcc.c Modified: src/modules/cnxcc/cnxcc.h Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_redis.c Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/cnxcc_rpc.h Modified: src/modules/cnxcc/cnxcc_select.c Modified: src/modules/cnxcc/cnxcc_select.h Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h --- Diff: https://github.com/kamailio/kamailio/commit/c1b9bf212829f89702fd34cf62c4930… Patch: https://github.com/kamailio/kamailio/commit/c1b9bf212829f89702fd34cf62c4930…

1 0

git:5.3:dd9b9df9: cnxcc: don't terminate non confirmed calls
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: dd9b9df93f33819f64831ea7f4a801a2b1b6c50b URL: https://github.com/kamailio/kamailio/commit/dd9b9df93f33819f64831ea7f4a801a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:21:35+02:00 cnxcc: don't terminate non confirmed calls * non confirmed calls can't be terminated via dialog.terminate_dlg() API * set call.max_amount to 0 to terminate the call if gets confirmed fix #2346 (cherry picked from commit ca0fc18e1cfad86ed6b7530d6c520b680e5d6a4f) --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dd9b9df93f33819f64831ea7f4a801a… Patch: https://github.com/kamailio/kamailio/commit/dd9b9df93f33819f64831ea7f4a801a…

1 0

git:5.3:fca18567: cnxcc: updated readme file [skip ci]
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: fca18567f458fd3860a63ab37a9e7e2fe89f0019 URL: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… Author: Jose Luis Verdeguer <pepeluxx(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:19:48+02:00 cnxcc: updated readme file [skip ci] (cherry picked from commit cea7fa14b0aefc647d28eb1bf56faaec89d90d67) --- Modified: src/modules/cnxcc/doc/cnxcc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… Patch: https://github.com/kamailio/kamailio/commit/fca18567f458fd3860a63ab37a9e7e2… --- diff --git a/src/modules/cnxcc/doc/cnxcc_admin.xml b/src/modules/cnxcc/doc/cnxcc_admin.xml index 4284437a8b..0c26cb0a58 100644 --- a/src/modules/cnxcc/doc/cnxcc_admin.xml +++ b/src/modules/cnxcc/doc/cnxcc_admin.xml @@ -128,21 +128,37 @@ modparam("cnxcc", "credit_check_period", 1) <para> Associates the call with a customer id and sets the max credit, connect cost, cost per second, initial pulse and final pulse. The discount - is calculated in pulses (30/6, 1/1, etc) and subtracted from the pool + is calculated in pulses (1/1, 60/1, etc) and subtracted from the pool of credit. </para> <para> The customer value can be provided as a string or a variable holding - a string. + a string. This value identifies all calls from the same customer. + </para> + <para> + The maxcredit (float) value is the maximum credit available for the current call. + </para> + <para> + The connect (float) value is the connect cost for the current call. + </para> + <para> + The cps (float) value is the cost per second for the current call. + </para> + <para> + The ipuse (integer) value is the initial pulse and establishes the minimum + time to be charged. For example, value 1 establishes a charge per second + and value 60 sets a charge per minute. If it is taken as value 60, even + if the duration is 5 seconds, 1 minute will be charged. </para> <para> - The maxcredit, connect and cps can be double (float) or integer values, they - have to be provided as static string values of variables holding string - values. + The fpulse (integer) value is the final pulse and establishes, from the initial + pulse, the time range to be charged. For example, the value 1 establishes a charge + per second, 5 sets a charge in blocks of 5 seconds, 60 sets a full minute charge. </para> <para> - The ipulse and fpulse values are integer values, they can be also - given via variables holding integers. + 1/1 will make a charge per seconds for the entire call. 60/1 will make a + charge per seconds with the first full minute. 60/60 always perform + a full minute charge. </para> <para> <emphasis>Return code:</emphasis> @@ -173,12 +189,15 @@ modparam("cnxcc", "credit_check_period", 1) ... cnxcc_set_max_credit("john-doe", "100", "3.0", "0.5", 60, 1); ... -$var(customer) = "john-doe-premium"; # customer id -$var(credit) = "100"; # max credit -$var(connect) = "3.0"; # connect const -$var(cps) = "0.5"; # cost per second -$var(initial_p) = 60; # initial pulse -$var(final_p) = 1; # final pulse +$var(customer) = "john-doe"; # customer id +$var(credit) = "100"; # max credit for all calls with the same + # customer id +$var(connect) = "3.0"; # connect cost or initial cost for the call +$var(cps) = "0.5"; # cost per second +$var(initial_p) = 60; # initial pulse (60 = the first minute will be + # charged even if the call is shorter) +$var(final_p) = 1; # final pulse (after the first minute, it will + # be charge in ranges of 1 second) cnxcc_set_max_credit("$var(customer)", "$var(credit)", "$var(connect)", "$var(cps)", "$var(initial_p)", "$var(final_p)"); ...

1 0

git:5.3:daecf049: cnxcc: use snprintf() instead of sprintf()
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: daecf0490c144a6f3fd5c66c53a86f33b6295681 URL: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T14:17:17+02:00 cnxcc: use snprintf() instead of sprintf() (cherry picked from commit 05bd956a9980ffc8938cdbce6bab3af5086350dd) --- Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c --- Diff: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… Patch: https://github.com/kamailio/kamailio/commit/daecf0490c144a6f3fd5c66c53a86f3… --- diff --git a/src/modules/cnxcc/cnxcc_sip_msg_faker.c b/src/modules/cnxcc/cnxcc_sip_msg_faker.c index 7b601d537a..dbb8694f6a 100644 --- a/src/modules/cnxcc/cnxcc_sip_msg_faker.c +++ b/src/modules/cnxcc/cnxcc_sip_msg_faker.c @@ -40,7 +40,7 @@ int faked_msg_init_with_dlg_info(str *callid, str *from_uri, str *from_tag, { memset(_faked_sip_msg_buf, 0, FAKED_SIP_MSG_BUF_LEN); - sprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_FORMAT, from_uri->len, + snprintf(_faked_sip_msg_buf, FAKED_SIP_MSG_BUF_LEN, FAKED_SIP_MSG_FORMAT, from_uri->len, from_uri->s, from_tag->len, from_tag->s, to_uri->len, to_uri->s, to_tag->len, to_tag->s, callid->len, callid->s);

1 0

git:master:8e2c2e39: Merge pull request #2342 from kamailio/grumvalski/ds_load_table
by GitHub 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 8e2c2e391eb90f53b0fdc3e108bb84dab4e11593 URL: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-06-05T13:28:33+02:00 Merge pull request #2342 from kamailio/grumvalski/ds_load_table dispatcher: don't reset load table when adding/removing a destinationâ¦ --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… Patch: https://github.com/kamailio/kamailio/commit/8e2c2e391eb90f53b0fdc3e108bb84d… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d859dc3907..f481cb4d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -878,7 +878,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1126,7 +1126,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1617,22 +1616,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2336,6 +2337,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2348,6 +2350,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2395,12 +2398,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2448,7 +2457,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2503,7 +2512,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

1 0

git:master:4099a6ca: dispatcher: don't reset load table when adding/removing a destination or reloading the list
by Federico Cabiddu 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 4099a6caf856c9af4d7d89aec73db143efbcd40b URL: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-06-01T07:30:14+02:00 dispatcher: don't reset load table when adding/removing a destination or reloading the list --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… Patch: https://github.com/kamailio/kamailio/commit/4099a6caf856c9af4d7d89aec73db14… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d859dc3907..f481cb4d61 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -878,7 +878,7 @@ int ds_load_list(char *lfile) /* Update list - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -1126,7 +1126,6 @@ int ds_load_db(void) /* update data - should it be sync'ed? */ _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); ds_log_sets(); @@ -1617,22 +1616,24 @@ int ds_load_replace(struct sip_msg *msg, str *duid) break; } } + /* old destination has not been found: has been removed meanwhile? */ if(olddst == -1) { - ds_unlock_cell(_dsht_load, &msg->callid->body); - LM_ERR("old destination address not found for [%d, %.*s]\n", set, + LM_WARN("old destination address not found for [%d, %.*s]\n", set, it->duid.len, it->duid.s); - return -1; - } + } if(newdst == -1) { + /* new destination has not been found: has been removed meanwhile? */ ds_unlock_cell(_dsht_load, &msg->callid->body); LM_ERR("new destination address not found for [%d, %.*s]\n", set, duid->len, duid->s); - return -1; + return -2; } ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - DS_LOAD_DEC(idx, olddst); + + if(olddst != -1) + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -2336,6 +2337,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) int ds_update_dst(struct sip_msg *msg, int upos, int mode) { + int ret; socket_info_t *sock = NULL; sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; @@ -2348,6 +2350,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } } +next_dst: rxavp = xavp_get(&ds_xavp_dst, NULL); if(rxavp == NULL || rxavp->val.type != SR_XTYPE_XAVP) { LM_DBG("no xavp with previous destination record\n"); @@ -2395,12 +2398,18 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) return 1; } if(upos == DS_USE_NEXT) { - if(ds_load_replace(msg, &lxavp->val.v.s) < 0) { - LM_ERR("cannot update load distribution\n"); - return -1; + ret = ds_load_replace(msg, &lxavp->val.v.s); + switch(ret) { + case 0: + break; + case -2: + LM_ERR("cannot update load with %.*s, skipping dst.\n", lxavp->val.v.s.len, lxavp->val.v.s.s); + goto next_dst; + default: + LM_ERR("cannot update load distribution\n"); + return -1; } } - return 1; } @@ -2448,7 +2457,7 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0; @@ -2503,7 +2512,7 @@ int ds_remove_dst(int group, str *address) _ds_list_nr = setn; *crt_idx = *next_idx; - ds_ht_clear_slots(_dsht_load); + ds_log_sets(); return 0;

1 0

git:5.3:a41dcf32: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: a41dcf3259d72dfecf4cd34638d885734dc7a5ea URL: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T12:31:49+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… Patch: https://github.com/kamailio/kamailio/commit/a41dcf3259d72dfecf4cd34638d8857… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 5eab39eb23..df5b99f7cc 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -472,8 +472,10 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to - it. Based on mode, one can trace the current message('m' - default), - the current transaction('t') or the current dialog('d'). + it. Based on mode, one can trace the current message('m'), the current + transaction('t') or the current dialog('d'). If no mode is given, it + falls back to the default mode - transaction tracking when trace_flag + is set, otherwise only the current message. Meaning of the parameters is as follows: * address - The address in form of SIP URI where to send a duplicate @@ -564,13 +566,13 @@ kamcmd siptrace.status check 6. Database setup - Before running Kamailio with siptrace, you have to setup the database - tables where the module will store the data. For that, if the table - were not created by the installation script or you choose to install - everything by yourself you can use the siptrace-create.sql SQL script - in the database directories in the kamailio/scripts folder as template. - You can also find the complete database documentation on the project - webpage, + Before running Kamailio with siptrace and activated trace_to_database + parameter, you have to setup the database tables where the module will + store the data. For that, if the table were not created by the + installation script or you choose to install everything by yourself you + can use the siptrace-create.sql SQL script in the database directories + in the kamailio/scripts folder as template. You can also find the + complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. 7. Known issues

1 0

git:master:a118641a: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: a118641af8fb6bdd288e97c17b12076db6442ef9 URL: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-05T12:31:22+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… Patch: https://github.com/kamailio/kamailio/commit/a118641af8fb6bdd288e97c17b12076… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index 9006415a23..d9130a312e 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -551,8 +551,10 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to - it. Based on mode, one can trace the current message('m' - default), - the current transaction('t') or the current dialog('d'). + it. Based on mode, one can trace the current message('m'), the current + transaction('t') or the current dialog('d'). If no mode is given, it + falls back to the default mode - transaction tracking when trace_flag + is set, otherwise only the current message. Meaning of the parameters is as follows: * address - The address in form of SIP URI where to send a duplicate @@ -643,13 +645,13 @@ kamcmd siptrace.status check 6. Database setup - Before running Kamailio with siptrace, you have to setup the database - tables where the module will store the data. For that, if the table - were not created by the installation script or you choose to install - everything by yourself you can use the siptrace-create.sql SQL script - in the database directories in the kamailio/scripts folder as template. - You can also find the complete database documentation on the project - webpage, + Before running Kamailio with siptrace and activated trace_to_database + parameter, you have to setup the database tables where the module will + store the data. For that, if the table were not created by the + installation script or you choose to install everything by yourself you + can use the siptrace-create.sql SQL script in the database directories + in the kamailio/scripts folder as template. You can also find the + complete database documentation on the project webpage, https://www.kamailio.org/docs/db-tables/kamailio-db-devel.html. 7. Known issues

1 0

git:5.3:0f733090: siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode()
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 0f733090f69f88a153040e0051057bfd3a9a8404 URL: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:29:48Z siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - it was not working properly without destination uri in non-HEP mode (cherry picked from commit 21338195e74b09ccca29d6479e698417ed34cd42) --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… Patch: https://github.com/kamailio/kamailio/commit/0f733090f69f88a153040e0051057bf… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index e49946e525..161986d2cf 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -534,7 +534,8 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, trace_send_hep_duplicate( &sto->body, &sto->fromip, &sto->toip, dst, correlation_id_str); } else { - if(dst) { + /* sip_trace_mode() will not set a destination, uses duplicate_uri */ + if(dst || trace_to_database == 0) { trace_send_duplicate(sto->body.s, sto->body.len, dst); } } @@ -996,10 +997,13 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * dest_info_t dest_info; enum siptrace_type_t trace_type; - if (dest) { - if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { - LM_ERR("unable to parse the dest URI string\n"); - return -1; + /* to support tracing to database without destination parameter - old mode */ + if (dest || trace_to_database == 0) { + if (dest) { + if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { + LM_ERR("unable to parse the dest URI string\n"); + return -1; + } } if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) {

1 0

git:5.3:05a6f13c: siptrace: manual backport of 75e6e370ceb7, improve documentation for siptrace and DB setup
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: 5.3 Commit: 05a6f13c40249e0d658016652ae46b8512149857 URL: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:29:10Z siptrace: manual backport of 75e6e370ceb7, improve documentation for siptrace and DB setup --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… Patch: https://github.com/kamailio/kamailio/commit/05a6f13c40249e0d658016652ae46b8… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 6b3a1f49f8..f5be1c663c 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -522,7 +522,9 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") <para> Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to it. Based on mode, one can trace - the current message('m' - default), the current transaction('t') or the current dialog('d'). + the current message('m'), the current transaction('t') or the current dialog('d'). + If no mode is given, it falls back to the default mode - transaction tracking when + trace_flag is set, otherwise only the current message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -674,12 +676,12 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); <section> <title>Database setup</title> <para> - Before running &kamailio; with siptrace, you have to setup the database - tables where the module will store the data. For that, if the - table were not created by the installation script or you choose - to install everything by yourself you can use the siptrace-create.sql - <acronym>SQL</acronym> script in the database directories in the - kamailio/scripts folder as template. + Before running &kamailio; with siptrace and activated trace_to_database + parameter, you have to setup the database tables where the module will + store the data. For that, if the table were not created by the + installation script or you choose to install everything by yourself + you can use the siptrace-create.sql <acronym>SQL</acronym> script in + the database directories in the kamailio/scripts folder as template. You can also find the complete database documentation on the project webpage, &kamailiodbdocslink;. </para>

1 0

git:master:21338195: siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode()
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 21338195e74b09ccca29d6479e698417ed34cd42 URL: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:25:46Z siptrace: fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - fix regression introduced from 4e9a760123c for siptrace(), sip_trace_mode() - it was not working properly without destination uri in non-HEP mode --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… Patch: https://github.com/kamailio/kamailio/commit/21338195e74b09ccca29d6479e69841… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 6cc3471fcf..1368e954a6 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -562,7 +562,8 @@ static int sip_trace_store(siptrace_data_t *sto, dest_info_t *dst, trace_send_hep_duplicate( &sto->body, &sto->fromip, &sto->toip, dst, correlation_id_str); } else { - if(dst) { + /* sip_trace_mode() will not set a destination, uses duplicate_uri */ + if(dst || trace_to_database == 0) { trace_send_duplicate(sto->body.s, sto->body.len, dst); } } @@ -1070,10 +1071,13 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * dest_info_t dest_info; enum siptrace_type_t trace_type; - if (dest) { - if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { - LM_ERR("unable to parse the dest URI string\n"); - return -1; + /* to support tracing to database without destination parameter - old mode */ + if (dest || trace_to_database == 0) { + if (dest) { + if(fixup_get_svalue(msg, (gparam_t *)dest, &dup_uri_param_str) != 0) { + LM_ERR("unable to parse the dest URI string\n"); + return -1; + } } if (dup_uri_param_str.s == 0 || (is_null_pv(dup_uri_param_str))) {

1 0

git:master:75e6e370: siptrace: improve documentation about sip_trace and DB setup
by Henning Westerholt 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 75e6e370ceb701eabbdb2a1b7f12311ba0ae5024 URL: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-05T10:25:46Z siptrace: improve documentation about sip_trace and DB setup --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… Patch: https://github.com/kamailio/kamailio/commit/75e6e370ceb701eabbdb2a1b7f12311… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 5bd274a2f0..7d5b0d34ef 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -643,7 +643,9 @@ modparam("siptrace", "auth_key", "spoihepuirthpeuia") <para> Store or forward the current processed SIP message/transaction/dialog in database. It is stored in the form prior applying changes made to it. Based on mode, one can trace - the current message('m' - default), the current transaction('t') or the current dialog('d'). + the current message('m'), the current transaction('t') or the current dialog('d'). + If no mode is given, it falls back to the default mode - transaction tracking when + trace_flag is set, otherwise only the current message. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -795,12 +797,12 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID"); <section> <title>Database setup</title> <para> - Before running &kamailio; with siptrace, you have to setup the database - tables where the module will store the data. For that, if the - table were not created by the installation script or you choose - to install everything by yourself you can use the siptrace-create.sql - <acronym>SQL</acronym> script in the database directories in the - kamailio/scripts folder as template. + Before running &kamailio; with siptrace and activated trace_to_database + parameter, you have to setup the database tables where the module will + store the data. For that, if the table were not created by the + installation script or you choose to install everything by yourself + you can use the siptrace-create.sql <acronym>SQL</acronym> script in + the database directories in the kamailio/scripts folder as template. You can also find the complete database documentation on the project webpage, &kamailiodbdocslink;. </para>

1 0

[kamailio/kamailio] core: do not return connection if port does not match (#2307)
by Donato Sciarra 05 Jun '20

05 Jun '20

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description If kamailio is behind a NAT only return connection if port matches. We observed this issue on an instance after ~10h of operation. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2307 -- Commit Summary -- * core: do not return connection if port does not match -- File Changes -- M src/core/tcp_main.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2307.patch https://github.com/kamailio/kamailio/pull/2307.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/2307

2 7

[kamailio/kamailio] topos and 183 replies without Contact header (#2344)
by Barry Flanagan 05 Jun '20

05 Jun '20

Further to the changes made in https://github.com/kamailio/kamailio/issues/1720 I am opening a new ticket regarding https://github.com/kamailio/kamailio/issues/1720#issuecomment-638158699 It is my understanding that 1xx replies do not require a Contact header, but commit https://github.com/kamailio/kamailio/commit/3b586d554740ae578283024c1508e91… specifically excludes 183 replies from passing without a Contact header. This is causing us some issues and I am wondering why 183 is set to require the Contact header. 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/issues/2344

2 2

[kamailio/kamailio] 180 Ringing without Contact with TOPOS enabled (#1720)
by Sergey Basov 05 Jun '20

05 Jun '20

### Description Kamailio with TOPOS enabled acts as a proxy between SIP client and SBC. When client sends "180 Ringing" without Contact header - kamailio does not forward it to SBC. If Contact header exists in "180 Ringing" - all works as expected. ### Troubleshooting #### Reproduction Load and configure topos module Make call with "180 Ringing" without Contact header - kamailio will not forward it. #### Log Messages ``` ERROR: topos [tps_storage.c:340]: tps_storage_link_msg(): bad sip message or missing Contact hdr ``` #### SIP Traffic ``` SIP/2.0 180 Ringing Via: SIP/2.0/TLS 1.2.3.4:5061;branch=z9hG4bKef45.8c75f0bae8a59dfaec6ff533ff0f3b2d.0 From: <sip:1111@1.2.3.4:5061>;tag=02000879948559 To: <sip:2.2.2.2@5.6.7.8:5061;transport=tls;user=phone>;tag=SDbsq8499-y2pMOVV Call-ID: apdW7374315131g0bcGhEfDjFof CSeq: 988207425 INVITE User-Agent: agent Supported: replaces, outbound Content-Length: 0 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.6 (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 ``` * **Operating System**: ``` Red Hat Enterprise Linux Server 7.3 3.10.0-514.el7.x86_64 #1 SMP Wed Oct 19 11:24:13 EDT 2016 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/1720

5 19

git:master:785326cd: topos: allow 183 without contact header
by Daniel-Constantin Mierla 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 785326cdfbee849a8436e7c07003ff0539d259cd URL: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-05T09:47:32+02:00 topos: allow 183 without contact header - some UAs do not add it, even it can create the session for PRACK, which requires it --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… Patch: https://github.com/kamailio/kamailio/commit/785326cdfbee849a8436e7c07003ff0… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 8583f1b37c..9cdd9ff3d5 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -355,8 +355,7 @@ int tps_storage_link_msg(sip_msg_t *msg, tps_data_t *td, int dir) } if(msg->first_line.type==SIP_REPLY) { if(msg->first_line.u.reply.statuscode>=100 - && msg->first_line.u.reply.statuscode<200 - && msg->first_line.u.reply.statuscode!=183) { + && msg->first_line.u.reply.statuscode<200) { /* provisional response with no mandatory contact header */ return 0; }

1 0

git:master:974038f5: pv: vars to get the length for o-uri/r-uri/f-uri/t-uri username
by Daniel-Constantin Mierla 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 974038f5f81382fe6fa6565f0ab9ea0f2cf9896f URL: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-05T09:39:50+02:00 pv: vars to get the length for o-uri/r-uri/f-uri/t-uri username - $oUl, $rUl, $fUl. $tUl - the length is already available in the str value, optimizing a bit by no longer having to use {s.len} --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… Patch: https://github.com/kamailio/kamailio/commit/974038f5f81382fe6fa6565f0ab9ea0… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 0308514e70..4d3d8b343c 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -272,6 +272,9 @@ static pv_export_t mod_pvs[] = { {{"from.user", (sizeof("from.user")-1)}, /* */ PVT_OTHER, pv_get_from_attr, pv_set_from_username, 0, 0, pv_init_iname, 2}, + {{"fUl", (sizeof("fUl")-1)}, /* */ + PVT_OTHER, pv_get_from_attr, 0, + 0, 0, pv_init_iname, 6}, {{"mb", (sizeof("mb")-1)}, /* */ PVT_OTHER, pv_get_msg_buf, 0, 0, 0, 0, 0}, @@ -314,6 +317,9 @@ static pv_export_t mod_pvs[] = { {{"oU", (sizeof("oU")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 1}, + {{"oUl", (sizeof("oUl")-1)}, /* */ + PVT_OTHER, pv_get_ouri_attr, 0, + 0, 0, pv_init_iname, 6}, {{"pd", (sizeof("pd")-1)}, /* */ PVT_OTHER, pv_get_ppi_attr, 0, 0, pv_parse_index, pv_init_iname, 3}, @@ -383,6 +389,9 @@ static pv_export_t mod_pvs[] = { {{"ruri.user", (sizeof("ruri.user")-1)}, /* */ PVT_RURI_USERNAME, pv_get_ruri_attr, pv_set_ruri_user, 0, 0, pv_init_iname, 1}, + {{"rUl", (sizeof("rUl")-1)}, /* */ + PVT_RURI_USERNAME, pv_get_ruri_attr, 0, + 0, 0, pv_init_iname, 6}, {{"rv", (sizeof("rv")-1)}, /* */ PVT_OTHER, pv_get_version, 0, 0, 0, 0, 0}, @@ -470,6 +479,9 @@ static pv_export_t mod_pvs[] = { {{"to.user", (sizeof("to.user")-1)}, /* */ PVT_OTHER, pv_get_to_attr, pv_set_to_username, 0, 0, pv_init_iname, 2}, + {{"tUl", (sizeof("tUl")-1)}, /* */ + PVT_OTHER, pv_get_to_attr, pv_set_to_username, + 0, 0, pv_init_iname, 6}, {{"true", (sizeof("true")-1)}, /* */ PVT_OTHER, pv_get_true, 0, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index ae91aa9d82..7b28fb966e 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -323,6 +323,10 @@ int pv_get_xuri_attr(struct sip_msg *msg, struct sip_uri *parsed_uri, } else if(param->pvn.u.isname.name.n==5) /* uri scheme */ { return pv_get_strintval(msg, param, res, &pv_uri_scheme[parsed_uri->type], (int)parsed_uri->type); + } else if(param->pvn.u.isname.name.n==6) /* username length */ { + if(parsed_uri->user.s==NULL || parsed_uri->user.len<=0) + return pv_get_sintval(msg, param, res, 0); + return pv_get_sintval(msg, param, res, parsed_uri->user.len); } LM_ERR("unknown specifier\n"); return pv_get_null(msg, param, res); @@ -452,6 +456,11 @@ int pv_get_xto_attr(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } return pv_get_strval(msg, param, res, &uri->host); + } else if(param->pvn.u.isname.name.n==6) /* username length */ { + if(uri->user.s==NULL || uri->user.len<=0) { + return pv_get_sintval(msg, param, res, 0); + } + return pv_get_sintval(msg, param, res, uri->user.len); } LM_ERR("unknown specifier\n");

1 0

[kamailio/kamailio] core: PV_IDX_NONE to point that pv had no index (#2341)
by Victor Seva 05 Jun '20

05 Jun '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally #### Description  if index is 0 there were no way to know if the index was there $x_hdr(A) = "value" needs to append a value $(x_hdr(A)[0]) = "value" needs to set the value pv_parse_spec(str *s, pv_spec_p p) was always setting p->pvp.pvi.type to 0 == PV_IDX_INT You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2341 -- Commit Summary -- * core: PV_IDX_NONE to point that pv had no index -- File Changes -- M src/core/pvapi.c (7) M src/core/pvar.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2341.patch https://github.com/kamailio/kamailio/pull/2341.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/2341

2 6

git:master:6e96e8a9: pv: fix for new PV_IDX_NONE value
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 6e96e8a9134ed204f4fcf3cd42f6f9f274ea7851 URL: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T08:54:17+02:00 pv: fix for new PV_IDX_NONE value --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… Patch: https://github.com/kamailio/kamailio/commit/6e96e8a9134ed204f4fcf3cd42f6f9f… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index e53db70c25..ae91aa9d82 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -1823,7 +1823,7 @@ int pv_get_avp(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) if ((avp=search_first_avp(name_type, avp_name, &avp_value, &state))==0) return pv_get_null(msg, param, res); res->flags = PV_VAL_STR; - if(idxf==0 && idx==0) + if(idx==0 && (idxf==PV_IDX_INT || idxf==PV_IDX_NONE)) { if(avp->flags & AVP_VAL_STR) { @@ -1981,7 +1981,7 @@ int pv_get_hdr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) /* get the value */ res->flags = PV_VAL_STR; - if(idxf==0 && idx==0) + if(idx==0 && (idxf==PV_IDX_INT || idxf==PV_IDX_NONE)) { res->rs = hf->body; return 0;

1 0

git:master:7bb26695: core: PV_IDX_NONE to point that pv had no index
by Victor Seva 05 Jun '20

05 Jun '20

Module: kamailio Branch: master Commit: 7bb2669528a819ec29a8193eebc9c641edd69993 URL: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-05T08:54:17+02:00 core: PV_IDX_NONE to point that pv had no index if index is 0 there were no way to know if the index was there $x_hdr(A) = "value" needs to append a value $(x_hdr(A)[0]) = "value" needs to set the value pv_parse_spec(str *s, pv_spec_p p) was always setting p->pvp.pvi.type to 0 == PV_IDX_INT --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… Patch: https://github.com/kamailio/kamailio/commit/7bb2669528a819ec29a8193eebc9c64… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 0148578315..30b2a7cdfe 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -857,6 +857,7 @@ char* pv_parse_spec2(str *in, pv_spec_p e, int silent) tr = 0; pvstate = 0; memset(e, 0, sizeof(pv_spec_t)); + e->pvp.pvi.type = PV_IDX_NONE; p = in->s; p++; if(*p==PV_LNBRACKET) @@ -1369,6 +1370,12 @@ int pv_get_spec_index(struct sip_msg* msg, pv_param_p ip, int *idx, int *flags) *idx = ip->pvi.u.ival; return 0; } + if(ip->pvi.type == PV_IDX_NONE) + { + *flags = PV_IDX_NONE; + *idx = ip->pvi.u.ival; + return 0; + } /* pvar */ if(pv_get_spec_value(msg, (pv_spec_p)ip->pvi.u.dval, &tv)!=0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 1415f84af0..155b0125fb 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -61,6 +61,7 @@ #define PV_IDX_PVAR 1 #define PV_IDX_ALL 2 #define PV_IDX_ITR 3 +#define PV_IDX_NONE 4 /*! if PV name is dynamic, integer, or str */ #define pv_has_dname(pv) ((pv)->pvp.pvn.type==PV_NAME_PVAR)

1 0

git:master:dd28ea04: app_jsdt: duktape interpreter upgraded to v2.5.0
by Daniel-Constantin Mierla 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: dd28ea040b78bf972a9b54177a8025eb8e885683 URL: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T19:26:09+02:00 app_jsdt: duktape interpreter upgraded to v2.5.0 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e… Patch: https://github.com/kamailio/kamailio/commit/dd28ea040b78bf972a9b54177a8025e…

1 0

git:master:2b3c4130: corex: exported file read/write functions to kemi
by Daniel-Constantin Mierla 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: 2b3c4130e717f1b92eeb351e3bfe72e189138136 URL: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T19:15:22+02:00 corex: exported file read/write functions to kemi --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e… Patch: https://github.com/kamailio/kamailio/commit/2b3c4130e717f1b92eeb351e3bfe72e…

1 0

git:master:d581418b: crypto: check if netio crypto key is set if callbacks are enabled
by Daniel-Constantin Mierla 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: d581418bcc49ad30bd35910f988ac78c8d9047e0 URL: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-04T18:32:14+02:00 crypto: check if netio crypto key is set if callbacks are enabled --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… Patch: https://github.com/kamailio/kamailio/commit/d581418bcc49ad30bd35910f988ac78… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index c2f7fe61e4..720042792b 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -137,6 +137,10 @@ static int mod_init(void) } if(_crypto_register_evcb!=0) { + if(_crypto_netio_key.s==NULL || _crypto_netio_key.len<=0) { + LM_ERR("crypto netio key parameter is not set\n"); + return -1; + } crypto_evcb_enable(); }

1 0

missing SAR messages
by Georgi Rosenov Stefanov 04 Jun '20

04 Jun '20

Hi Henning, At first I want to thanks you for reading my post :) Actually I tried to use DEBUG logs, but nothing ..... So I put an "abort()" :) into cxdx_send_sar, so I am able to track one successful test case. Here is the backtrace: #2 0x00007fcb469c12f7 in cxdx_send_sar (msg=0x7fcb4d66a968, public_identity=..., private_identity=..., server_name=..., assignment_type=1, data_available=0, transaction_data=0x7fcb3e455610) at cxdx_sar.c:328 #3 0x00007fcb469c3815 in scscf_assign_server (msg=0x7fcb4d66a968, public_identity=..., private_identity=..., assignment_type=1, data_available=0, transaction_data=0x7fcb3e455610) at server_assignment.c:88 #4 0x00007fcb469ba42f in save (msg=0x7fcb4d66a968, str1=0x7fcb3e423158 "X0B>\313\177", route=0x7fcb4d6656e0 " 3]M\313\177") at save.c:1438 #5 0x00007fcb469cce2a in w_save (_m=0x7fcb4d66a968, _route=0x7fcb4d6656e0 " 3]M\313\177", _d=0x7fcb3e423158 "X0B>\313\177", mode=0x7fcb4d66a968 "\001", _cflags=0x0) at ims_registrar_scscf_mod.c:623 #6 0x000000000047c5c9 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d2f80, msg=0x7fcb4d66a968) at core/action.c:1085 #7 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5d2be8, msg=0x7fcb4d66a968) at core/action.c:1578 #8 0x000000000047c422 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4010, msg=0x7fcb4d66a968) at core/action.c:1064 #9 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4010, msg=0x7fcb4d66a968) at core/action.c:1578 #10 0x000000000047c470 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5d4160, msg=0x7fcb4d66a968) at core/action.c:1068 #11 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d5c4d00, msg=0x7fcb4d66a968) at core/action.c:1578 #12 0x0000000000478ed9 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d573058, msg=0x7fcb4d66a968) at core/action.c:697 #13 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d573058, msg=0x7fcb4d66a968) at core/action.c:1578 #14 0x000000000047c422 in do_action (h=0x7ffd2e6d7e50, a=0x7fcb4d5732f8, msg=0x7fcb4d66a968) at core/action.c:1064 #15 0x000000000048907a in run_actions (h=0x7ffd2e6d7e50, a=0x7fcb4d571ea0, msg=0x7fcb4d66a968) at core/action.c:1578 #16 0x0000000000489803 in run_top_route (a=0x7fcb4d571ea0, msg=0x7fcb4d66a968, c=0x0) at core/action.c:1663 #17 0x00000000005b510e in receive_msg ( buf=0xa95500 <buf.6971> "REGISTER sip: scscf.mnc001.mcc001.3gppnetwork.org:6060 SIP/2.0\r\nVia: SIP/2.0/UDP 10.82.10.145:4060;branch=z9hG4bKe025.079fd766789513e3068d0dce7e1853f3.0\r\nVia: SIP/2.0/UDP 10.82.10.145;branch=z9hG4bKe02"..., len=1085, rcv_info=0x7ffd2e6d8490) at core/receive.c:424 #18 0x00000000004bc624 in udp_rcv_loop () at core/udp_server.c:548 So w_save is called from pcscf_save("location") from /usr/local/etc/kamailio/pcscf/route/register.cfg and save("PRE_REG_SAR_REPLY","location") or save("REG_SAR_REPLY","location"); from /usr/local/etc/kamailio/scscf/kamailio.cfg So I put err log messages(err to be clearly visible ) and then using "journal | grep "my string" -c I count how many times the SAR is triggered Then I count how many SAR messages a sent and the numbers mismatch

2 1

[kamailio/kamailio] cnxcc: when credit reach the limit non confirmed calls of the same customer fail to terminate (#2346)
by Victor Seva 04 Jun '20

04 Jun '20

### Description when credit reach the limit non confirmed calls of the same customer fail to terminate #### Reproduction Sending a call of the same customer while there's another call of the same customer consuming all the quota assigned to it. #### Log Messages first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` established: ``` Jun 3 12:05:39 kamailio[21658]: DEBUG: cnxcc [cnxcc_mod.c:446]: __dialog_created_callback(): Flag is not set for this message. Ignoring Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1583]: ki_set_max_credit(): Setting up new call for client [zs_00000], max-credit[1.000000], connect-cost[0.000000], cost-per-sec[0.100000], initial-pulse [1], final-pulse [1], call-id[450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1521]: set_ctrl_flag(): Flag set! Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1183]: __get_or_create_credit_data_entry(): Credit entry didn't exist. Allocated new entry [0x7f508161ed40] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:1312]: __alloc_new_call_by_money(): New call allocated for client [zs_00000] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:450]: __dialog_created_callback(): Dialog created for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:758]: __setup_billing(): Creating dialog for [450708880-22683-45(a)BAA.BAE.BJF.BDF], h_id [4406], h_entry [1215] Jun 3 12:05:39 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:797]: __setup_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] from client [zs_00000], created Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:464]: __dialog_confirmed_callback(): Dialog confirmed for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:811]: __start_billing(): Billing started for call [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:48 kamailio[21657]: DEBUG: cnxcc [cnxcc_mod.c:927]: __start_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] from client [zs_00000], confirmed. from=<sip:zs_pruebas201@pepelux.zoonsuite.com>;tag=1931637637, to=<sip:anonymous@pepelux.zoonsuite.com>;tag=as7138b4b8 Jun 3 12:05:48 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [0], consumed credit [0.100000] Jun 3 12:05:48 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.100000/1.000000 Jun 3 12:05:49 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [1], consumed credit [0.100000] Jun 3 12:05:49 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.100000/1.000000 Jun 3 12:05:50 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [2], consumed credit [0.300000] Jun 3 12:05:50 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.300000/1.000000 ``` Second call ``[d85f4ff9c923c9ea]``, first one is alive and consuming: ``` Jun 3 12:05:50 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:446]: __dialog_created_callback(): Flag is not set for this message. Ignoring Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1583]: ki_set_max_credit(): Setting up new call for client [zs_00000], max-credit[1.000000], connect-cost[0.000000], cost-per-sec[0.100000], initial-pulse [1], final-pulse [1], call-id[d85f4ff9c923c9ea] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1521]: set_ctrl_flag(): Flag set! Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1164]: __get_or_create_credit_data_entry(): Found key zs_00000 in hash table Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:1312]: __alloc_new_call_by_money(): New call allocated for client [zs_00000] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:450]: __dialog_created_callback(): Dialog created for CID [d85f4ff9c923c9ea] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:758]: __setup_billing(): Creating dialog for [d85f4ff9c923c9ea], h_id [1000], h_entry [1526] Jun 3 12:05:50 kamailio[21659]: DEBUG: cnxcc [cnxcc_mod.c:797]: __setup_billing(): Call [d85f4ff9c923c9ea] from client [zs_00000], created ``` first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` will consume all the customer credit and trigger ``terminate_all_calls`` : ``` Jun 3 12:05:51 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [3], consumed credit [0.400000] Jun 3 12:05:51 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.400000/1.000000 Jun 3 12:05:52 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [4], consumed credit [0.500000] Jun 3 12:05:52 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.500000/1.000000 Jun 3 12:05:53 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [5], consumed credit [0.600000] Jun 3 12:05:53 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.600000/1.000000 Jun 3 12:05:54 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [6], consumed credit [0.700000] Jun 3 12:05:54 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.700000/1.000000 Jun 3 12:05:55 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [7], consumed credit [0.800000] Jun 3 12:05:55 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.800000/1.000000 Jun 3 12:05:56 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [8], consumed credit [0.900000] Jun 3 12:05:56 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 0.900000/1.000000 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:93]: check_calls_by_money(): CID [450708880-22683-45(a)BAA.BAE.BJF.BDF], start_timestamp [1591178748], seconds alive [9], consumed credit [1.000000] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_check.c:122]: check_calls_by_money(): Client [zs_00000] | Ended-Calls-Credit-Spent: 0.000000 TotalCredit/MaxCredit: 1.000000/1.000000 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:974]: terminate_all_calls(): Killing call with CID [d85f4ff9c923c9ea] ``` second ``[d85f4ff9c923c9ea]`` non-confirmed call doesn't have call->from_uri, call->from_tag, call->to_uri, call->to_tag so...: ``` Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1095]: terminate_call(): Got kill signal for call [d85f4ff9c923c9ea] client [zs_00000] h_id [1000] h_entry [1526]. Dropping it now Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_sip_msg_faker.c:48]: cnxcc_faked_msg_init_with_dlg_info(): fake msg:#012OPTIONS sip:you@kamailio.org SIP/2.0#015#012Via: SIP/2.0/UDP 127.0.0.1#015#012From: <>;tag=#015#012To: <>;tag=#015#012Call-ID: d85f4ff9c923c9ea#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0 Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/parse_addr_spec.c:739]: parse_addr_spec(): unexpected char [>] in status 5: [<] . Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/msg_parser.c:164]: get_hdr_field(): bad to header Jun 3 12:05:57 kamailio[21673]: ERROR: <core> [core/parser/msg_parser.c:337]: parse_headers(): bad header field [To: <>;tag=#015#012Call-ID: d85f4ff9c923c9ea#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0#015#012#015#012] Jun 3 12:05:57 kamailio[21673]: ERROR: dialog [dlg_handlers.c:709]: pre_match_parse(): bad request or missing CALLID/TO hdr :-/ Jun 3 12:05:57 kamailio[21673]: ERROR: cnxcc [cnxcc_mod.c:1112]: terminate_call(): [d85f4ff9c923c9ea]: cannot get dialog Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1029]: __free_call(): Freeing call [d85f4ff9c923c9ea] ``` but the call ``[d85f4ff9c923c9ea]`` is been freed. The first call ``[450708880-22683-45(a)BAA.BAE.BJF.BDF]`` is been terminated properly and freed ``` Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:974]: terminate_all_calls(): Killing call with CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1095]: terminate_call(): Got kill signal for call [450708880-22683-45(a)BAA.BAE.BJF.BDF] client [zs_00000] h_id [4406] h_entry [1215]. Dropping it now Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_sip_msg_faker.c:48]: cnxcc_faked_msg_init_with_dlg_info(): fake msg:#012OPTIONS sip:you@kamailio.org SIP/2.0#015#012Via: SIP/2.0/UDP 127.0.0.1#015#012From: <sip:zs_pruebas201@pepelux.zoonsuite.com>;tag=1931637637#015#012To: <sip:anonymous@pepelux.zoonsuite.com>;tag=as7138b4b8#015#012Call-ID: 450708880-22683-45(a)BAA.BAE.BJF.BDF#015#012CSeq: 1 OPTIONS#015#012Content-Length: 0 Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:473]: __dialog_terminated_callback(): Dialog terminated for CID [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:656]: __stop_billing(): Call [450708880-22683-45(a)BAA.BAE.BJF.BDF] of client-ID [zs_00000], ended Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1117]: terminate_call(): dlg_end_dlg sent to call [450708880-22683-45(a)BAA.BAE.BJF.BDF] Jun 3 12:05:57 kamailio[21673]: INFO: <script>: [450708880-22683-45(a)BAA.BAE.BJF.BDF]: call killed zs_pruebas201->anonymous ... No credit available Jun 3 12:05:57 kamailio[21673]: DEBUG: cnxcc [cnxcc_mod.c:1029]: __free_call(): Freeing call [450708880-22683-45(a)BAA.BAE.BJF.BDF] ``` second call ``[d85f4ff9c923c9ea]`` is confirmed but call info was already freed ``` Jun 3 12:06:03 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:464]: __dialog_confirmed_callback(): Dialog confirmed for CID [d85f4ff9c923c9ea] Jun 3 12:06:03 kamailio[21660]: DEBUG: cnxcc [cnxcc_mod.c:811]: __start_billing(): Billing started for call [d85f4ff9c923c9ea] Jun 3 12:06:03 kamailio[21660]: ERROR: cnxcc [cnxcc_mod.c:819]: __start_billing(): Call [d85f4ff9c923c9ea] not found ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` kamailio master with #2343 applied -- 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/2346

1 1

[kamailio/kamailio] cnxcc: don't terminate non confirmed calls (#2347)
by Victor Seva 04 Jun '20

04 Jun '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2346 #### Description * non confirmed calls can't be terminated via dialog.terminate_dlg() API * set call.max_amount to 0 to terminate the call if gets confirmed You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2347 -- Commit Summary -- * cnxcc: don't terminate non confirmed calls -- File Changes -- M src/modules/cnxcc/cnxcc_mod.c (249) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2347.patch https://github.com/kamailio/kamailio/pull/2347.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/2347

1 1

git:master:ca0fc18e: cnxcc: don't terminate non confirmed calls
by Victor Seva 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: ca0fc18e1cfad86ed6b7530d6c520b680e5d6a4f URL: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:12:13+02:00 cnxcc: don't terminate non confirmed calls * non confirmed calls can't be terminated via dialog.terminate_dlg() API * set call.max_amount to 0 to terminate the call if gets confirmed fix #2346 --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6… Patch: https://github.com/kamailio/kamailio/commit/ca0fc18e1cfad86ed6b7530d6c520b6…

1 0

[kamailio/kamailio] cnxcc: minor changes (#2343)
by Victor Seva 04 Jun '20

04 Jun '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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  #### Description Still WIP * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2343 -- Commit Summary -- * cnxcc: minor changes -- File Changes -- M .lgtm.yml (3) M src/modules/cnxcc/cnxcc_mod.c (61) M src/modules/cnxcc/cnxcc_redis.c (29) M src/modules/cnxcc/cnxcc_rpc.c (30) M src/modules/cnxcc/cnxcc_sip_msg_faker.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2343.patch https://github.com/kamailio/kamailio/pull/2343.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/2343

2 4

git:master:e98457fa: cnxcc: minor changes
by Victor Seva 04 Jun '20

04 Jun '20

Module: kamailio Branch: master Commit: e98457faf2098ca2f16a831a4a68d2a26e301b0a URL: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-06-04T11:09:17+02:00 cnxcc: minor changes * use [PKG|SHM]_MEM_ERROR * use memset and avoid initialization per field * init variables * add cnxcc to lgtm build * use localtime_r() for a safer multi-thread usage * replaced deprecated STR_PARAM with PARAM_STR * clean includes * clang-format --- Modified: .lgtm.yml Modified: src/modules/cnxcc/cnxcc.c Modified: src/modules/cnxcc/cnxcc.h Modified: src/modules/cnxcc/cnxcc_mod.c Modified: src/modules/cnxcc/cnxcc_mod.h Modified: src/modules/cnxcc/cnxcc_redis.c Modified: src/modules/cnxcc/cnxcc_rpc.c Modified: src/modules/cnxcc/cnxcc_rpc.h Modified: src/modules/cnxcc/cnxcc_select.c Modified: src/modules/cnxcc/cnxcc_select.h Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.c Modified: src/modules/cnxcc/cnxcc_sip_msg_faker.h --- Diff: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a… Patch: https://github.com/kamailio/kamailio/commit/e98457faf2098ca2f16a831a4a68d2a…

1 0

git:master:be57be33: pdb: use memcpy() for PDB_BUFTOSHORT macro
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: be57be33d0e48d412ddab9801ee4d6d906329d70 URL: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T21:46:20+02:00 pdb: use memcpy() for PDB_BUFTOSHORT macro - related to GH #2345 --- Modified: src/modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… Patch: https://github.com/kamailio/kamailio/commit/be57be33d0e48d412ddab9801ee4d6d… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index 1ab15af2e7..5fb1204e52 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -190,7 +190,7 @@ static int pdb_msg_format_send(struct pdb_msg *msg, /* two chars to short-int without caring of memory alignment in char buffer */ -#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) +#define PDB_BUFTOSHORT(_sv, _b, _n) memcpy(&(_sv), (char*)(_b) + (_n), sizeof(short int)) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -347,7 +347,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, msg.bdy.payload, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; } @@ -370,7 +370,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + PDB_BUFTOSHORT(_id, buf, reqlen); /* make gcc happy */ carrierid=ntohs(_id); /* convert to host byte order */ goto found; }

1 0

missing SAR messages
by Georgi Rosenov Stefanov 03 Jun '20

03 Jun '20

Hi All, I am experimenting with Kamailio 5.3.3 as an IMS and I am trying to do load tests I am using SIPp to generate SIP.REGISTER and MariaDB and a DIAMETER tool ( seagull) For now I achieved registrations with "speed" 200 per/sec. When I send SIP.REGISTER faster(let's say 500 per/sec) I see some SARs missing, not sent at all. I start debugging and found that cxdx_send_sar is responsible to creating SAR message. I put my debug message in it. The strange thing: there is a mismatch of my debug message (cxdx_send_sar invocation) and real SAR send over the network. What is the thing I missing ? Is there anything else responsible for SAR creating except cxdx_send_sar ? Did someone made similar tests ? my test machine is Centos 7 with 3.10.0 Intel(R) Core(TM) i7-9700K CPU @ 3.60GHz 16G RAM During this tests I see kamailio very low CPU usage, even when I push it with 500/sec The biggest CPU load is in MariaDB, but I do not have issues with UAR and MAR

2 2

[kamailio/kamailio] warning cleanup (#2298)
by sergey-safarov 03 Jun '20

03 Jun '20

**ld_fld.c:273** implicit-function-declaration ``` CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_con.o CC (gcc) [M db2_ldap.so] ld_fld.o ld_fld.c: In function 'ldap_gentime2db_datetime': ld_fld.c:273:10: warning: implicit declaration of function 'timelocal' [-Wimplicit-function-declaration] 273 | *dst = timelocal(&time); | ^~~~~~~~~ CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_uri.o make[3]: 'libsrdb2.so.1.0' is up to date. ``` **redis_table.c:586** maybe-uninitialized ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o redis_table.c: In function 'db_redis_parse_keys': redis_table.c:586:38: warning: 'table' may be used uninitialized in this function [-Wmaybe-uninitialized] 586 | table->types = type_target = type; | ~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~ make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so ``` **app_python** strict-aliasing ``` CC (gcc) [M app_python.so] app_python_mod.o CC (gcc) [M app_python.so] apy_kemi.o In file included from /usr/include/python2.7/Python.h:83, from apy_kemi.c:25: apy_kemi.c: In function 'sr_kemi_apy_return_true': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:121:2: note: in expansion of macro 'Py_INCREF' 121 | Py_INCREF(Py_True); | ^~~~~~~~~ apy_kemi.c: In function 'sr_kemi_apy_return_false': /usr/include/python2.7/object.h:769:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] 769 | ((PyObject*)(op))->ob_refcnt++) | ~^~~~~~~~~~~~~~~~ apy_kemi.c:130:2: note: in expansion of macro 'Py_INCREF' 130 | Py_INCREF(Py_False); | ^~~~~~~~~ CC (gcc) [M app_python.so] apy_kemi_export.o CC (gcc) [M app_python.so] mod_Core.o ``` **pdb.c:348** address-of-packed-member] ``` LD (gcc) [M p_usrloc.so] p_usrloc.so CC (gcc) [M path.so] path.o CC (gcc) [M path.so] path_mod.o LD (gcc) [M path.so] path.so CC (gcc) [M pdb.so] pdb.o pdb.c: In function 'pdb_query': pdb.c:348:60: warning: taking address of packed member of 'struct pdb_msg' may result in an unaligned pointer value [-Waddress-of-packed-member] 348 | _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ | ^~~~~~~~~~~~~~~~~~~~~~~~~~ LD (gcc) [M pdb.so] pdb.so CC (gcc) [M pdt.so] pdt.o CC (gcc) [M pdt.so] pdtree.o make[3]: 'libsrdb1.so.1.0' is up to date. ``` -- 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/2298

3 5

git:master:4deb5141: core: tcp - log details of the exiting tcp connection on insert failure
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 4deb51419ab66931459709fe44acd3e7a0acc18d URL: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T12:45:05+02:00 core: tcp - log details of the exiting tcp connection on insert failure --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… Patch: https://github.com/kamailio/kamailio/commit/4deb51419ab66931459709fe44acd3e… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 8147951b21..db6e8b923a 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1720,7 +1720,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * idx - index in the fd_array (or -1 if not known) * return: -1 on error, or when we are not interested any more on reads * from this fd (e.g.: we are closing it ) - * 0 on EAGAIN or when by some other way it is known that no more + * 0 on EAGAIN or when by some other way it is known that no more * io events are queued on the fd (the receive buffer is empty). * Usefull to detect when there are no more io events queued for * sigio_rt, epoll_et, kqueue. @@ -1728,7 +1728,7 @@ static ticks_t tcpconn_read_timeout(ticks_t t, struct timer_ln* tl, void* data) * queued -- the receive buffer might still be non-empty) */ inline static int handle_io(struct fd_map* fm, short events, int idx) -{ +{ int ret; int n; int read_flags; @@ -1736,10 +1736,11 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) int s; long resp; ticks_t t; - + fd_map_t *ee = NULL; + /* update the local config */ cfg_update(); - + switch(fm->type){ case F_TCPMAIN: again: @@ -1803,7 +1804,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) if (unlikely(read_flags & RD_CONN_REPEAT_READ)) goto repeat_1st_read; #endif /* USE_TLS */ - + /* must be before io_watch_add, io_watch_add might catch some * already existing events => might call handle_io and * handle_io might decide to del. the new connection => @@ -1816,13 +1817,25 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) local_timer_reinit(&con->timer); local_timer_add(&tcp_reader_ltimer, &con->timer, S_TO_TICKS(TCP_CHILD_TIMEOUT), t); - if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)){ + if (unlikely(io_watch_add(&io_w, s, POLLIN, F_TCPCONN, con)<0)) { LM_CRIT("io_watch_add failed for %p id %d fd %d, state %d, flags %x," " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", con, con->id, con->fd, con->state, con->flags, con->s, atomic_get(&con->refcnt), ip_addr2a(&con->rcv.src_ip), con->rcv.src_port, ip_addr2a(&con->rcv.dst_ip), con->rcv.dst_port); + ee = get_fd_map(&io_w, s); + if(ee!=0 && ee->type==F_TCPCONN) { + tcp_connection_t *ec; + ec = (tcp_connection_t*)ee->data; + LM_CRIT("existing tcp con %p id %d fd %d, state %d, flags %x," + " main fd %d, refcnt %d ([%s]:%u -> [%s]:%u)\n", + ec, ec->id, ec->fd, ec->state, ec->flags, + ec->s, atomic_get(&ec->refcnt), + ip_addr2a(&ec->rcv.src_ip), ec->rcv.src_port, + ip_addr2a(&ec->rcv.dst_ip), ec->rcv.dst_port); + + } tcpconn_listrm(tcp_conn_lst, con, c_next, c_prev); local_timer_del(&tcp_reader_ltimer, &con->timer); goto con_error;

1 0

git:master:50af00c7: core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 50af00c7ef7037b6e55a3d3254a38935532bb0fa URL: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:55:57+02:00 core: io_wait.h - typedef fd_map_t, more details in log when is a fd conflict --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… Patch: https://github.com/kamailio/kamailio/commit/50af00c7ef7037b6e55a3d3254a3893… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index 3112085a14..9177ae2aaf 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -109,12 +109,12 @@ typedef int fd_type; /* maps a fd to some other structure; used in almost all cases * except epoll and maybe kqueue or /dev/poll */ -struct fd_map{ +typedef struct fd_map { int fd; /* fd no */ fd_type type; /* "data" type */ void* data; /* pointer to the corresponding structure */ short events; /* events we are interested int */ -}; +} fd_map_t; #ifdef HAVE_KQUEUE @@ -132,7 +132,7 @@ struct fd_map{ /* handler structure */ -struct io_wait_handler{ +typedef struct io_wait_handler { enum poll_types poll_method; int flags; struct fd_map* fd_hash; @@ -172,13 +172,12 @@ struct io_wait_handler{ fd_set master_wset; /* write set */ int max_fd_select; /* maximum select used fd */ #endif -}; - -typedef struct io_wait_handler io_wait_h; +} io_wait_h; /* get the corresponding fd_map structure pointer */ #define get_fd_map(h, fd) (&(h)->fd_hash[(fd)]) + /* remove a fd_map structure from the hash; the pointer must be returned * by get_fd_map or hash_fd_map*/ #define unhash_fd_map(pfm) \ @@ -321,7 +320,7 @@ inline static int io_watch_add( io_wait_h* h, h->fd_array[h->fd_no].events=(ev); /* useless for select */ \ h->fd_array[h->fd_no].revents=0; /* useless for select */ \ }while(0) - + #define set_fd_flags(f) \ do{ \ flags=fcntl(fd, F_GETFL); \ @@ -336,8 +335,7 @@ inline static int io_watch_add( io_wait_h* h, goto error; \ } \ }while(0) - - + struct fd_map* e; int flags; #ifdef HAVE_EPOLL @@ -353,7 +351,7 @@ inline static int io_watch_add( io_wait_h* h, int idx; int check_io; struct pollfd pf; - + check_io=0; /* set to 1 if we need to check for pre-existing queued io/data on the fd */ idx=-1; @@ -378,13 +376,13 @@ inline static int io_watch_add( io_wait_h* h, /* hash sanity check */ e=get_fd_map(h, fd); if (unlikely(e && (e->type!=0 /*F_NONE*/))){ - LM_ERR("trying to overwrite entry %d" - " watched for %x in the hash(%d, %d, %p) with (%d, %d, %p)\n", - fd, events, e->fd, e->type, e->data, fd, type, data); + LM_ERR("trying to overwrite entry %d watched for %x" + " in the hash %p (fd:%d, type:%d, data:%p) with (%d, %d, %p)\n", + fd, events, h, e->fd, e->type, e->data, fd, type, data); e=0; goto error; } - + if (unlikely((e=hash_fd_map(h, fd, events, type, data))==0)){ LM_ERR("failed to hash the fd %d\n", fd); goto error;

1 0

git:master:19b3deb8: ctl: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: 19b3deb88afe5d787ca366885c660e66f17c3409 URL: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:33:01+02:00 ctl: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6… Patch: https://github.com/kamailio/kamailio/commit/19b3deb88afe5d787ca366885c660e6…

1 0

git:master:b6abc761: erlang: renamed global io_h to clt_io_h
by Daniel-Constantin Mierla 03 Jun '20

03 Jun '20

Module: kamailio Branch: master Commit: b6abc7618af7b8b3470e76aae7a0fd5ba0869949 URL: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-03T08:36:07+02:00 erlang: renamed global io_h to clt_io_h - tcp core also uses a glibal io_h --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5… Patch: https://github.com/kamailio/kamailio/commit/b6abc7618af7b8b3470e76aae7a0fd5…

1 0

git:master:2d58abdc: modules: readme files regenerated - crypto ... [skip ci]
by Kamailio Dev 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 2d58abdc01372898f61d2c09190fdce2681eb738 URL: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-02T11:16:27+02:00 modules: readme files regenerated - crypto ... [skip ci] --- Modified: src/modules/crypto/README --- Diff: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce… Patch: https://github.com/kamailio/kamailio/commit/2d58abdc01372898f61d2c09190fdce…

1 0

git:master:97ba02b0: crypto: docs for netio params, functions and event route
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 97ba02b003f8f4545376fffbf17cdf600abd6b60 URL: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:49+02:00 crypto: docs for netio params, functions and event route --- Modified: src/modules/crypto/doc/crypto_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6… Patch: https://github.com/kamailio/kamailio/commit/97ba02b003f8f4545376fffbf17cdf6…

1 0

git:master:6f7b04d6: crypto: aes encrypt/decrypt based on event_route[crypto:netio]
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 6f7b04d62e555dbbfb6360623c4c2ab84a36e2e7 URL: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T10:35:18+02:00 crypto: aes encrypt/decrypt based on event_route[crypto:netio] --- Modified: src/modules/crypto/crypto_aes.c Modified: src/modules/crypto/crypto_aes.h Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab… Patch: https://github.com/kamailio/kamailio/commit/6f7b04d62e555dbbfb6360623c4c2ab…

1 0

git:master:d65e15a4: crypto: coherent naming for functions on netio event handling
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: d65e15a461197a9302d1cccc6fe3069d9432e268 URL: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T11:05:26+02:00 crypto: coherent naming for functions on netio event handling --- Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… Patch: https://github.com/kamailio/kamailio/commit/d65e15a461197a9302d1cccc6fe3069… --- diff --git a/src/modules/crypto/crypto_mod.c b/src/modules/crypto/crypto_mod.c index c2ae77fb6b..c2f7fe61e4 100644 --- a/src/modules/crypto/crypto_mod.c +++ b/src/modules/crypto/crypto_mod.c @@ -74,13 +74,13 @@ static cmd_export_t cmds[]={ fixup_crypto_aes_encrypt, 0, ANY_ROUTE}, {"crypto_aes_decrypt", (cmd_function)w_crypto_aes_decrypt, 3, fixup_crypto_aes_decrypt, 0, ANY_ROUTE}, - {"crypto_nio_in", (cmd_function)w_crypto_nio_in, 0, + {"crypto_netio_in", (cmd_function)w_crypto_nio_in, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_out", (cmd_function)w_crypto_nio_out, 0, + {"crypto_netio_out", (cmd_function)w_crypto_nio_out, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, + {"crypto_netio_encrypt", (cmd_function)w_crypto_nio_encrypt, 0, 0, 0, ANY_ROUTE}, - {"crypto_nio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, + {"crypto_netio_decrypt", (cmd_function)w_crypto_nio_decrypt, 0, 0, 0, ANY_ROUTE}, {"load_crypto", (cmd_function)load_crypto, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0}

1 0

git:master:40d92899: crypto: saved functions in crypto_aes.c
by Daniel-Constantin Mierla 02 Jun '20

02 Jun '20

Module: kamailio Branch: master Commit: 40d9289977b97becc4d4bd948bcde57ea320cf0e URL: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-02T07:57:34+02:00 crypto: saved functions in crypto_aes.c --- Modified: src/modules/crypto/crypto_aes.c --- Diff: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… Patch: https://github.com/kamailio/kamailio/commit/40d9289977b97becc4d4bd948bcde57… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c index 9573c7264d..777d43502b 100644 --- a/src/modules/crypto/crypto_aes.c +++ b/src/modules/crypto/crypto_aes.c @@ -19,3 +19,122 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +/** + * Create an 256 bit key and IV using the supplied key_data and salt. + * Fills in the encryption and decryption ctx objects and returns 0 on success + */ +int crypto_aes_init(unsigned char *key_data, int key_data_len, + unsigned char *salt, EVP_CIPHER_CTX *e_ctx, EVP_CIPHER_CTX *d_ctx) +{ + int i, nrounds = 5; + int x; + unsigned char key[32], iv[32]; + + /* + * Gen key & IV for AES 256 CBC mode. A SHA1 digest is used to hash + * the supplied key material. + * nrounds is the number of times the we hash the material. More rounds + * are more secure but slower. + */ + i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha1(), salt, + key_data, key_data_len, nrounds, key, iv); + if (i != 32) { + LM_ERR("key size is %d bits - should be 256 bits\n", i); + return -1; + } + + for(x = 0; x<32; ++x) + LM_DBG("key: %x iv: %x \n", key[x], iv[x]); + + for(x = 0; x<8; ++x) + LM_DBG("salt: %x\n", salt[x]); + + if(e_ctx) { + EVP_CIPHER_CTX_init(e_ctx); + EVP_EncryptInit_ex(e_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + if(d_ctx) { + EVP_CIPHER_CTX_init(d_ctx); + EVP_DecryptInit_ex(d_ctx, EVP_aes_256_cbc(), NULL, key, iv); + } + + return 0; +} + +/* + * Encrypt *len bytes of data + * All data going in & out is considered binary (unsigned char[]) + */ +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len) +{ + /* max ciphertext len for a n bytes of plaintext is + * n + AES_BLOCK_SIZE -1 bytes */ + int c_len = *len + AES_BLOCK_SIZE - 1, f_len = 0; + unsigned char *ciphertext = (unsigned char *)malloc(c_len); + + if(ciphertext == NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + /* allows reusing of 'e' for multiple encryption cycles */ + if(!EVP_EncryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_EncryptInit_ex \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext, c_len is filled with the length of ciphertext + * generated, *len is the size of plaintext in bytes */ + if(!EVP_EncryptUpdate(e, ciphertext, &c_len, plaintext, *len)){ + LM_ERR("failure in EVP_EncryptUpdate \n"); + free(ciphertext); + return NULL; + } + + /* update ciphertext with the final remaining bytes */ + if(!EVP_EncryptFinal_ex(e, ciphertext+c_len, &f_len)){ + LM_ERR("failure in EVP_EncryptFinal_ex \n"); + free(ciphertext); + return NULL; + } + + *len = c_len + f_len; + return ciphertext; +} + +/* + * Decrypt *len bytes of ciphertext + */ +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len) +{ + /* plaintext will always be equal to or lesser than length of ciphertext*/ + int p_len = *len, f_len = 0; + unsigned char *plaintext = (unsigned char *)malloc(p_len); + + if(plaintext==NULL) { + LM_ERR("no more system memory\n"); + return NULL; + } + if(!EVP_DecryptInit_ex(e, NULL, NULL, NULL, NULL)){ + LM_ERR("failure in EVP_DecryptInit_ex \n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptUpdate(e, plaintext, &p_len, ciphertext, *len)){ + LM_ERR("failure in EVP_DecryptUpdate\n"); + free(plaintext); + return NULL; + } + + if(!EVP_DecryptFinal_ex(e, plaintext+p_len, &f_len)){ + LM_ERR("failure in EVP_DecryptFinal_ex\n"); + free(plaintext); + return NULL; + } + + *len = p_len + f_len; + return plaintext; +} \ No newline at end of file

1 0

[kamailio/kamailio] Play media when Kamailio+rtpengine are as an end point(not proxy) (#2315)
by bshirazi 02 Jun '20

02 Jun '20

### Description  With rtpengine module play_media function it is possible to play media to one of the endpoints(Kamailio is normal proxy) but I like to use Kamailio+rtpengine as an end point playing music for caller(simple media server). ### Expected behavior Possible to use Kamailio+rtpengine as an end point playing media. ### Possible Solutions I see some efforts in mailing list trying to build/generate a 183 response inside script to simulate a dummy end point and then use rtpengine_play_media function.  Regards. Babak -- 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/2315

3 4

git:master:70fc8569: crypto: set flags to encrypt/decrypt and functions for direction
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 70fc8569559abd80336ad1ddcd5a0676f9665d11 URL: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T20:21:09+02:00 crypto: set flags to encrypt/decrypt and functions for direction --- Modified: src/modules/crypto/crypto_evcb.c Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067… Patch: https://github.com/kamailio/kamailio/commit/70fc8569559abd80336ad1ddcd5a067…

1 0

git:master:dd15786a: crypto: aes helper functions relocated to dedicated files
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: dd15786aba0b48a83efeef258d689217ac5375a9 URL: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T13:10:29+02:00 crypto: aes helper functions relocated to dedicated files --- Added: src/modules/crypto/crypto_aes.c Added: src/modules/crypto/crypto_aes.h --- Diff: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… Patch: https://github.com/kamailio/kamailio/commit/dd15786aba0b48a83efeef258d68921… --- diff --git a/src/modules/crypto/crypto_aes.c b/src/modules/crypto/crypto_aes.c new file mode 100644 index 0000000000..9573c7264d --- /dev/null +++ b/src/modules/crypto/crypto_aes.c @@ -0,0 +1,21 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + diff --git a/src/modules/crypto/crypto_aes.h b/src/modules/crypto/crypto_aes.h new file mode 100644 index 0000000000..a98a95016e --- /dev/null +++ b/src/modules/crypto/crypto_aes.h @@ -0,0 +1,35 @@ +/** + * Copyright (C) 2016-2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _CRYPTO_AES_H_ +#define _CRYPTO_AES_H_ + +#include <openssl/evp.h> + +int crypto_aes_init(unsigned char *key_data, int key_data_len, + unsigned char *salt, EVP_CIPHER_CTX *e_ctx, EVP_CIPHER_CTX *d_ctx); + +unsigned char *crypto_aes_encrypt(EVP_CIPHER_CTX *e, unsigned char *plaintext, + int *len); + +unsigned char *crypto_aes_decrypt(EVP_CIPHER_CTX *e, unsigned char *ciphertext, + int *len); +#endif \ No newline at end of file

1 0

git:master:7cc8eca1: crypto: set flags to encrypt/decrypt on event route functions
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 7cc8eca1d06ada4e4b819e3d061850eddc8a58ed URL: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:40:59+02:00 crypto: set flags to encrypt/decrypt on event route functions --- Modified: src/modules/crypto/crypto_evcb.c --- Diff: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… Patch: https://github.com/kamailio/kamailio/commit/7cc8eca1d06ada4e4b819e3d061850e… --- diff --git a/src/modules/crypto/crypto_evcb.c b/src/modules/crypto/crypto_evcb.c index dd23d0d0fd..3a79a63523 100644 --- a/src/modules/crypto/crypto_evcb.c +++ b/src/modules/crypto/crypto_evcb.c @@ -31,6 +31,7 @@ #include "../../core/kemi.h" #include "../../core/fmsg.h" #include "../../core/events.h" +#include "../../core/onsend.h" #define CRYPTO_NIO_OUT (1<<0) @@ -92,6 +93,7 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) sip_msg_t *fmsg; sip_msg_t tmsg; sr_kemi_eng_t *keng = NULL; + onsend_info_t onsnd_info = {0}; if(evenv==0) { LM_ERR("crypto env not set\n"); @@ -107,6 +109,16 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) return -1; } fmsg = &tmsg; + + if(evenv->mflags & CRYPTO_NIO_OUT) { + onsnd_info.to = &evenv->evp->dst->to; + onsnd_info.send_sock = evenv->evp->dst->send_sock; + onsnd_info.buf = fmsg->buf; + onsnd_info.len = fmsg->len; + onsnd_info.msg = fmsg; + p_onsend = &onsnd_info; + } + crypto_set_msg_env(fmsg, evenv); backup_rt = get_route_type(); set_route_type(EVENT_ROUTE); @@ -125,6 +137,10 @@ int crypto_exec_evroute(crypto_env_t *evenv, int rt, str *kevcb, str *rtname) crypto_set_msg_env(fmsg, NULL); /* free the structure -- it is a clone of faked msg */ free_sip_msg(fmsg); + + if(evenv->mflags & CRYPTO_NIO_OUT) { + p_onsend = NULL; + } return 0; } @@ -174,6 +190,13 @@ int crypto_nio_sent(sr_event_param_t *evp) */ int crypto_nio_in(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return -1; + } + return 1; } @@ -182,7 +205,14 @@ int crypto_nio_in(sip_msg_t* msg) */ int crypto_nio_out(sip_msg_t* msg) { - return 1; + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + if(evenv->mflags & CRYPTO_NIO_OUT) { + return 1; + } + + return -1; } /** @@ -190,6 +220,12 @@ int crypto_nio_out(sip_msg_t* msg) */ int crypto_nio_encrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_ENCRYPT; + return 1; } @@ -198,5 +234,11 @@ int crypto_nio_encrypt(sip_msg_t* msg) */ int crypto_nio_decrypt(sip_msg_t* msg) { + crypto_env_t *evenv; + + evenv = crypto_get_msg_env(msg); + + evenv->mflags |= CRYPTO_NIO_DECRYPT; + return 1; } \ No newline at end of file

1 0

git:master:52f9c668: pv: new var $mts - return msg type as string
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 52f9c668d77746383d8fdae6e90fabd6c7a018fa URL: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-01T09:21:25+02:00 pv: new var $mts - return msg type as string - rq - for request - rp - for response --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… Patch: https://github.com/kamailio/kamailio/commit/52f9c668d77746383d8fdae6e90fabd… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 492344f80e..0308514e70 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -293,6 +293,9 @@ static pv_export_t mod_pvs[] = { {{"mt", (sizeof("mt")-1)}, /* */ PVT_OTHER, pv_get_msgtype, 0, 0, 0, 0, 0}, + {{"mts", (sizeof("mts")-1)}, /* */ + PVT_OTHER, pv_get_msgtypes, 0, + 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 5a83a8999b..e53db70c25 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -195,6 +195,23 @@ int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, type); } +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + char *types = "xx"; + + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REQUEST) { + types = "rq"; + } else if(msg->first_line.type == SIP_REPLY) { + types = "rp"; + } + + return pv_get_strzval(msg, param, res, types); +} + int pv_get_version(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 919fa3910f..cf87a7e0c9 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -49,6 +49,9 @@ int pv_get_methodid(struct sip_msg *msg, pv_param_t *param, int pv_get_msgtype(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_msgtypes(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:64adc989: kemi: exported function to get msg type
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: 64adc989bd4655b395554023be2aa863f144d81e URL: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-31T09:30:12+02:00 kemi: exported function to get msg type --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… Patch: https://github.com/kamailio/kamailio/commit/64adc989bd4655b395554023be2aa86… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index f94ff951d4..fdedda04be 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -872,6 +872,25 @@ static int ki_kx_get_msglen(sip_msg_t *msg) return msg->len; } +/** + * + */ +static int ki_kx_get_msgtype(sip_msg_t *msg) +{ + if(msg==NULL) { + return -1; + } + + if(msg->first_line.type == SIP_REQUEST) { + return 1; + } else if(msg->first_line.type == SIP_REPLY) { + return 2; + } + + return 0; +} + + /** * */ @@ -1122,6 +1141,11 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_msgtype"), + SR_KEMIP_INT, ki_kx_get_msgtype, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }

1 0

git:master:f658a7a8: pv: removed commented code for retcode var - exported from core
by Daniel-Constantin Mierla 01 Jun '20

01 Jun '20

Module: kamailio Branch: master Commit: f658a7a8263efd4b0ed5816959741380a964221d URL: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-31T09:30:13+02:00 pv: removed commented code for retcode var - exported from core --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… Patch: https://github.com/kamailio/kamailio/commit/f658a7a8263efd4b0ed581695974138… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 7f478a9ac5..492344f80e 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -338,12 +338,6 @@ static pv_export_t mod_pvs[] = { {{"rb", (sizeof("rb")-1)}, /* */ PVT_MSG_BODY, pv_get_msg_body, 0, 0, 0, 0, 0}, - /* {{"rc", (sizeof("rc")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, - {{"retcode", (sizeof("retcode")-1)}, - PVT_OTHER, pv_get_return_code, 0, - 0, 0, 0, 0}, */ {{"rd", (sizeof("rd")-1)}, /* */ PVT_RURI_DOMAIN, pv_get_ruri_attr, pv_set_ruri_host, 0, 0, pv_init_iname, 2},

1 0

git:master:6fe4a35e: modules: readme files regenerated - pv ... [skip ci]
by Kamailio Dev 29 May '20

29 May '20

Module: kamailio Branch: master Commit: 6fe4a35e977adf4195dfedf8db5efc02291180b3 URL: https://github.com/kamailio/kamailio/commit/6fe4a35e977adf4195dfedf8db5efc0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-29T23:46:12+02:00 modules: readme files regenerated - pv ... [skip ci] --- Modified: src/modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/6fe4a35e977adf4195dfedf8db5efc0… Patch: https://github.com/kamailio/kamailio/commit/6fe4a35e977adf4195dfedf8db5efc0…

1 0

[kamailio/kamailio] $xavi(...) (#2337)
by Victor Seva 29 May '20

29 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally #### Description This change introduces a new type of variable $xavi - eXtended Attribute Value Insensitive case. It's like a $xavp but keys are case insensitive: ``` $xavi(WhatEver=>fOo) = 1; if($xavi(whatever[0]=>foo) == 1) { .... } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2337 -- Commit Summary -- * core: xavi api - like xavp but with insensitive case names * core: pv - define xavi types * core: receive - reset xavi list after message processing * tm: process xavi list in transaction contexts * pv: $xavi(...) config variables implementation -- File Changes -- M src/core/pvar.h (4) M src/core/receive.c (1) M src/core/xavp.c (987) M src/core/xavp.h (43) M src/modules/pv/pv.c (539) M src/modules/pv/pv_xavp.c (416) M src/modules/pv/pv_xavp.h (7) M src/modules/tm/h_table.c (12) M src/modules/tm/h_table.h (3) M src/modules/tm/t_hooks.c (6) M src/modules/tm/t_reply.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2337.patch https://github.com/kamailio/kamailio/pull/2337.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/2337

3 7

git:master:d61be421: pv: add documentation of xavi related functions [skip ci]
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: d61be4214850f5dd58a9a38ea19484e452745e86 URL: https://github.com/kamailio/kamailio/commit/d61be4214850f5dd58a9a38ea19484e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 pv: add documentation of xavi related functions [skip ci] --- Modified: src/modules/pv/doc/pv_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d61be4214850f5dd58a9a38ea19484e… Patch: https://github.com/kamailio/kamailio/commit/d61be4214850f5dd58a9a38ea19484e…

1 0

git:master:bd013b47: pv: $xavi(...) config variables implementation
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: bd013b471ced4ed67428690354bf5e68826daaf4 URL: https://github.com/kamailio/kamailio/commit/bd013b471ced4ed67428690354bf5e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 pv: $xavi(...) config variables implementation same as $xavp but case insensitive for keys --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c Modified: src/modules/pv/pv_xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/bd013b471ced4ed67428690354bf5e6… Patch: https://github.com/kamailio/kamailio/commit/bd013b471ced4ed67428690354bf5e6…

1 0

git:master:ad8868d2: core: receive - reset xavi list after message processing
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: ad8868d2c951c9b6f605f675574f4b34a433b56a URL: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: receive - reset xavi list after message processing --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… Patch: https://github.com/kamailio/kamailio/commit/ad8868d2c951c9b6f605f675574f4b3… --- diff --git a/src/core/receive.c b/src/core/receive.c index d9194379b2..38bc1e4ab1 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -561,4 +561,5 @@ void ksr_msg_env_reset(void) reset_avps(); xavp_reset_list(); xavu_reset_list(); + xavi_reset_list(); }

1 0

git:master:dc468c6f: tm: process xavi list in transaction contexts
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: dc468c6f694471d981d69372bbd0989e7b1cd04f URL: https://github.com/kamailio/kamailio/commit/dc468c6f694471d981d69372bbd0989… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 tm: process xavi list in transaction contexts --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/dc468c6f694471d981d69372bbd0989… Patch: https://github.com/kamailio/kamailio/commit/dc468c6f694471d981d69372bbd0989…

1 0

git:master:8b03c49f: core: xavi api - like xavp but with insensitive case names
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: 8b03c49f8bd531bf6cf43c986868b1933e7af5aa URL: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: xavi api - like xavp but with insensitive case names $xavi(WhatEver=>FOo) == $xavi(whatever=>foO) --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19… Patch: https://github.com/kamailio/kamailio/commit/8b03c49f8bd531bf6cf43c986868b19…

1 0

git:master:b90a0fb7: core: pv - define xavi types
by Victor Seva 29 May '20

29 May '20

Module: kamailio Branch: master Commit: b90a0fb772c995b0214196270dca062eccc7e75e URL: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-29T23:31:55+02:00 core: pv - define xavi types --- Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… Patch: https://github.com/kamailio/kamailio/commit/b90a0fb772c995b0214196270dca062… --- diff --git a/src/core/pvar.h b/src/core/pvar.h index ffde26dedb..1415f84af0 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -77,8 +77,8 @@ enum _pv_type { PVT_DSTURI, PVT_COLOR, PVT_BRANCH, PVT_FROM, PVT_TO, PVT_OURI, PVT_SCRIPTVAR, PVT_MSG_BODY, PVT_CONTEXT, - PVT_XAVP, PVT_XAVU, PVT_HDRC, - PVT_OTHER, PVT_EXTRA /* keep it last */ + PVT_XAVP, PVT_XAVU, PVT_XAVI, + PVT_HDRC, PVT_OTHER, PVT_EXTRA /* keep it last */ }; typedef enum _pv_type pv_type_t;

1 0

git:master:74f11793: kemix: functions to get msg buffer and length
by Daniel-Constantin Mierla 29 May '20

29 May '20

Module: kamailio Branch: master Commit: 74f1179390475354cb6fe5983dc7c40afd294be4 URL: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-29T10:40:44+02:00 kemix: functions to get msg buffer and length --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… Patch: https://github.com/kamailio/kamailio/commit/74f1179390475354cb6fe5983dc7c40… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 81e433c9e3..f94ff951d4 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -843,6 +843,35 @@ static int ki_kx_get_conid(sip_msg_t *msg) return conid; } +/** + * + */ +static sr_kemi_xval_t* ki_kx_get_msgbuf(sip_msg_t *msg) +{ + memset(&_sr_kemi_kx_xval, 0, sizeof(sr_kemi_xval_t)); + if(msg==NULL) { + sr_kemi_xval_null(&_sr_kemi_kx_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_sr_kemi_kx_xval; + } + + _sr_kemi_kx_xval.vtype = SR_KEMIP_STR; + _sr_kemi_kx_xval.v.s.s = msg->buf; + _sr_kemi_kx_xval.v.s.len = msg->len; + return &_sr_kemi_kx_xval; +} + +/** + * + */ +static int ki_kx_get_msglen(sip_msg_t *msg) +{ + if(msg==NULL) { + return -1; + } + + return msg->len; +} + /** * */ @@ -1083,6 +1112,17 @@ static sr_kemi_t sr_kemi_kx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("kx"), str_init("get_msgbuf"), + SR_KEMIP_XVAL, ki_kx_get_msgbuf, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("kx"), str_init("get_msglen"), + SR_KEMIP_INT, ki_kx_get_msglen, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:0972e045: crypto: event route to allow encrypting/decrypting net i/o traffic
by Daniel-Constantin Mierla 29 May '20

29 May '20

Module: kamailio Branch: master Commit: 0972e0455d2514846e82a705ef261fc5d6798cb5 URL: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-29T10:40:44+02:00 crypto: event route to allow encrypting/decrypting net i/o traffic - work in progress --- Added: src/modules/crypto/crypto_evcb.c Added: src/modules/crypto/crypto_evcb.h Modified: src/modules/crypto/crypto_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc… Patch: https://github.com/kamailio/kamailio/commit/0972e0455d2514846e82a705ef261fc…

1 0

git:master:df2fa2c5: misc: examples/kemi - fixes to the python script
by Torrey Searle 29 May '20

29 May '20

Module: kamailio Branch: master Commit: df2fa2c5589bd5f651e814e32e2edf00c23ffebc URL: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0… Author: Torrey Searle <tsearle(a)voxbone.com> Committer: Torrey Searle <tsearle(a)voxbone.com> Date: 2020-05-29T09:30:56+02:00 misc: examples/kemi - fixes to the python script remove dependency on Router.Logger remove ; fix comment ref exit() --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0… Patch: https://github.com/kamailio/kamailio/commit/df2fa2c5589bd5f651e814e32e2edf0…

1 0

[kamailio/kamailio] dispatcher: rework attrs parameter in rpc 'add' command (#2339)
by Federico Cabiddu 29 May '20

29 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fixed attrs parameters handling i rpc 'add' command. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2339 -- Commit Summary -- * dispatcher: rework attrs parameter in rpc 'add' command -- File Changes -- M src/modules/dispatcher/dispatch.c (4) M src/modules/dispatcher/dispatcher.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2339.patch https://github.com/kamailio/kamailio/pull/2339.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/2339

3 7

git:master:41714a49: dispatcher: rework attrs parameter in rpc 'add' command
by Henning Westerholt 29 May '20

29 May '20

Module: kamailio Branch: master Commit: 41714a49e88800378db37670fbc22cafb7eca81a URL: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-29T08:41:44+02:00 dispatcher: rework attrs parameter in rpc 'add' command --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… Patch: https://github.com/kamailio/kamailio/commit/41714a49e88800378db37670fbc22ca… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 8cff6cdb56..d859dc3907 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2426,10 +2426,6 @@ int ds_add_dst(int group, str *address, int flags, str *attrs) setn = _ds_list_nr; priority = 0; - if (attrs->len == 0) { - attrs->s = 0; - } - *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index b2693a2947..836038442f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1798,15 +1798,19 @@ static const char *dispatcher_rpc_add_doc[2] = { */ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { - int group, flags; + int group, flags, nparams; str dest; - str attrs; + str attrs; flags = 0; - if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) { + nparams = rpc->scan(ctx, "dS*dS", &group, &dest, &flags, &attrs); + if(nparams < 2) { rpc->fault(ctx, 500, "Invalid Parameters"); return; + } else if (nparams < 3) { + attrs.s = 0; + attrs.len = 0; } if(ds_add_dst(group, &dest, flags, &attrs) != 0) {

1 0

congestion control priority for priority based dispatching
by Julien Chavanton 28 May '20

28 May '20

Hi Folks, Just found another simple use case of the dispatcher latency stats. Just shraing this idea of a feature I want to contribute. When using dispatcher algorithm 8: “8” - select destination sorted by priority attribute value (serial forking ordered by priority). If the gateway as the attribute, the priority becomes the estimated latency. cc-priority - The dispatcher would automatically prioritize the closest one. - If a gateway is becoming unresponsive it will automatically become de prioritize. Consider this real life scenario where you have gateways in East and West Coast Example URI: sip:28.71.19.140 FLAGS: AP PRIORITY: 10 ATTRS: { BODY: cc_priority=1 } LATENCY: { AVG: 84.001000 STD: 0.062000 EST: 84.001000 (high == low priority) MAX: 93 TIMEOUT: 0 URI: sip:28.71.16.140 FLAGS: AP PRIORITY: 10 ATTRS: { BODY: cc_priority=1 } LATENCY: { AVG: 29.110000 STD: 2.383000 EST: 31.999000 (low == high priority) MAX: 1499 TIMEOUT: 1 Another major improvement to all of this would be to gather stats on INVITE <> 100 to have a very accurate latency estimation even if the gateway does not support SIP OPTIONS pings

3 3

[kamailio/kamailio] Cannot set alias from substdef/environment (#2310)
by Mathias Brodala 28 May '20

28 May '20

### Description I tried to set the `alias` configuration option using an ID set by `#!substdef` but this leads to `grep_sock_info()` to fail, falling back to `corex_check_self()` and failing altogether finally. ### Troubleshooting #### Reproduction The basic setup given `BASE_HOST=example.org`: ``` #!substdef "/BASE_HOST/$env(BASE_HOST)/" alias="BASE_HOST" listen=tcp:0.0.0.0:80 route[AUTH] { # ... if (from_uri!=myself && uri!=myself) { sl_send_reply("403","Not relaying"); exit; } return; } ``` With this, any properly authenticated `REGISTER` call leads to a `403 Not Relaying`. However, this works perfectly fine if I use a static value instead: ``` alias=example.org ``` #### Log Messages ``` kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 12(17) DEBUG: <core> [core/forward.c:412]: check_self(): host != me kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:200]: corex_check_self(): check self for: 0:example.org:5060 kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:227]: corex_check_self(): no match found kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 12(17) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 12(17) DEBUG: <core> [core/forward.c:412]: check_self(): host != me kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:200]: corex_check_self(): check self for: 0:example.org:5060 kamailio_1 | 12(17) DEBUG: corex [corex_lib.c:227]: corex_check_self(): no match found ``` Output with the static value: ``` kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:628]: grep_sock_info(): checking if host==us: 11==7 && [example.org] == [0.0.0.0] kamailio_1 | 11(16) DEBUG: <core> [core/socket_info.c:635]: grep_sock_info(): checking if port 80 (advertise 0) matches port 5060 ``` ### Possible Solutions Right now I need to work around this issue by including a separate `kamailio-aliases.cfg` file which must then be provided in each environment. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 5.3.1 ``` * **Operating System**:  Using the Docker image `kamailio/kamailio:5.3.3-xenial`. Info from the Docker host: ``` # uname -a Linux ubuntu-s-1vcpu-1gb-fra1-01-sip 4.4.0-177-generic #207-Ubuntu SMP Mon Mar 16 01:16:10 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux # lsb_release -a No LSB modules are available. Distributor ID: Ubuntu Description: Ubuntu 16.04.6 LTS Release: 16.04 Codename: xenial ``` -- 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/2310

2 7

git:master:92648988: kazoo: avoid unnecessary casts for kemi exports
by Daniel-Constantin Mierla 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 92648988694970bc7b29a56814c935421d362cfa URL: https://github.com/kamailio/kamailio/commit/92648988694970bc7b29a56814c9354… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-28T11:36:24+02:00 kazoo: avoid unnecessary casts for kemi exports --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/92648988694970bc7b29a56814c9354… Patch: https://github.com/kamailio/kamailio/commit/92648988694970bc7b29a56814c9354… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 7c9482e270..8076315dfd 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1242,21 +1242,21 @@ int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, c return -1; } - return ki_kz_amqp_publish(msg, (char*)&exchange_s, (char*)&routing_key_s, (char*)&pl_s); + return ki_kz_amqp_publish(msg, &exchange_s, &routing_key_s, &pl_s); }; -int ki_kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload) +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload) { char *pl = ((str*)payload)->s; struct json_object *j = json_tokener_parse(pl); if (j==NULL) { - LM_ERR("empty or invalid JSON payload : %.*s\n", ((str*)payload)->len, ((str*)payload)->s); + LM_ERR("empty or invalid JSON payload : %.*s\n", payload->len, payload->s); return -1; } - + json_object_put(j); - return kz_amqp_pipe_send((str*)exchange, (str*)routing_key, (str*)payload); + return kz_amqp_pipe_send(exchange, routing_key, payload); } int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload) @@ -1801,16 +1801,16 @@ kz_amqp_exchange_binding_ptr kz_amqp_exchange_binding_from_json(json_object* JOb int kz_amqp_subscribe(struct sip_msg* msg, char* payload) { str payload_s = STR_NULL; - + if (fixup_get_svalue(msg, (gparam_p)payload, &payload_s) != 0) { LM_ERR("cannot get payload value\n"); return -1; } - return ki_kz_amqp_subscribe(msg, (char*)(&payload_s)); + return ki_kz_amqp_subscribe(msg, &payload_s); } -int ki_kz_amqp_subscribe(struct sip_msg* msg, char* payload) +int ki_kz_amqp_subscribe(struct sip_msg* msg, str* payload) { str exchange_s = STR_NULL; str queue_s = STR_NULL; @@ -1833,12 +1833,11 @@ int ki_kz_amqp_subscribe(struct sip_msg* msg, char* payload) kz_amqp_bind_ptr bind = NULL; kz_amqp_binding_ptr binding = NULL; - char* pl = ((str*)payload)->s; + char* pl = payload->s; json_obj = kz_json_parse(pl); if (json_obj == NULL) return -1; - json_extract_field("exchange", exchange_s); json_extract_field("queue", queue_s); diff --git a/src/modules/kazoo/kz_amqp.h b/src/modules/kazoo/kz_amqp.h index 1ca3e5447f..cf8333acad 100644 --- a/src/modules/kazoo/kz_amqp.h +++ b/src/modules/kazoo/kz_amqp.h @@ -274,11 +274,11 @@ int kz_amqp_add_connection(modparam_t type, void* val); int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_publish_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* _pub_flags); -int ki_kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); +int ki_kz_amqp_publish(sip_msg_t* msg, str* exchange, str* routing_key, str* payload); int kz_amqp_query(struct sip_msg* msg, char* exchange, char* routing_key, char* payload, char* dst); int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, char* payload); int kz_amqp_subscribe(struct sip_msg* msg, char* payload); -int ki_kz_amqp_subscribe(struct sip_msg* msg, char* payload); +int ki_kz_amqp_subscribe(sip_msg_t* msg, str* payload); int kz_amqp_subscribe_simple(struct sip_msg* msg, char* exchange, char* exchange_type, char* queue_name, char* routing_key); int kz_amqp_encode(struct sip_msg* msg, char* unencoded, char* encoded); int kz_amqp_encode_ex(str* unencoded, pv_value_p dst_val);

1 0

git:master:b68ae9f3: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 28 May '20

28 May '20

Module: kamailio Branch: master Commit: b68ae9f333a2664b240232097c1a9aeac5e674b3 URL: https://github.com/kamailio/kamailio/commit/b68ae9f333a2664b240232097c1a9ae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-28T10:01:16+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/b68ae9f333a2664b240232097c1a9ae… Patch: https://github.com/kamailio/kamailio/commit/b68ae9f333a2664b240232097c1a9ae…

1 0

git:master:157f32a2: textops: added functions to remove or test headers with var parameters
by Daniel-Constantin Mierla 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 157f32a26089de16d954e9722c25e4d4c2d52461 URL: https://github.com/kamailio/kamailio/commit/157f32a26089de16d954e9722c25e4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-28T09:28:41+02:00 textops: added functions to remove or test headers with var parameters --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/157f32a26089de16d954e9722c25e4d… Patch: https://github.com/kamailio/kamailio/commit/157f32a26089de16d954e9722c25e4d…

1 0

git:master:948e1e5f: textops: docs for functions to remove or test headers with variables
by Daniel-Constantin Mierla 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 948e1e5f354e436d9216b66700ea8b3c45fd14d1 URL: https://github.com/kamailio/kamailio/commit/948e1e5f354e436d9216b66700ea8b3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-28T09:46:09+02:00 textops: docs for functions to remove or test headers with variables --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/948e1e5f354e436d9216b66700ea8b3… Patch: https://github.com/kamailio/kamailio/commit/948e1e5f354e436d9216b66700ea8b3…

1 0

git:master:9d6c274b: core: exposed kemi function to remove a header by name
by Daniel-Constantin Mierla 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 9d6c274b043f9cc548addb3204f2f8f18d62db8a URL: https://github.com/kamailio/kamailio/commit/9d6c274b043f9cc548addb3204f2f8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-28T09:26:43+02:00 core: exposed kemi function to remove a header by name --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/9d6c274b043f9cc548addb3204f2f8f… Patch: https://github.com/kamailio/kamailio/commit/9d6c274b043f9cc548addb3204f2f8f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 2a63279795..3cbeee6d08 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1991,7 +1991,7 @@ static int sr_kemi_hdr_append_after(sip_msg_t *msg, str *txt, str *hname) /** * */ -static int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) +int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname) { struct lump* anchor; hdr_field_t *hf; diff --git a/src/core/kemi.h b/src/core/kemi.h index dd7d4bf50b..6493ab5009 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -225,4 +225,8 @@ sr_kemi_t* sr_kemi_exports_get_pv(void); #define SR_KEMI_XVAL_NULL_ZERO 3 void sr_kemi_xval_null(sr_kemi_xval_t *xval, int rmode); void sr_kemi_xval_free(sr_kemi_xval_t *xval); + +/* functions exported to kemi that are used in other places */ +int sr_kemi_hdr_remove(sip_msg_t *msg, str *hname); + #endif

1 0

[kamailio/kamailio] dispatcher: add attrs param to rpc 'add' call (#2336)
by Federico Cabiddu 28 May '20

28 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Expands the rpc 'add' command allowing to specify the "attrs" body. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2336 -- Commit Summary -- * dispatcher: add attrs param to rpc 'add' call -- File Changes -- M src/modules/dispatcher/dispatch.c (11) M src/modules/dispatcher/dispatch.h (2) M src/modules/dispatcher/dispatcher.c (5) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2336.patch https://github.com/kamailio/kamailio/pull/2336.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/2336

3 7

git:master:0feab05b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 0feab05b614ef1009e2e8cca1fce913b8f3357ef URL: https://github.com/kamailio/kamailio/commit/0feab05b614ef1009e2e8cca1fce913… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-28T07:16:14+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/0feab05b614ef1009e2e8cca1fce913… Patch: https://github.com/kamailio/kamailio/commit/0feab05b614ef1009e2e8cca1fce913… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index e7d76ca205..1440526059 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1572,12 +1572,15 @@ kamcmd dispatcher.ping_active 0 * _group_: destination group id * _address_: address of the destination in the _group_ * _flags_ (optional): as described in the list file format, default 0 + * _attrs_ (optional): as described in the list file format, default + "" Example: ... -# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ +# prototype: kamcmd dispatcher.add _group_ _address_ _flags_ _attrs_ kamcmd dispatcher.add 2 sip:127.0.0.1:5080 kamcmd dispatcher.add 3 sip:127.0.0.1:5075 8 +kamcmd dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 ... 5.7. dispatcher.remove

1 0

git:master:2e842e9c: dispatcher: add attrs param to rpc 'add' call
by Federico Cabiddu 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 2e842e9c11b136270b56b2b48a0364a94749c4ed URL: https://github.com/kamailio/kamailio/commit/2e842e9c11b136270b56b2b48a0364a… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-26T10:24:58+02:00 dispatcher: add attrs param to rpc 'add' call --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e842e9c11b136270b56b2b48a0364a… Patch: https://github.com/kamailio/kamailio/commit/2e842e9c11b136270b56b2b48a0364a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b5d56d405a..8cff6cdb56 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2419,15 +2419,16 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) } /* add dispatcher entry to in-memory dispatcher list */ -int ds_add_dst(int group, str *address, int flags) +int ds_add_dst(int group, str *address, int flags, str *attrs) { int setn, priority; - str attrs; setn = _ds_list_nr; priority = 0; - attrs.s = 0; - attrs.len = 0; + + if (attrs->len == 0) { + attrs->s = 0; + } *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); @@ -2436,7 +2437,7 @@ int ds_add_dst(int group, str *address, int flags) ds_iter_set(_ds_list, &ds_add_dest_cb, NULL); // add new destination - if(add_dest2list(group, *address, flags, priority, &attrs, + if(add_dest2list(group, *address, flags, priority, attrs, *next_idx, &setn) != 0) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode==1) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index ee4ea0b760..2bd63dc64b 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -140,7 +140,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit, int mode); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_update_dst(struct sip_msg *msg, int upos, int mode); -int ds_add_dst(int group, str *address, int flags); +int ds_add_dst(int group, str *address, int flags, str *attrs); int ds_remove_dst(int group, str *address); int ds_update_state(sip_msg_t *msg, int group, str *address, int state, ds_rctx_t *rctx); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 2a566ab730..b2693a2947 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1800,15 +1800,16 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { int group, flags; str dest; + str attrs; flags = 0; - if(rpc->scan(ctx, "dS*d", &group, &dest, &flags) < 2) { + if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) { rpc->fault(ctx, 500, "Invalid Parameters"); return; } - if(ds_add_dst(group, &dest, flags) != 0) { + if(ds_add_dst(group, &dest, flags, &attrs) != 0) { rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; } diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b872adc156..984b53258d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1938,15 +1938,19 @@ DEST: { <listitem><para>_flags_ (optional): as described in the list file format, default 0</para></listitem> + <listitem><para>_attrs_ (optional): as described in the list file format, + default ""</para></listitem> + </itemizedlist> <para> Example: </para> <programlisting format="linespecific"> ... -# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ +# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _attrs_ &sercmd; dispatcher.add 2 sip:127.0.0.1:5080 &sercmd; dispatcher.add 3 sip:127.0.0.1:5075 8 +&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 ... </programlisting> </section>

1 0

git:master:1d391e22: Merge pull request #2336 from kamailio/ds_add_attrs
by GitHub 28 May '20

28 May '20

Module: kamailio Branch: master Commit: 1d391e22dc88b64f8f18f52005dc610f009a96e0 URL: https://github.com/kamailio/kamailio/commit/1d391e22dc88b64f8f18f52005dc610… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-28T07:14:56+02:00 Merge pull request #2336 from kamailio/ds_add_attrs dispatcher: add attrs param to rpc 'add' call --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d391e22dc88b64f8f18f52005dc610… Patch: https://github.com/kamailio/kamailio/commit/1d391e22dc88b64f8f18f52005dc610… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b5d56d405a..8cff6cdb56 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2419,15 +2419,16 @@ void ds_add_dest_cb(ds_set_t *node, int i, void *arg) } /* add dispatcher entry to in-memory dispatcher list */ -int ds_add_dst(int group, str *address, int flags) +int ds_add_dst(int group, str *address, int flags, str *attrs) { int setn, priority; - str attrs; setn = _ds_list_nr; priority = 0; - attrs.s = 0; - attrs.len = 0; + + if (attrs->len == 0) { + attrs->s = 0; + } *next_idx = (*crt_idx + 1) % 2; ds_avl_destroy(&ds_lists[*next_idx]); @@ -2436,7 +2437,7 @@ int ds_add_dst(int group, str *address, int flags) ds_iter_set(_ds_list, &ds_add_dest_cb, NULL); // add new destination - if(add_dest2list(group, *address, flags, priority, &attrs, + if(add_dest2list(group, *address, flags, priority, attrs, *next_idx, &setn) != 0) { LM_WARN("unable to add destination %.*s to set %d", address->len, address->s, group); if(ds_load_mode==1) { diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index ee4ea0b760..2bd63dc64b 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -140,7 +140,7 @@ int ds_select_dst_limit(sip_msg_t *msg, int set, int alg, uint32_t limit, int mode); int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_update_dst(struct sip_msg *msg, int upos, int mode); -int ds_add_dst(int group, str *address, int flags); +int ds_add_dst(int group, str *address, int flags, str *attrs); int ds_remove_dst(int group, str *address); int ds_update_state(sip_msg_t *msg, int group, str *address, int state, ds_rctx_t *rctx); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 2a566ab730..b2693a2947 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1800,15 +1800,16 @@ static void dispatcher_rpc_add(rpc_t *rpc, void *ctx) { int group, flags; str dest; + str attrs; flags = 0; - if(rpc->scan(ctx, "dS*d", &group, &dest, &flags) < 2) { + if(rpc->scan(ctx, "dS*d", &group, &dest, &flags, &attrs) < 3) { rpc->fault(ctx, 500, "Invalid Parameters"); return; } - if(ds_add_dst(group, &dest, flags) != 0) { + if(ds_add_dst(group, &dest, flags, &attrs) != 0) { rpc->fault(ctx, 500, "Adding dispatcher dst failed"); return; } diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b872adc156..984b53258d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1938,15 +1938,19 @@ DEST: { <listitem><para>_flags_ (optional): as described in the list file format, default 0</para></listitem> + <listitem><para>_attrs_ (optional): as described in the list file format, + default ""</para></listitem> + </itemizedlist> <para> Example: </para> <programlisting format="linespecific"> ... -# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ +# prototype: &sercmd; dispatcher.add _group_ _address_ _flags_ _attrs_ &sercmd; dispatcher.add 2 sip:127.0.0.1:5080 &sercmd; dispatcher.add 3 sip:127.0.0.1:5075 8 +&sercmd; dispatcher.add 3 sip:127.0.0.1:5075 0 duid=abc;socket=udp:127.0.0.1:5060 ... </programlisting> </section>

1 0

[kamailio/kamailio] Segfault in openssl on Xenial (#2274)
by Nathan 27 May '20

27 May '20

### Description Segfault in Kamailio when using mysql (over ssl) and tls listeners. We have a reproducible segfault with Kamailio on Ubuntu Xenial. The problems is revealed when two modules (db_mysql and tls) and both using the openssl library. The mysql module is using openssl indirectly, because the connection is encrypted by default when the server supports it. ### Troubleshooting #### Reproduction Install Kamailio with - tls listeners enabled - dispatcher module enabled, from mysql db Example configuration attached: In this case, reproduction with: - start kamailio - let dispatcher reload, for example via jsonrpc - make connection on tls, for example with `openssl s_connect` Kamailio will crash. #### Debugging Data Stack trace, with `libssl1.0.0-dbg` installed: ``` #0 0x0000000000000000 in ?? () #1 0x00007ff862d07b0d in getrn (lh=lh@entry=0x7ff8641eb7e8, data=data@entry=0x7ffe1f36e750, rhash=rhash@entry=0x7ffe1f36e6f0) at lhash.c:396 #2 0x00007ff862d0817a in lh_retrieve (lh=0x7ff8641eb7e8, data=data@entry=0x7ffe1f36e750) at lhash.c:248 #3 0x00007ff862d0a651 in int_thread_get_item (d=0x7ffe1f36e750) at err.c:500 #4 0x00007ff862d0b024 in ERR_get_state () at err.c:1023 #5 0x00007ff862d0b25f in ERR_clear_error () at err.c:743 #6 0x00007ff86305c67e in ssl23_accept (s=0x7ff864a282d0) at s23_srvr.c:157 #7 0x00007ff860b70d86 in tls_accept (c=0x7ff864af8810, error=0x7ffe1f36eb30) at tls_server.c:422 #8 0x00007ff860b7a486 in tls_read_f (c=0x7ff864af8810, flags=0x7ffe1f38eedc) at tls_server.c:1116 #9 0x0000000000625ac2 in tcp_read_headers (c=0x7ff864af8810, read_flags=0x7ffe1f38eedc) at core/tcp_read.c:469 #10 0x000000000062d05d in tcp_read_req (con=0x7ff864af8810, bytes_read=0x7ffe1f38eed8, read_flags=0x7ffe1f38eedc) at core/tcp_read.c:1496 #11 0x0000000000631c42 in handle_io (fm=0x7ff885734520, events=1, idx=-1) at core/tcp_read.c:1804 #12 0x0000000000620500 in io_wait_loop_epoll (h=0xae0200 <io_w>, t=2, repeat=0) at core/io_wait.h:1065 #13 0x0000000000633adb in tcp_receive_loop (unix_sock=26) at core/tcp_read.c:1974 #14 0x000000000051a9a1 in tcp_init_children () at core/tcp_main.c:4853 #15 0x000000000042620e in main_loop () at main.c:1745 #16 0x000000000042ca76 in main (argc=7, argv=0x7ffe1f38f578) at main.c:2696 ``` #### Log Messages ``` 2020-04-05T01:27:37.965778+02:00 nathancmp01 kernel: [432825.787355] kamailio[6296]: segfault at 0 ip (null) sp 00007ffe4cdaf248 error 14 in kamailio[400000+47b000] ``` #### SIP Traffic No SIP traffic needed, just a TLS connection. ### Possible Solutions Could not reproduce with Kamailio 5.3.3 on Ubuntu Bionic nor Debian Buster. Both are using openssl 1.1.x, so I guess that fixes the problem. But Xenial is still on 1.0.2g... ### Additional Information Tested with Kamailio 5.2 and 5.3.3. * **Operating System**: Repro on: - Ubuntu Xenial No repro on: - Ubuntu Bionic - Debian Buster -- 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/2274

2 19

git:master:9b6ec0a4: core: added --debug=val command line parameter
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 9b6ec0a4912a617239395563cdd29233f65cb57d URL: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T13:36:42+02:00 core: added --debug=val command line parameter - set the value for debug global parameter from command line, allows negative values corresponding to L_XYZ levels - alternative to -d which operated by incresing debug level starting from 0 --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… Patch: https://github.com/kamailio/kamailio/commit/9b6ec0a4912a617239395563cdd2923… --- diff --git a/src/main.c b/src/main.c index 8926308ca5..e57bfa40f8 100644 --- a/src/main.c +++ b/src/main.c @@ -169,7 +169,8 @@ Options:\n\ -b nr Maximum receive buffer size which will not be exceeded by\n\ auto-probing procedure even if OS allows\n\ -c Check configuration file for syntax errors\n\ - -d Debugging mode (multiple -d increase the level)\n\ + -d Debugging level control (multiple -d to increase the level from 0)\n\ + --debug=val Debugging level value\n\ -D Control how daemonize is done:\n\ -D..do not fork (almost) anyway;\n\ -DD..do not daemonize creator;\n\ @@ -1931,6 +1932,7 @@ int main(int argc, char** argv) {"loadmodule", required_argument, 0, KARGOPTVAL + 5}, {"modparam", required_argument, 0, KARGOPTVAL + 6}, {"log-engine", required_argument, 0, KARGOPTVAL + 7}, + {"debug", required_argument, 0, KARGOPTVAL + 8}, {0, 0, 0, 0 } }; @@ -1992,6 +1994,14 @@ int main(int argc, char** argv) case KARGOPTVAL+7: ksr_slog_init(optarg); break; + case KARGOPTVAL+8: + debug_flag = 1; + default_core_cfg.debug=(int)strtol(optarg, &tmp, 10); + if ((tmp==0) || (*tmp)){ + LM_ERR("bad debug level value: %s\n", optarg); + goto error; + } + break; default: if (c == 'h' || (optarg && strcmp(optarg, "-h") == 0)) { @@ -2153,6 +2163,7 @@ int main(int argc, char** argv) case KARGOPTVAL+5: case KARGOPTVAL+6: case KARGOPTVAL+7: + case KARGOPTVAL+8: break; /* long options */

1 0

git:master:531e288b: evapi: use msg->ldv.vdata for local env data instead of hdr date workaround
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 531e288bc981de536023697e8181cc5589b4d14b URL: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T09:21:24+02:00 evapi: use msg->ldv.vdata for local env data instead of hdr date workaround --- Modified: src/modules/evapi/evapi_dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… Patch: https://github.com/kamailio/kamailio/commit/531e288bc981de536023697e8181cc5… --- diff --git a/src/modules/evapi/evapi_dispatch.h b/src/modules/evapi/evapi_dispatch.h index fa6135ae22..23b4c2565c 100644 --- a/src/modules/evapi/evapi_dispatch.h +++ b/src/modules/evapi/evapi_dispatch.h @@ -46,9 +46,9 @@ int pv_get_evapi(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_set_evapi(sip_msg_t *msg, pv_param_t *param, int op, pv_value_t *val); -/* set evapi env to shortcut of hdr date - not used in faked msg */ -#define evapi_set_msg_env(_msg, _evenv) do { _msg->date=(hdr_field_t*)_evenv; } while(0) -#define evapi_get_msg_env(_msg) ((evapi_env_t*)_msg->date) +/* set/get evapi env */ +#define evapi_set_msg_env(_msg, _evenv) do { _msg->ldv.vdata=(void*)_evenv; } while(0) +#define evapi_get_msg_env(_msg) ((evapi_env_t*)_msg->ldv.vdata) int evapi_cfg_close(sip_msg_t *msg); int evapi_set_tag(sip_msg_t* msg, str* stag);

1 0

git:master:5cb28a47: core: parser - added vdata void* field inside msg_ldata_t structure
by Daniel-Constantin Mierla 27 May '20

27 May '20

Module: kamailio Branch: master Commit: 5cb28a47cade4b3d20e37ed38c74e575f7343386 URL: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-27T09:20:05+02:00 core: parser - added vdata void* field inside msg_ldata_t structure - useful to link to custom local data on message processing --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… Patch: https://github.com/kamailio/kamailio/commit/5cb28a47cade4b3d20e37ed38c74e57… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 973b5702b4..aa35fa5185 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -268,6 +268,7 @@ typedef struct ocd_flow { * - add to msg_ldata_reset() if a field uses dynamic memory */ typedef struct msg_ldata { ocd_flow_t flow; + void *vdata; } msg_ldata_t; /*! \brief The SIP message */

1 0

git:master:2a920bde: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 2a920bde45b78d7f31942590ed76a3e7b509213e URL: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-26T16:01:15+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e… Patch: https://github.com/kamailio/kamailio/commit/2a920bde45b78d7f31942590ed76a3e…

1 0

git:master:35319cb5: corex: docs for dns_cache parameter
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 35319cb5c0cac7fd656d86e7419dbd3e497fcd92 URL: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:59:01+02:00 corex: docs for dns_cache parameter --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… Patch: https://github.com/kamailio/kamailio/commit/35319cb5c0cac7fd656d86e7419dbd3… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index f9572b54f0..203ada5d2f 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -93,6 +93,60 @@ modparam("corex", "alias_subdomains", "kamailio.org") modparam("corex", "alias_subdomains", "udp:sip-router.org:5060") ... +</programlisting> + </example> + </section> + <section id="corex.p.dns_cache"> + <title><varname>dns_cache</varname> (string)</title> + <para> + Add A or AAAA records to internal DNS cache at startup. It can be set + many times to add more than one record. + </para> + <para> + The format of the value follows the SIP params style: + "attr1=val1;attr2=val2;...". The attributes can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>type</emphasis> - it can be "A" (IPv4) or "AAAA" (IPv6) + </para> + </listitem> + <listitem> + <para> + <emphasis>name</emphasis> - the domain name + </para> + </listitem> + <listitem> + <para> + <emphasis>addr</emphasis> - the IP address + </para> + </listitem> + <listitem> + <para> + <emphasis>ttl</emphasis> - TTL value + </para> + </listitem> + <listitem> + <para> + <emphasis>flags</emphasis> - can be: 1 - the domain is unresolvable + (like blacklisted); 2 - the record is permanent (never times out, + never deleted, never overwritten) + </para> + </listitem> + </itemizedlist> + <para> + <emphasis> + Default value is <quote>NULL</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>dns_cache</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("corex", "dns_cache", "type=A;name=kamailio.org;addr=193.22.119.66;ttl=3600000;flags=0") +modparam("corex", "dns_cache", "type=AAAA;name=kamailio.org;addr=2a00:d60:0:400::2;ttl=3600000;flags=0") +... </programlisting> </example> </section>

1 0

git:master:12b8bf9a: corex: new param dns_cache to add values to internal dns cache
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 12b8bf9a9c6e84d9b1dadaa08195a9c56b24cbe4 URL: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:45:10+02:00 corex: new param dns_cache to add values to internal dns cache - it can be set many times - the value is a param-like string with the prototype "type=rectype;name=domain;addr=ip;ttl=ival;flags=ival" - type valye can be 'A' (IPv4) or 'AAAA' (IPv6) - flags can be: 1 - the domain is unresolvable (like blacklisted) 2 - the record is permanent (never times out, never deleted, never overwritten) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… Patch: https://github.com/kamailio/kamailio/commit/12b8bf9a9c6e84d9b1dadaa08195a9c… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index c0759e6ded..1f9abd497c 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -31,7 +31,9 @@ #include "../../core/pvar.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" +#include "../../core/dns_cache.h" #include "../../core/parser/parse_uri.h" +#include "../../core/parser/parse_param.h" #include "corex_lib.h" #include "corex_rpc.h" @@ -67,6 +69,7 @@ static int w_is_faked_msg(sip_msg_t *msg, char *p1, char *p2); static int fixup_file_op(void** param, int param_no); int corex_alias_subdomains_param(modparam_t type, void *val); +int corex_dns_cache_param(modparam_t type, void *val); static int mod_init(void); static int child_init(int); @@ -141,6 +144,8 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"alias_subdomains", STR_PARAM|USE_FUNC_PARAM, (void*)corex_alias_subdomains_param}, + {"dns_cache", PARAM_STR|USE_FUNC_PARAM, + (void*)corex_dns_cache_param}, {"nio_intercept", INT_PARAM, &nio_intercept}, {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, @@ -304,9 +309,88 @@ int corex_alias_subdomains_param(modparam_t type, void *val) return corex_add_alias_subdomains((char*)val); error: return -1; +} + +int corex_dns_cache_param(modparam_t type, void *val) +{ + str sval; + param_t* params_list = NULL; + param_hooks_t phooks; + param_t *pit=NULL; + str dns_name = STR_NULL; + str dns_addr = STR_NULL; + unsigned short dns_type = 0; + int dns_ttl = 0; + int dns_flags = 0; + + if(val==NULL) { + LM_ERR("invalid parameter\n"); + goto error; + } + sval = *((str*)val); + if(sval.s==NULL || sval.len<=0) { + LM_ERR("invalid parameter value\n"); + goto error; + } + + if(sval.s[sval.len-1]==';') { + sval.len--; + } + if (parse_params(&sval, CLASS_ANY, &phooks, &params_list)<0) { + return -1; + } + + for (pit = params_list; pit; pit=pit->next) { + if (pit->name.len==4 + && strncasecmp(pit->name.s, "name", 4)==0) { + dns_name = pit->body; + } else if (pit->name.len==4 + && strncasecmp(pit->name.s, "addr", 4)==0) { + dns_addr = pit->body; + } else if (pit->name.len==4 + && strncasecmp(pit->name.s, "type", 4)==0) { + if((pit->body.len == 1) && ((pit->body.s[0]=='a') + || (pit->body.s[0]=='A'))) { + dns_type = T_A; + } else if((pit->body.len == 4) + && strncasecmp(pit->name.s, "aaaa", 4)==0) { + dns_type = T_AAAA; + } + } else if(pit->name.len==3 + && strncasecmp(pit->name.s, "ttl", 3)==0) { + if(dns_ttl==0) { + if (str2sint(&pit->body, &dns_ttl) < 0) { + LM_ERR("invalid ttl: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } else if(pit->name.len==5 + && strncasecmp(pit->name.s, "flags", 5)==0) { + if(dns_flags==0) { + if (str2sint(&pit->body, &dns_flags) < 0) { + LM_ERR("invalid flags: %.*s\n", pit->body.len, pit->body.s); + return -1; + } + } + } + } + + if (dns_cache_add_record(dns_type, + &dns_name, + dns_ttl, + &dns_addr, + 0 /* priority */, + 0 /* weight */, + 0 /* port */, + dns_flags) == 0) { + return 0; + } +error: + return -1; } + typedef struct _msg_iflag_name { str name; int value;

1 0

git:master:d2906da9: tls: better log messages when failing to create ssl ctx
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: d2906da97d2429bfdff089203f933de2d282a86d URL: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T15:05:15+02:00 tls: better log messages when failing to create ssl ctx --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… Patch: https://github.com/kamailio/kamailio/commit/d2906da97d2429bfdff089203f933de… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 3932141f0e..a8859c4a31 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1036,7 +1036,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) d->ctx[i] = SSL_CTX_new((SSL_METHOD*)ssl_methods[d->method - 1]); } if (d->ctx[i] == NULL) { - ERR("%s: Cannot create SSL context\n", tls_domain_str(d)); + unsigned long e = 0; + e = ERR_peek_last_error(); + ERR("%s: Cannot create SSL context [%d] (%lu: %s / %s)\n", + tls_domain_str(d), i, e, ERR_error_string(e, NULL), + ERR_reason_error_string(e)); return -1; } if(d->method>TLS_USE_TLSvRANGE) { @@ -1046,7 +1050,11 @@ static int ksr_tls_fix_domain(tls_domain_t* d, tls_domain_t* def) /* libssl >= 1.1.0 */ d->ctx[i] = SSL_CTX_new(sr_tls_methods[d->method - 1].TLSMethod); if (d->ctx[i] == NULL) { - ERR("%s: Cannot create SSL context\n", tls_domain_str(d)); + unsigned long e = 0; + e = ERR_peek_last_error(); + ERR("%s: Cannot create SSL context [%d] (%lu: %s / %s)\n", + tls_domain_str(d), i, e, ERR_error_string(e, NULL), + ERR_reason_error_string(e)); return -1; } if(d->method>TLS_USE_TLSvRANGE) {

1 0

git:master:3e7278f2: tls: Makefile - option to link against libssl static libs
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 3e7278f28c43b830a197e2f7b212ec6f06e5acbf URL: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T14:56:47+02:00 tls: Makefile - option to link against libssl static libs --- Modified: src/modules/tls/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… Patch: https://github.com/kamailio/kamailio/commit/3e7278f28c43b830a197e2f7b212ec6… --- diff --git a/src/modules/tls/Makefile b/src/modules/tls/Makefile index 1505bc64ea..f3c15bb724 100644 --- a/src/modules/tls/Makefile +++ b/src/modules/tls/Makefile @@ -8,6 +8,13 @@ include ../../Makefile.defs auto_gen= NAME=tls.so +# set to yes when wanting to link with static libraries +LIBSSL_STATIC ?= no +# set to yes when wanting to link with static libraries compiled from source +LIBSSL_STATIC_SRCLIB ?= no +# set to the path of the folder with static libraries compiled from source +LIBSSL_STATIC_SRCPATH ?= /usr/local/src/openssl + ifeq ($(CROSS_COMPILE),) SSL_BUILDER=$(shell \ if pkg-config --exists libssl; then \ @@ -16,8 +23,21 @@ SSL_BUILDER=$(shell \ endif ifneq ($(SSL_BUILDER),) +ifneq ($(LIBSSL_STATIC),yes) DEFS += $(shell $(SSL_BUILDER) --cflags) LIBS += $(shell $(SSL_BUILDER) --libs) +else +ifneq ($(LIBSSL_STATIC_SRCLIB),yes) + ## when static libs (*.a) from packages are compiled with -fPIC + DEFS += $(shell $(SSL_BUILDER) --cflags) + LIBS += $(shell $(SSL_BUILDER) --libs-only-L) + LIBS += -l:libssl.a -l:libcrypto.a -l:libz.a -l:libdl.a +else + ## when linking against static libs compiled from sources + DEFS += -I$(LIBSSL_STATIC_SRCPATH)/include + LIBS += $(LIBSSL_STATIC_SRCPATH)/libssl.a $(LIBSSL_STATIC_SRCPATH)/libcrypto.a +endif # ifneq ($(LIBSSL_STATIC_SRCLIB),yes) +endif # ifneq ($(LIBSSL_STATIC),yes) else DEFS += -I$(LOCALBASE)/ssl/include LIBS += -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib \

1 0

git:master:8893e6f2: core: async task logging on no callback
by Daniel-Constantin Mierla 26 May '20

26 May '20

Module: kamailio Branch: master Commit: 8893e6f2b30577b065f11a406faf5c5935714f78 URL: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-26T09:24:17+02:00 core: async task logging on no callback --- Modified: src/core/async_task.c --- Diff: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… Patch: https://github.com/kamailio/kamailio/commit/8893e6f2b30577b065f11a406faf5c5… --- diff --git a/src/core/async_task.c b/src/core/async_task.c index ee50412790..1045e0ab41 100644 --- a/src/core/async_task.c +++ b/src/core/async_task.c @@ -280,6 +280,8 @@ int async_task_run(int idx) LM_DBG("task executed [%p] (%p/%p)\n", (void*)ptask, (void*)ptask->exec, (void*)ptask->param); ptask->exec(ptask->param); + } else { + LM_DBG("task with no callback function - ignoring\n"); } shm_free(ptask); }

1 0

Re: [sr-dev] Fwd: RPC command to close all WS connections.
by Henning Westerholt 25 May '20

25 May '20

Hi, please keep the list in CC. Have you looked already into the ws_keepalive function? It uses another method of iterating over the ws_connection list. It iterates over a ws_connection_id list with an index variable and uses wsconn_get(..) to get the actual connection. Just guessing, but maybe this method works better for you. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: Andrey Deykunov <deykunov(a)gmail.com> Sent: Monday, May 25, 2020 5:26 PM To: Henning Westerholt <hw(a)skalatan.de> Subject: Re: [sr-dev] Fwd: RPC command to close all WS connections. Hi Henning, Thanks for your response. Kamailio has crashed when one of our scripts tried getting statistics about websocket module. As I see in core dump, shared memory was previously corrupted: GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html<http://gnu.org/licenses/gpl.html>> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/<http://www.gnu.org/software/gdb/bugs/>>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/<http://www.gnu.org/software/gdb/documentation/>>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 7234] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __strcmp_sse2_unaligned () at ../sysdeps/x86_64/multiarch/strcmp-sse2-unaligned.S:32 #0 __strcmp_sse2_unaligned () at ../sysdeps/x86_64/multiarch/strcmp-sse2-unaligned.S:32 #1 0x00007eff2ff2e2f5 in rpc_mod_print (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, mname=0x18e4aa9 "websocket", stats=0x18ffd70, flag=2) at mod_stats.c:117 #2 0x00007eff2ff2e0eb in rpc_mod_print_one (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, mname=0x18e4aa9 "websocket", pkg_stats=0x18fe3b0, shm_stats=0x18ffd70, flag=2) at mod_stats.c:159 #3 0x00007eff2ff2dee1 in rpc_mod_mem_stats_mode (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38, fmode=0) at mod_stats.c:239 #4 0x00007eff2ff2d84f in rpc_mod_mem_stats (rpc=0x7eff2f843540 <binrpc_callbacks>, ctx=0x7ffe484adb38) at mod_stats.c:251 #5 0x00007eff2f612c80 in process_rpc_req (buf=0x18e4a94 "\241\003\035Cw\274L\221\nmod.stats", size=36, bytes_needed=0x7ffe484adf80, sh=0x7ffe484adef0, saved_state=0x18f4a98) at binrpc_run.c:678 #6 0x00007eff2f60072f in handle_stream_read (s_c=0x18e4a60, idx=-1) at io_listener.c:511 #7 0x00007eff2f5fc121 in handle_io (fm=0x7effb341f0a0, events=1, idx=-1) at io_listener.c:706 #8 0x00007eff2f5fa93a in io_wait_loop_epoll (h=0x7eff2f843348 <io_h>, t=10, repeat=0) at ./../../core/io_wait.h:1062 #9 0x00007eff2f5ee62c in io_listen_loop (fd_no=2, cs_lst=0x17f9940) at io_listener.c:281 #10 0x00007eff2f62472c in mod_child (rank=0) at ctl.c:338 #11 0x0000000000638c14 in init_mod_child (m=0x7effb3297cd8, rank=0) at core/sr_module.c:780 #12 0x000000000063862d in init_mod_child (m=0x7effb32983a0, rank=0) at core/sr_module.c:776 #13 0x000000000063862d in init_mod_child (m=0x7effb3298840, rank=0) at core/sr_module.c:776 #14 0x000000000063862d in init_mod_child (m=0x7effb3298d50, rank=0) at core/sr_module.c:776 #15 0x000000000063862d in init_mod_child (m=0x7effb32991f0, rank=0) at core/sr_module.c:776 #16 0x000000000063862d in init_mod_child (m=0x7effb3299968, rank=0) at core/sr_module.c:776 #17 0x000000000063862d in init_mod_child (m=0x7effb3299fd8, rank=0) at core/sr_module.c:776 #18 0x000000000063862d in init_mod_child (m=0x7effb329a460, rank=0) at core/sr_module.c:776 #19 0x00000000006385b2 in init_child (rank=0) at core/sr_module.c:825 #20 0x000000000043140c in main_loop () at main.c:1753 #21 0x000000000043df6f in main (argc=9, argv=0x7ffe484b22b8) at main.c:2802 I assume that 'ws.close_all' could affect this corruption because failover service uses this command after node becomes passive. Also I'm using my slightly revised variant of ws_keepalive function with KEEPALIVE_MECHANISM_CONCHECK enabled. Perhaps, something went wrong while websocket connections were removed within this function: void ws_keepalive(unsigned int ticks, void *param) { int check_time = (int)time(NULL) - cfg_get(websocket, ws_cfg, keepalive_timeout); ws_connection_id_t *list_head = NULL; ws_connection_t *wsc = NULL; int i = 0; int idx = (int)(long)param; LM_INFO("Keepalive tick\n"); /* get an array of pointer to all ws connection */ list_head = wsconn_get_list_ids(idx); if(!list_head) return; while(list_head[i].id!=-1) { wsc = wsconn_get(list_head[i].id); if(wsc && wsc->last_used < check_time) { if(wsc->state == WS_S_CLOSING || wsc->awaiting_pong) { LM_WARN("forcibly closing connection\n"); wsconn_close_now(wsc); } else if (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_CONCHECK) { tcp_connection_t *con = tcpconn_get(wsc->id, 0, 0, 0, 0); if(con==NULL) { LM_INFO("tcp connection has been lost -> removing ws_conn\n"); if(wsconn_rm(wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); } else { if (con->state == S_CONN_BAD) { LM_INFO("tcp connection is bad and supposed to be removed\n"); if(wsconn_rm(wsc, WSCONN_EVENTROUTE_YES) < 0) LM_ERR("removing WebSocket connection\n"); con->send_flags.f |= SND_F_CON_CLOSE; con->timeout = get_ticks_raw(); } tcpconn_put(con); } } else { int opcode = (ws_keepalive_mechanism == KEEPALIVE_MECHANISM_PING) ? OPCODE_PING : OPCODE_PONG; ping_pong(wsc, opcode); } } if(wsc) { wsconn_put_id(list_head[i].id); } i++; } wsconn_put_list_ids(list_head); } Thanks, Andrey пн, 25 мая 2020 г. в 16:18, Henning Westerholt <hw(a)skalatan.de<mailto:hw@skalatan.de>>: Hi Andrey, as you know, there is an RPC command ws.close() and also a script function to close sessions remotely. So, it should be certainly possible to close the sessions over RPC. Not being the author of this particular module, it is hard to say why it crashes. Try the usual debugging techniques, e.g. gdb to find more clues. If you have a working version, please open a pull request. In case of more questions, just ask on this list again. Cheers, Henning -- Henning Westerholt – https://skalatan.de/blog/ Kamailio services – https://gilawa.com<https://gilawa.com/> From: sr-dev <sr-dev-bounces(a)lists.kamailio.org<mailto:sr-dev-bounces@lists.kamailio.org>> On Behalf Of Andrey Deykunov Sent: Monday, May 18, 2020 1:02 PM To: Kamailio (SER) - Development Mailing List <sr-dev(a)lists.kamailio.org<mailto:sr-dev@lists.kamailio.org>> Subject: [sr-dev] Fwd: RPC command to close all WS connections. ---------- Forwarded message --------- От: Andrey Deykunov <deykunov(a)gmail.com<mailto:deykunov@gmail.com>> Date: пн, 18 мая 2020 г. в 12:24 Subject: RPC command to close all WS connections. To: Daniel-Constantin Mierla <miconda(a)gmail.com<mailto:miconda@gmail.com>> Hi Daniel, We're using two nodes (active and passive) of our PBX server in production. When an active node becomes passive, we should forcibly close all WS connections, established by clients on this node. So, I've added 'ws.close_all' command to websocket module to let our failover service be able closing WS connections remotely. I've added the following code to ws_frame.c: void ws_rpc_close_all(rpc_t *rpc, void *ctx) { ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; int ret; list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc) { LM_WARN("Closing connection\n"); ret = close_connection(&wsc, LOCAL_CLOSE, 1000, str_status_normal_closure); wsc = *(++list); } wsconn_put_list(list_head); } but I think this code may be unsafe and could corrupt shared memory, because I've got some segfaults during failovers after adding this command. What do you think? Is it possible to close connections properly and safety for shared memory? Thanks, Andrey

1 0

Fwd: RPC command to close all WS connections.
by Andrey Deykunov 25 May '20

25 May '20

---------- Forwarded message --------- От: Andrey Deykunov <deykunov(a)gmail.com> Date: пн, 18 мая 2020 г. в 12:24 Subject: RPC command to close all WS connections. To: Daniel-Constantin Mierla <miconda(a)gmail.com> Hi Daniel, We're using two nodes (active and passive) of our PBX server in production. When an active node becomes passive, we should forcibly close all WS connections, established by clients on this node. So, I've added 'ws.close_all' command to websocket module to let our failover service be able closing WS connections remotely. I've added the following code to ws_frame.c: void ws_rpc_close_all(rpc_t *rpc, void *ctx) { ws_connection_t **list = NULL, **list_head = NULL; ws_connection_t *wsc = NULL; int ret; list_head = wsconn_get_list(); if(!list_head) return; list = list_head; wsc = *list_head; while(wsc) { LM_WARN("Closing connection\n"); ret = close_connection(&wsc, LOCAL_CLOSE, 1000 , str_status_normal_closure); wsc = *(++list); } wsconn_put_list(list_head); } but I think this code may be unsafe and could corrupt shared memory, because I've got some segfaults during failovers after adding this command. What do you think? Is it possible to close connections properly and safety for shared memory? Thanks, Andrey

2 1

[kamailio/kamailio] /var/run/kamailio/ owned by root after Kamailio start (#2334)
by arkadiam 25 May '20

25 May '20

Environment: ``` DISTRIB_ID=Ubuntu DISTRIB_RELEASE=16.04 DISTRIB_CODENAME=xenial DISTRIB_DESCRIPTION="Ubuntu 16.04.6 LTS" ``` Kamailio installed from: ``` /etc/apt/sources.list deb http://deb.kamailio.org/kamailio53 xenial main deb-src http://deb.kamailio.org/kamailio53 xenial main ``` After Kamailio start, ownership of `/var/run/kamailio/` and related files looks like: ``` # ls -l /var/run/kamailio/ total 4 srw-rw---- 1 kamailio kamailio 0 May 20 15:41 kamailio_ctl -rw-r--r-- 1 kamailio kamailio 5 May 20 15:41 kamailio.pid prw-rw---- 1 root root 0 May 20 15:41 kamailio_rpc.fifo srw-rw---- 1 root root 0 May 20 15:41 kamailio_rpc.sock # ls -ld /var/run/kamailio/ drwxr-x--- 2 root root 120 May 20 15:41 /var/run/kamailio/ ``` Note 'root' ownership. This causes these errors during Kamailio stop and probabaly some other issues too. ``` May 20 16:11:24 sip01 /usr/sbin/kamailio[5919]: ERROR: jsonrpcs [jsonrpcs_fifo.c:599]: jsonrpc_fifo_destroy(): FIFO stat failed: Permission denied May 20 16:11:24 sip01 /usr/sbin/kamailio[5919]: ERROR: jsonrpcs [jsonrpcs_sock.c:516]: jsonrpc_dgram_destroy(): socket stat failed: Permission denied May 20 16:11:24 sip01 /usr/sbin/kamailio[5919]: ERROR: ctl [ctl.c:390]: mod_destroy(): ERROR: ctl: could not delete unix socket /var/run/kamailio//kamailio_ctl: Permission denied (13) ``` To get the ownership right I have to modify `/lib/systemd/system/kamailio.service` and add: ``` User=kamailio Group=kamailio ``` Now ownership after start looks like bellow and stops are clean too. ``` # ls -l /var/run/kamailio/ total 4 srw-rw---- 1 kamailio kamailio 0 May 20 15:52 kamailio_ctl -rw-r--r-- 1 kamailio kamailio 5 May 20 15:52 kamailio.pid prw-rw---- 1 kamailio kamailio 0 May 20 15:52 kamailio_rpc.fifo srw-rw---- 1 kamailio kamailio 0 May 20 15:52 kamailio_rpc.sock # ls -ld /var/run/kamailio/ drwxr-x--- 2 kamailio kamailio 120 May 20 15:52 /var/run/kamailio/ ``` -- 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/2334

4 4

git:5.3:a35a2f3d: pkg/kamailio/deb: update [skip ci]
by Victor Seva 25 May '20

25 May '20

Module: kamailio Branch: 5.3 Commit: a35a2f3d3f9d2a371ebb2e5c0da67dec24906b77 URL: https://github.com/kamailio/kamailio/commit/a35a2f3d3f9d2a371ebb2e5c0da67de… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-25T14:30:21+02:00 pkg/kamailio/deb: update [skip ci] * define User and Group Thanks @sergey-safarov (cherry picked from commit 0436af5abd8b73e17f65020c74943f0f3b72ba0d) --- Modified: pkg/kamailio/deb/bionic/kamailio.default Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.default Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.default Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.default Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.default Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.default Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.default Modified: pkg/kamailio/deb/wheezy/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.default Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/a35a2f3d3f9d2a371ebb2e5c0da67de… Patch: https://github.com/kamailio/kamailio/commit/a35a2f3d3f9d2a371ebb2e5c0da67de…

1 0

git:5.3:ed2b91a5: pkg/kamailio/deb: update /var/run -> /run [skip ci]
by Victor Seva 25 May '20

25 May '20

Module: kamailio Branch: 5.3 Commit: ed2b91a57f648334a72aa18b9538230caaba7829 URL: https://github.com/kamailio/kamailio/commit/ed2b91a57f648334a72aa18b9538230… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-25T14:30:13+02:00 pkg/kamailio/deb: update /var/run -> /run [skip ci] * introduced on Debian since 7 Wheezy, on Ubuntu since 11.10 Oneiric (cherry picked from commit ac21d494253eddd085197e2862c3206efff8233a) --- Modified: pkg/kamailio/deb/bionic/kamailio.init Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/ed2b91a57f648334a72aa18b9538230… Patch: https://github.com/kamailio/kamailio/commit/ed2b91a57f648334a72aa18b9538230…

1 0

git:master:e6aefebf: modules: readme files regenerated - app_lua_sr ... [skip ci]
by Kamailio Dev 25 May '20

25 May '20

Module: kamailio Branch: master Commit: e6aefebf1bf7b029618c7f7f6a98607353adfa9e URL: https://github.com/kamailio/kamailio/commit/e6aefebf1bf7b029618c7f7f6a98607… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-25T11:21:05+02:00 modules: readme files regenerated - app_lua_sr ... [skip ci] --- Modified: src/modules/app_lua_sr/README Modified: src/modules/app_mono/README Modified: src/modules/app_perl/README Modified: src/modules/auth_radius/README Modified: src/modules/cdp_avp/README Modified: src/modules/dispatcher/README Modified: src/modules/dmq/README Modified: src/modules/domainpolicy/README Modified: src/modules/geoip/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/jansson/README Modified: src/modules/kemix/README Modified: src/modules/mqueue/README Modified: src/modules/msrp/README Modified: src/modules/mtree/README Modified: src/modules/pdb/README Modified: src/modules/pipelimit/README Modified: src/modules/presence_dialoginfo/README Modified: src/modules/presence_profile/README Modified: src/modules/pv_headers/README Modified: src/modules/ratelimit/README Modified: src/modules/sdpops/README Modified: src/modules/siputils/README Modified: src/modules/snmpstats/README Modified: src/modules/systemdops/README Modified: src/modules/tmrec/README Modified: src/modules/uri_db/README Modified: src/modules/xhttp/README Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/e6aefebf1bf7b029618c7f7f6a98607… Patch: https://github.com/kamailio/kamailio/commit/e6aefebf1bf7b029618c7f7f6a98607…

1 0

git:master:80e46395: doc/docbook: added entities for kamctl and kamcli
by Daniel-Constantin Mierla 25 May '20

25 May '20

Module: kamailio Branch: master Commit: 80e46395a3a937a5c5691c438db11bc059be6b38 URL: https://github.com/kamailio/kamailio/commit/80e46395a3a937a5c5691c438db11bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-25T11:06:24+02:00 doc/docbook: added entities for kamctl and kamcli --- Modified: doc/docbook/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/80e46395a3a937a5c5691c438db11bc… Patch: https://github.com/kamailio/kamailio/commit/80e46395a3a937a5c5691c438db11bc… --- diff --git a/doc/docbook/entities.xml b/doc/docbook/entities.xml index b9d58c44ec..0f54bc4ab5 100644 --- a/doc/docbook/entities.xml +++ b/doc/docbook/entities.xml @@ -13,6 +13,8 @@ <!ENTITY kamwiki "https://www.kamailio.org/wiki/"> <!ENTITY kamwikilink "<ulink url='&kamwiki;'>&kamwiki;</ulink>"> +<!ENTITY kamctl "kamctl"> +<!ENTITY kamcli "kamcli"> <!ENTITY kamcmd "kamcmd"> <!ENTITY kamailiohome "https://www.kamailio.org/">

1 0

git:master:a8f05db7: dispatcher: docs - removed extra <section> tag
by Daniel-Constantin Mierla 25 May '20

25 May '20

Module: kamailio Branch: master Commit: a8f05db7e0032042d5571ad4e014edf997c60be4 URL: https://github.com/kamailio/kamailio/commit/a8f05db7e0032042d5571ad4e014edf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-25T11:03:41+02:00 dispatcher: docs - removed extra <section> tag --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a8f05db7e0032042d5571ad4e014edf… Patch: https://github.com/kamailio/kamailio/commit/a8f05db7e0032042d5571ad4e014edf… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c38988580c..b872adc156 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1808,7 +1808,6 @@ onreply_route { ... </programlisting> </section> - <section> <section id="dispatcher.r.set_duid_state"> <title> <function moreinfo="none">dispatcher.set_duid_state</function>

1 0

git:master:6689c4e3: kamctl: regenerated db creation scripts for matrix table updates
by Daniel-Constantin Mierla 25 May '20

25 May '20

Module: kamailio Branch: master Commit: 6689c4e321464412325574e4db8a8aa00a7d3230 URL: https://github.com/kamailio/kamailio/commit/6689c4e321464412325574e4db8a8aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-25T11:01:52+02:00 kamctl: regenerated db creation scripts for matrix table updates --- Modified: utils/kamctl/db_berkeley/kamailio/matrix Modified: utils/kamctl/db_redis/kamailio/matrix Modified: utils/kamctl/db_sqlite/matrix-create.sql Modified: utils/kamctl/dbtext/kamailio/matrix Modified: utils/kamctl/mongodb/kamailio/matrix.json Modified: utils/kamctl/mysql/matrix-create.sql Modified: utils/kamctl/oracle/matrix-create.sql Modified: utils/kamctl/postgres/matrix-create.sql Modified: utils/kamctl/xhttp_pi/matrix-mod Modified: utils/kamctl/xhttp_pi/matrix-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/6689c4e321464412325574e4db8a8aa… Patch: https://github.com/kamailio/kamailio/commit/6689c4e321464412325574e4db8a8aa…

1 0

git:master:740840eb: lib/srdb1: schema - added id auto-increment column to matrix
by Daniel-Constantin Mierla 25 May '20

25 May '20

Module: kamailio Branch: master Commit: 740840ebe9538c1a3e6e3a49d82d437602b9d91a URL: https://github.com/kamailio/kamailio/commit/740840ebe9538c1a3e6e3a49d82d437… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-25T11:01:52+02:00 lib/srdb1: schema - added id auto-increment column to matrix - coherence across all tables --- Modified: src/lib/srdb1/schema/matrix.xml --- Diff: https://github.com/kamailio/kamailio/commit/740840ebe9538c1a3e6e3a49d82d437… Patch: https://github.com/kamailio/kamailio/commit/740840ebe9538c1a3e6e3a49d82d437… --- diff --git a/src/lib/srdb1/schema/matrix.xml b/src/lib/srdb1/schema/matrix.xml index 748fd5cd8c..9eb58f01f2 100644 --- a/src/lib/srdb1/schema/matrix.xml +++ b/src/lib/srdb1/schema/matrix.xml @@ -21,6 +21,16 @@ </db:para> </description> + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>unique ID</description> + </column> + <column id="first"> <name>first</name> <type>int</type>

1 0

[kamailio/kamailio] Configure permissions module without database (#2037)
by Sebastian Damm 25 May '20

25 May '20

### Description In our setup, we try to eliminate setup configuration in database and replace it with files. The advantage is, that we can maintain those files via puppet or ansible, and since we always rewrite the whole file, we don't have to take care about deleting obsolete entries. We can run different Kamailio versions without having problems with the version table when using the same database. And finally, we can stop all those local mysqld processes on a lot of machines. Modules like the dispatcher module were easy to change. But the permissions module is not prepared to run without database, if you want to use `allow_trusted()` or `allow_source_address()` and similar. The only option to feed those functions with data is a database table. ### Expected behavior We would like to place files for trusted and address into the Kamailio directory and have Kamailio read from those files during startup or after reload commands. #### Actual observed behavior Data for trusted and address have to reside inside a database. -- 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/2037

3 4

[kamailio/kamailio] Kamailio dispatcher module reports incorrect values with Call-Load based dispatching algorithm(No.10) (#2322)
by hbilling 25 May '20

25 May '20

### Description While running a simple load with a UAC(Sipp) and two UAS(Both Sipp) , with Kamailio in the middle, acting as a Call Stateful Proxy, I observed that the Dispatcher Module reports one call stuck despite NO calls being reported as Active in the Dialog Module. Setup: ------- |------> UAS1(sipp) UAC(sipp) ----------------------Kamailio(Call Stateful Proxy)------------ |------> UAS2(sipp) Scenario: The scenario is simple INVITE----- 200OK------ACK , with BYE being sent after 60 secs by UAC. ### Troubleshooting Point noteworthy is that this is purely timing issue and happens generally with very long duration, like 24 hours or so, but can crop up withing a few hours also. #### Reproduction Just run the calls via sipp as described in the setup. #### Debugging Data **OUTPUT after cleanly stopping the test:** > Output of "kamctl stats dialog" command { "jsonrpc": "2.0", "result": [ "dialog:active_dialogs = 0", "dialog:early_dialogs = 0", "dialog:expired_dialogs = 0", "dialog:failed_dialogs = 959", "dialog:processed_dialogs = 1695662" ], "id": 21282 } > Output of "kamcmd dispatcher.list" { NRSETS: 1 RECORDS: { SET: { ID: 1 TARGETS: { DEST: { URI: sip:10.214.3.20:5060;transport=udp FLAGS: AP PRIORITY: 0 ATTRS: { BODY: duid=sample-cas-1;maxload=1000 DUID: sample-cas-1 MAXLOAD: 1000 WEIGHT: 0 RWEIGHT: 0 SOCKET: } LATENCY: { AVG: 2.409000 STD: 108.999000 EST: 1.124000 MAX: 9503 TIMEOUT: 22 } RUNTIME: { DLGLOAD: 997 } } DEST: { URI: sip:10.214.3.19:5060;transport=udp FLAGS: AP PRIORITY: 0 ATTRS: { BODY: duid=sample-cas-0;maxload=1000 DUID: sample-cas-0 MAXLOAD: 1000 WEIGHT: 0 RWEIGHT: 0 SOCKET: } LATENCY: { AVG: 1.429000 STD: 40.279000 EST: 0.999000 MAX: 3502 TIMEOUT: 22 } RUNTIME: { DLGLOAD: 985 } } } } } } NOTE: Please see that the dispatcher shows a lot of calls stuck after overnight load, and there by we started seeing 404's sent back by Kamailio dispatcher module for most of the calls. It is noteworthy that we have kept a close tab on the tests thereafter and caught an iteration where initially only call is stuck. ### Possible Solutions The problem most likely seems to be in the dispatcher module, which does not seem to be incrementing/decrementing the load variable for each UAS( 'dload' variable to be precise), due to which the concurrent incrementing/decrementing of the 'dload' parameter makes the dispatcher report spurious values. FIX: The following needs to be done. 1. File: **dispatch.c** Function: **ds_load_add()** Just before dset->dlist[dst].dload++; line, we must take a lock and release it thereafter. Like: **lock_get(&dset->lock)**; dset->dlist[dst].dload++; **lock_release(&dset->lock);** 2: File: **dispatch.c** Function: **ds_load_replace()** , the code needs a lock as well while decrementing. Like: **lock_get(&idx->lock);** if(idx->dlist[olddst].dload > 0) { idx->dlist[olddst].dload--; **lock_release(&idx->lock);** ...... } else { **lock_release(&idx->lock);** ...... } 3. File: **dispatch.c** Function: **ds_load_remove_byid** , the code needs a lock as well while decrementing. Like: **lock_get(&idx->lock);** if(idx->dlist[olddst].dload > 0) { idx->dlist[olddst].dload--; **lock_release(&idx->lock);** ........... } else { **lock_release(&idx->lock);** ........ } NOTE: I believe the lock should be taken also for the the API "ds_get_leastloaded()" in dispatch.c because otherwise, we may get select incorrect destination, especially when we are at just about the same load and that is almost close to the 'maxload' value configured in the dispatcher list file. But I will wait for the community comments for this. The above fix solved my issue, so please review the same and if you deem suitable, I could go ahead with the fix delivery. ### Additional Information Kamailio Version: [root@CPaaSVM ~]# kamailio -v version: kamailio 5.3.2 (x86_64/linux) 7ba545 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 7ba545 compiled on 19:01:39 May 1 2020 with gcc 4.8.5 NOTE: I do not think this is version specific and probably that it exists in the later versions also. * **Operating System**: Centos 7.7 -- 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/2322

4 10

git:5.3:5be2234d: pkg/kamailio/obs: packaged xhttp_prom (prometheus)
by Sergey Safarov 23 May '20

23 May '20

Module: kamailio Branch: 5.3 Commit: 5be2234db7992309d128e6b999771fb298c01fd5 URL: https://github.com/kamailio/kamailio/commit/5be2234db7992309d128e6b999771fb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-05-23T23:16:07+03:00 pkg/kamailio/obs: packaged xhttp_prom (prometheus) (cherry picked from commit 3e77c574c340941f36ca8f9081a77c5b476f8c8c) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/5be2234db7992309d128e6b999771fb… Patch: https://github.com/kamailio/kamailio/commit/5be2234db7992309d128e6b999771fb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index aa5269e62c..175cfa2249 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1149,6 +1149,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif + kxhttp_prom \ %if %{with ims} kims \ %endif @@ -1236,6 +1237,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif + kxhttp_prom \ %if %{with ims} kims \ %endif

1 0

git:master:3e77c574: pkg/kamailio/obs: packaged xhttp_prom (prometheus)
by Sergey Safarov 23 May '20

23 May '20

Module: kamailio Branch: master Commit: 3e77c574c340941f36ca8f9081a77c5b476f8c8c URL: https://github.com/kamailio/kamailio/commit/3e77c574c340941f36ca8f9081a77c5… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-05-23T22:43:33+03:00 pkg/kamailio/obs: packaged xhttp_prom (prometheus) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/3e77c574c340941f36ca8f9081a77c5… Patch: https://github.com/kamailio/kamailio/commit/3e77c574c340941f36ca8f9081a77c5… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 3c68a9a002..1eb7db7c30 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1153,6 +1153,7 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ %if %{with http_async_client} khttp_async \ %endif + kxhttp_prom \ %if %{with ims} kims \ %endif @@ -1244,6 +1245,7 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ %if %{with http_async_client} khttp_async \ %endif + kxhttp_prom \ %if %{with ims} kims \ %endif

1 0

[kamailio/kamailio] kamdbctl create Issue (#2328)
by rodrigocuadra 23 May '20

23 May '20

### Description  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@localhost ~]# kamailio -version version: kamailio 5.3.4 (x86_64/linux) 117ff9 ``` * **Operating System**:  ``` MySQL password for root: INFO: test server charset INFO: creating database kamailio ... INFO: granting privileges to database kamailio ... INFO: creating standard tables into kamailio ... INFO: Core Kamailio tables succesfully created. Install presence related tables? (y/n): y INFO: creating presence tables into kamailio ... INFO: Presence tables succesfully created. Install tables for imc cpl siptrace domainpolicy carrierroute drouting userblacklist htable purple uac pipelimit mtree sca mohqueue rtpproxy rtpengine secfilter? (y/n): y INFO: creating extra tables into kamailio ... ERROR 1067 (42000) at line 1: Invalid default value for 'action' ERROR: Creating extra tables failed at secfilter! ``` -- 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/2328

3 4

git:master:77996f4b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 22 May '20

22 May '20

Module: kamailio Branch: master Commit: 77996f4b8808f4950325e14861b6ac82c09a5eff URL: https://github.com/kamailio/kamailio/commit/77996f4b8808f4950325e14861b6ac8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-22T21:46:13+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/77996f4b8808f4950325e14861b6ac8… Patch: https://github.com/kamailio/kamailio/commit/77996f4b8808f4950325e14861b6ac8…

1 0

[kamailio/kamailio] Allow more options on dispatcher.set_state (#2085)
by duarterocha91 22 May '20

22 May '20

Greetings, Dispatcher RPC command allows to change the runtime state of a GW using its Group ID and the IP. In my implementation i have 2 Kamailio machines in an HA setup and, as such, i have the GW configured twice with same group_id and different sockets (Different HA adressess - one for each machine). I would like to be able to disable on runtime GWs that are configured with an HA adress that isn't present yet on that machine. To be able do that, the combination of GroupID + IP is not enough, but Socket + IP would be enough. Is this possible to implement ? Best Regards -- 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/2085

2 2

git:master:e97ce9f9: dispatcher: docs for dispatcher.set_duid_state command
by Daniel-Constantin Mierla 22 May '20

22 May '20

Module: kamailio Branch: master Commit: e97ce9f952f8f867ae5718df1dd940e0fca33f3e URL: https://github.com/kamailio/kamailio/commit/e97ce9f952f8f867ae5718df1dd940e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-22T21:32:59+02:00 dispatcher: docs for dispatcher.set_duid_state command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e97ce9f952f8f867ae5718df1dd940e… Patch: https://github.com/kamailio/kamailio/commit/e97ce9f952f8f867ae5718df1dd940e… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 42dc66bb4a..c38988580c 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1806,6 +1806,28 @@ onreply_route { &sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080 &sercmd; dispatcher.set_state ip 3 all ... +</programlisting> + </section> + <section> + <section id="dispatcher.r.set_duid_state"> + <title> + <function moreinfo="none">dispatcher.set_duid_state</function> + </title> + <para> + Sets the state for a destination by matching on 'duid' attribute. The + parameters first two parameter 'state' and 'group' are the same like + for RPC command 'dispatcher.set_state'. The third parameter 'duid' is + the value to be matched against the 'duid' attribute of dispatcher + destinations. + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# prototype: &sercmd; dispatcher.set_duid_state _state_ _group_ _duid_ +&sercmd; dispatcher.set_duid_state ip 2 xyz +... </programlisting> </section> <section id="dispatcher.r.list">

1 0

git:master:b7b0f258: dispatcher: new rpc command dispatcher.set_duid_state
by Daniel-Constantin Mierla 22 May '20

22 May '20

Module: kamailio Branch: master Commit: b7b0f25871fd99667db5f426cb7373deba7561ae URL: https://github.com/kamailio/kamailio/commit/b7b0f25871fd99667db5f426cb7373d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-22T21:25:48+02:00 dispatcher: new rpc command dispatcher.set_duid_state - set the state of a destination by matching on duid attribute kamctl rpc dispatcher.set_duid_state <state> <setid> <duid> - example: kamctl rpc dispatcher.set_duid_state i 1 xyz - GH #2085 --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/b7b0f25871fd99667db5f426cb7373d… Patch: https://github.com/kamailio/kamailio/commit/b7b0f25871fd99667db5f426cb7373d…

1 0

git:5.3:be32a089: rtpmanage: enable hadling of PRACK requests
by Daniel-Constantin Mierla 22 May '20

22 May '20

Module: kamailio Branch: 5.3 Commit: be32a0896187b385cb9f708abaf72089e5c35adb URL: https://github.com/kamailio/kamailio/commit/be32a0896187b385cb9f708abaf7208… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-22T09:10:22+02:00 rtpmanage: enable hadling of PRACK requests - they can have SDP - use more compact bitwise match for method types (cherry picked from commit de77beffb436e783031a6aa71c1887848cb2cc73) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/be32a0896187b385cb9f708abaf7208… Patch: https://github.com/kamailio/kamailio/commit/be32a0896187b385cb9f708abaf7208… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8f3c28a673..8b72e5b675 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3603,11 +3603,11 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; - if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + if (!(method & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL|METHOD_BYE + |METHOD_UPDATE|METHOD_PRACK))) return -1; - if (method==METHOD_CANCEL || method==METHOD_BYE) + if (method & (METHOD_CANCEL|METHOD_BYE)) return rtpengine_delete(msg, flags); if (msg->msg_flags & FL_SDP_BODY) @@ -3616,7 +3616,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) nosdp = parse_sdp(msg); if (msg->first_line.type == SIP_REQUEST) { - if(method==METHOD_ACK && nosdp==0) + if((method & (METHOD_ACK|METHOD_PRACK)) && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_ANSWER, 0); if(method==METHOD_UPDATE && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); @@ -3684,7 +3684,8 @@ rtpengine_answer1_f(struct sip_msg *msg, char *str1, char *str2) { if (msg->first_line.type == SIP_REQUEST) - if (msg->first_line.u.request.method_value != METHOD_ACK) + if (!(msg->first_line.u.request.method_value + & (METHOD_ACK | METHOD_PRACK))) return -1; return rtpengine_rtpp_set_wrap_fparam(msg, rtpengine_answer_wrap, str1, 2, OP_ANSWER);

1 0

[kamailio/kamailio] Kazoo: added basic kemi support (#2324)
by tao-communications 21 May '20

21 May '20

#### 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  Added kemi support for Parameter: - event_callback Functions: - kazoo_subscribe(json_description) - kazoo_publish Documentation: - added section for event_callback parameter You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2324 -- Commit Summary -- * kazoo: added kemi support for kazoo_subscribe(json_description) and kazoo_publish * kazoo: added event_callback parameter in documentation * kazoo: added event_callback parameter in documentation * Merge branch 'master' of https://github.com/tao-communications/kamailio -- File Changes -- M src/modules/kazoo/doc/kazoo_admin.xml (22) M src/modules/kazoo/kazoo.c (105) M src/modules/kazoo/kz_amqp.c (100) M src/modules/kazoo/kz_amqp.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2324.patch https://github.com/kamailio/kamailio/pull/2324.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/2324

3 25

git:master:b0a0ece7: modules: readme files regenerated - kazoo ... [skip ci]
by Kamailio Dev 21 May '20

21 May '20

Module: kamailio Branch: master Commit: b0a0ece77a3136abdecbfb3f6f1927b7809ad4c5 URL: https://github.com/kamailio/kamailio/commit/b0a0ece77a3136abdecbfb3f6f1927b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-21T16:31:17+02:00 modules: readme files regenerated - kazoo ... [skip ci] --- Modified: src/modules/kazoo/README --- Diff: https://github.com/kamailio/kamailio/commit/b0a0ece77a3136abdecbfb3f6f1927b… Patch: https://github.com/kamailio/kamailio/commit/b0a0ece77a3136abdecbfb3f6f1927b…

1 0

git:master:3a840116: kazoo: add basic kemi support
by lazedo 21 May '20

21 May '20

Module: kamailio Branch: master Commit: 3a84011684cc84ebceea0e90000c915c5e2316b5 URL: https://github.com/kamailio/kamailio/commit/3a84011684cc84ebceea0e90000c915… Author: Author Yufei Tao <yufei.tao(a)syntec.co.uk> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2020-05-21T14:30:58Z kazoo: add basic kemi support --- Modified: src/modules/kazoo/doc/kazoo_admin.xml Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/3a84011684cc84ebceea0e90000c915… Patch: https://github.com/kamailio/kamailio/commit/3a84011684cc84ebceea0e90000c915…

1 0

git:master:c62f69b4: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 21 May '20

21 May '20

Module: kamailio Branch: master Commit: c62f69b4603d3a680e50df010b8c139b7ae123ef URL: https://github.com/kamailio/kamailio/commit/c62f69b4603d3a680e50df010b8c139… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-21T10:16:22+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/c62f69b4603d3a680e50df010b8c139… Patch: https://github.com/kamailio/kamailio/commit/c62f69b4603d3a680e50df010b8c139…

1 0

git:master:36053c68: corex: docs - updates to nio related parameters and examples
by Daniel-Constantin Mierla 21 May '20

21 May '20

Module: kamailio Branch: master Commit: 36053c68cc4f8268f59dbd836ab5db7d0aa8c606 URL: https://github.com/kamailio/kamailio/commit/36053c68cc4f8268f59dbd836ab5db7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-21T10:15:14+02:00 corex: docs - updates to nio related parameters and examples --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/36053c68cc4f8268f59dbd836ab5db7… Patch: https://github.com/kamailio/kamailio/commit/36053c68cc4f8268f59dbd836ab5db7…

1 0

git:master:9b88b643: corex: renamed module parameter for NIO processing
by Daniel-Constantin Mierla 21 May '20

21 May '20

Module: kamailio Branch: master Commit: 9b88b64394e2cfc61eb7e6c14d23264f2613f036 URL: https://github.com/kamailio/kamailio/commit/9b88b64394e2cfc61eb7e6c14d23264… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-21T10:10:02+02:00 corex: renamed module parameter for NIO processing - nio - non sip network i/o events --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9b88b64394e2cfc61eb7e6c14d23264… Patch: https://github.com/kamailio/kamailio/commit/9b88b64394e2cfc61eb7e6c14d23264… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index e23aae325d..c0759e6ded 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -141,9 +141,9 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"alias_subdomains", STR_PARAM|USE_FUNC_PARAM, (void*)corex_alias_subdomains_param}, - {"network_io_intercept", INT_PARAM, &nio_intercept}, - {"min_msg_len", INT_PARAM, &nio_min_msg_len}, - {"msg_avp", PARAM_STR, &nio_msg_avp_param}, + {"nio_intercept", INT_PARAM, &nio_intercept}, + {"nio_min_msg_len", INT_PARAM, &nio_min_msg_len}, + {"nio_msg_avp", PARAM_STR, &nio_msg_avp_param}, {0, 0, 0} };

1 0

git:master:47b317dd: tm: updated comments for removed obsolete DYN_BUF define condition
by Daniel-Constantin Mierla 21 May '20

21 May '20

Module: kamailio Branch: master Commit: 47b317dddd1de58a850086985e55b242b29bcf47 URL: https://github.com/kamailio/kamailio/commit/47b317dddd1de58a850086985e55b24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-21T10:04:44+02:00 tm: updated comments for removed obsolete DYN_BUF define condition --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/47b317dddd1de58a850086985e55b24… Patch: https://github.com/kamailio/kamailio/commit/47b317dddd1de58a850086985e55b24… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ec250a8595..f8cee24a6a 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -187,12 +187,12 @@ int uac_refresh_hdr_shortcuts(tm_cell_t *tcell, char *buf, int buf_len) tcell->cseq_n.len = (int)(cs->number.s + cs->number.len - lreq.cseq->name.s); LM_DBG("cseq: [%.*s]\n", tcell->cseq_n.len, tcell->cseq_n.s); - lreq.buf=0; /* covers the obsolete DYN_BUF */ + lreq.buf=0; free_sip_msg(&lreq); return 0; error: - lreq.buf=0; /* covers the obsolete DYN_BUF */ + lreq.buf=0; free_sip_msg(&lreq); return -1; } @@ -378,7 +378,7 @@ static inline int t_run_local_req( lreq.dst_uri.s=0; lreq.dst_uri.len=0; } - lreq.buf=0; /* covers the obsolete DYN_BUF */ + lreq.buf=0; free_sip_msg(&lreq); return refresh_shortcuts; } @@ -546,7 +546,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, LM_ERR("failed to parse headers on uas for failover\n"); } else { new_cell->uas.request = sip_msg_cloner(&lreq, &sip_msg_len); - lreq.buf=0; /* covers the obsolete DYN_BUF */ + lreq.buf=0; free_sip_msg(&lreq); if (!new_cell->uas.request) { LM_ERR("no more shmem\n");

1 0

git:master:43a2a785: stun: removed obsolete DYN_BUF define condition
by Daniel-Constantin Mierla 21 May '20

21 May '20

Module: kamailio Branch: master Commit: 43a2a78563499a4843f88e927a249b7972159e43 URL: https://github.com/kamailio/kamailio/commit/43a2a78563499a4843f88e927a249b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-21T10:04:31+02:00 stun: removed obsolete DYN_BUF define condition --- Modified: src/modules/stun/kam_stun.c --- Diff: https://github.com/kamailio/kamailio/commit/43a2a78563499a4843f88e927a249b7… Patch: https://github.com/kamailio/kamailio/commit/43a2a78563499a4843f88e927a249b7… --- diff --git a/src/modules/stun/kam_stun.c b/src/modules/stun/kam_stun.c index 9eb823068b..fc09d3c6f4 100644 --- a/src/modules/stun/kam_stun.c +++ b/src/modules/stun/kam_stun.c @@ -928,10 +928,6 @@ static int reallock_buffer(struct stun_buffer* buffer, UINT_T len) static void clean_memory(struct stun_msg* req, struct stun_msg* res, struct stun_unknown_att* unknown) { -#ifdef DYN_BUF - pkg_free(req->msg.buf.s); -#endif - if (res->msg.buf.s != NULL) { pkg_free(res->msg.buf.s); }

1 0

git:master:cbeec44d: core: removed obsolete DYN_BUF define condition
by Daniel-Constantin Mierla 21 May '20

21 May '20

Module: kamailio Branch: master Commit: cbeec44d4c04c03af39bda85bbd26af6299f2b69 URL: https://github.com/kamailio/kamailio/commit/cbeec44d4c04c03af39bda85bbd26af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-21T10:03:57+02:00 core: removed obsolete DYN_BUF define condition --- Modified: src/core/parser/msg_parser.c Modified: src/core/tcp_read.c Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/cbeec44d4c04c03af39bda85bbd26af… Patch: https://github.com/kamailio/kamailio/commit/cbeec44d4c04c03af39bda85bbd26af… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index ca0bf789c5..aff3c0a989 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -711,10 +711,7 @@ void free_sip_msg(struct sip_msg* const msg) if (msg->body_lumps) free_lump_list(msg->body_lumps); if (msg->reply_lump) free_reply_lump(msg->reply_lump); msg_ldata_reset(msg); - /* don't free anymore -- now a pointer to a static buffer */ -# ifdef DYN_BUF - pkg_free(msg->buf); -# endif + /* no free of msg->buf -- a pointer to a static buffer */ } /** diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index afb1248688..8147951b21 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -1375,12 +1375,8 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, struct receive_info* rcv_info, struct tcp_connection* con) { #ifdef TCP_CLONE_RCVBUF -#ifdef DYN_BUF - char *buf = NULL; -#else static char *buf = NULL; static unsigned int bsize = 0; -#endif int blen; /* cloning is disabled via parameter */ @@ -1404,13 +1400,6 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, if(blen < BUF_SIZE) blen = BUF_SIZE; -#ifdef DYN_BUF - buf=pkg_malloc(blen+1); - if (buf==0) { - PKG_MEM_ERROR; - return -1; - } -#else /* allocate buffer when needed * - no buffer yet * - existing buffer too small (min size is BUF_SIZE - to accomodate most @@ -1431,7 +1420,6 @@ int receive_tcp_msg(char* tcpbuf, unsigned int len, } bsize = blen; } -#endif memcpy(buf, tcpbuf, len); buf[len] = '\0'; diff --git a/src/core/udp_server.c b/src/core/udp_server.c index b718895bd2..9234e54ec1 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -422,11 +422,7 @@ int udp_init(struct socket_info* sock_info) int udp_rcv_loop() { unsigned len; -#ifdef DYN_BUF - char* buf; -#else static char buf [BUF_SIZE+1]; -#endif char *tmp; union sockaddr_union* fromaddr; unsigned int fromaddrlen; @@ -457,13 +453,6 @@ int udp_rcv_loop() if (cfg_child_init()) goto error; for(;;){ -#ifdef DYN_BUF - buf=pkg_malloc(BUF_SIZE+1); - if (buf==0){ - PKG_MEM_ERROR; - goto error; - } -#endif fromaddrlen=sizeof(union sockaddr_union); len=recvfrom(bind_address->socket, buf, BUF_SIZE, 0, (struct sockaddr*)fromaddr, &fromaddrlen);

1 0

git:master:2a61e71c: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 2a61e71c6088ddd5573465474d5f4922fc58c952 URL: https://github.com/kamailio/kamailio/commit/2a61e71c6088ddd5573465474d5f492… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-20T22:16:11+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/2a61e71c6088ddd5573465474d5f492… Patch: https://github.com/kamailio/kamailio/commit/2a61e71c6088ddd5573465474d5f492… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 3b9701aead..1a25c5c661 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1608,9 +1608,9 @@ kamcmd dispatcher.remove 3 sip:127.0.0.1:5075;transport=udp Example: ... -# prototype: rpc dispatcher.hash _nslots_ _val1_ [_val2_] - rpc dispatcher.hash 0 alice server.com - rpc dispatcher.hash 4 bob server.com +# prototype: kamctl rpc dispatcher.hash _nslots_ _val1_ [_val2_] +kamctl rpc dispatcher.hash 0 alice server.com +kamctl rpc dispatcher.hash 4 bob server.com ... 6. Installation and Running

1 0

git:master:32e1409a: dispatcher: docs - kamctl is not an entity
by Daniel-Constantin Mierla 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 32e1409a2e0fef557eeda196586b1a32366b90a5 URL: https://github.com/kamailio/kamailio/commit/32e1409a2e0fef557eeda196586b1a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-20T22:03:15+02:00 dispatcher: docs - kamctl is not an entity --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/32e1409a2e0fef557eeda196586b1a3… Patch: https://github.com/kamailio/kamailio/commit/32e1409a2e0fef557eeda196586b1a3… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index a255b2645d..42dc66bb4a 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1996,9 +1996,9 @@ DEST: { </para> <programlisting format="linespecific"> ... -# prototype: &kamctl; rpc dispatcher.hash _nslots_ _val1_ [_val2_] -&kamctl; rpc dispatcher.hash 0 alice server.com -&kamctl; rpc dispatcher.hash 4 bob server.com +# prototype: kamctl rpc dispatcher.hash _nslots_ _val1_ [_val2_] +kamctl rpc dispatcher.hash 0 alice server.com +kamctl rpc dispatcher.hash 4 bob server.com ... </programlisting> </section>

1 0

git:master:4f51e4a9: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 4f51e4a960fe3df2c83b8c328c78a88818328223 URL: https://github.com/kamailio/kamailio/commit/4f51e4a960fe3df2c83b8c328c78a88… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-20T22:01:12+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/4f51e4a960fe3df2c83b8c328c78a88… Patch: https://github.com/kamailio/kamailio/commit/4f51e4a960fe3df2c83b8c328c78a88… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 8621ba903c..3b9701aead 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -125,6 +125,7 @@ Federico Cabiddu 5.4. dispatcher.ping_active 5.5. dispatcher.add 5.6. dispatcher.remove + 5.7. dispatcher.hash 6. Installation and Running @@ -276,6 +277,7 @@ Chapter 1. Admin Guide 5.4. dispatcher.ping_active 5.5. dispatcher.add 5.6. dispatcher.remove + 5.7. dispatcher.hash 6. Installation and Running @@ -1453,6 +1455,7 @@ onreply_route { 5.4. dispatcher.ping_active 5.5. dispatcher.add 5.6. dispatcher.remove + 5.7. dispatcher.hash 5.1. dispatcher.set_state @@ -1581,6 +1584,35 @@ kamcmd dispatcher.remove 2 sip:127.0.0.1:5080 kamcmd dispatcher.remove 3 sip:127.0.0.1:5075;transport=udp ... +5.7. dispatcher.hash + + Compute the hash id corresponding to the string parameter values. + + Return the hash id and the corresponding slot, if 'nslots' parameter is + not 0. + + Name: dispatcher.hash + + Parameters: + * _nslots_: number of slots + * _val1_: string value + * _val2_: (optional) string value + + It can be useful to find what address in a destination group (setid) is + going to be used when hashing a value or a URI. For a URI, the + corresponding username and domain have to be provided as _val1_ and + _val2_. If the URI has a port different than 5060 (or 5061 for TLS), + then the _val2_ has to be 'domain:port'. The _nslots_ has to be the + number of addresses in the group (setid). The returned 'slot' value + represents the index of the address to be used for routing. + + Example: +... +# prototype: rpc dispatcher.hash _nslots_ _val1_ [_val2_] + rpc dispatcher.hash 0 alice server.com + rpc dispatcher.hash 4 bob server.com +... + 6. Installation and Running 6.1. Destination List File

1 0

git:master:be1e23de: dispatcher: documentation for dispatcher.hash rpc command
by Daniel-Constantin Mierla 20 May '20

20 May '20

Module: kamailio Branch: master Commit: be1e23defc8c56dc0a1398b009019626f5ea0e0f URL: https://github.com/kamailio/kamailio/commit/be1e23defc8c56dc0a1398b00901962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-20T21:48:29+02:00 dispatcher: documentation for dispatcher.hash rpc command --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/be1e23defc8c56dc0a1398b00901962… Patch: https://github.com/kamailio/kamailio/commit/be1e23defc8c56dc0a1398b00901962… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 30cd6a5ec1..a255b2645d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1960,6 +1960,46 @@ DEST: { &sercmd; dispatcher.remove 2 sip:127.0.0.1:5080 &sercmd; dispatcher.remove 3 sip:127.0.0.1:5075;transport=udp ... +</programlisting> + </section> + <section id="dispatcher.r.hash"> + <title> + <function moreinfo="none">dispatcher.hash</function> + </title> + <para> + Compute the hash id corresponding to the string parameter values. + </para> + <para> + Return the hash id and the corresponding slot, if 'nslots' parameter + is not 0. + </para> + <para> + Name: <emphasis>dispatcher.hash</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>_nslots_: number of slots</para></listitem> + <listitem><para>_val1_: string value</para></listitem> + <listitem><para>_val2_: (optional) string value</para></listitem> + </itemizedlist> + <para> + It can be useful to find what address in a destination group (setid) is + going to be used when hashing a value or a URI. For a URI, the + corresponding username and domain have to be provided as _val1_ and + _val2_. If the URI has a port different than 5060 (or 5061 for TLS), + then the _val2_ has to be 'domain:port'. The _nslots_ has to be the + number of addresses in the group (setid). The returned 'slot' value + represents the index of the address to be used for routing. + </para> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# prototype: &kamctl; rpc dispatcher.hash _nslots_ _val1_ [_val2_] +&kamctl; rpc dispatcher.hash 0 alice server.com +&kamctl; rpc dispatcher.hash 4 bob server.com +... </programlisting> </section>

1 0

git:master:aac6c77c: dispatcher: added rpc command dispatcher.hash
by Daniel-Constantin Mierla 20 May '20

20 May '20

Module: kamailio Branch: master Commit: aac6c77cac36ea28897fcec539d750e8bf652d55 URL: https://github.com/kamailio/kamailio/commit/aac6c77cac36ea28897fcec539d750e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-20T21:33:17+02:00 dispatcher: added rpc command dispatcher.hash - prototype: dispatcher.hash nslots val1 [val2] - compute the hash id of the value and do modulo operation if first parameter is not 0 - val2 is optional --- Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/aac6c77cac36ea28897fcec539d750e… Patch: https://github.com/kamailio/kamailio/commit/aac6c77cac36ea28897fcec539d750e… --- diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 6c167a9551..59937b9994 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -271,5 +271,6 @@ void ds_avl_destroy(ds_set_t **node); int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate); ds_rctx_t* ds_get_rctx(void); +unsigned int ds_get_hash(str *x, str *y); #endif diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 6ac01bbd2a..9bd51a2544 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1816,6 +1816,49 @@ static void dispatcher_rpc_remove(rpc_t *rpc, void *ctx) return; } +static const char *dispatcher_rpc_hash_doc[2] = { + "Compute the hash if the values", 0}; + + +/* + * RPC command to compute the hash of the values + */ +static void dispatcher_rpc_hash(rpc_t *rpc, void *ctx) +{ + int n = 0; + unsigned int hashid = 0; + int nslots = 0; + str val1 = STR_NULL; + str val2 = STR_NULL; + void *th; + + n = rpc->scan(ctx, "dS*S", &nslots, &val1, &val2); + if(n < 2) { + rpc->fault(ctx, 500, "Invalid Parameters"); + return; + } + if(n==2) { + val2.s = NULL; + val2.s = 0; + } + + hashid = ds_get_hash(&val1, &val2); + + /* add entry node */ + if(rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error root reply"); + return; + } + if(rpc->struct_add(th, "uu", "hashid", hashid, + "slot", (nslots>0)?(hashid%nslots):0) + < 0) { + rpc->fault(ctx, 500, "Internal error reply structure"); + return; + } + + return; +} + /* clang-format off */ rpc_export_t dispatcher_rpc_cmds[] = { {"dispatcher.reload", dispatcher_rpc_reload, @@ -1830,6 +1873,8 @@ rpc_export_t dispatcher_rpc_cmds[] = { dispatcher_rpc_add_doc, 0}, {"dispatcher.remove", dispatcher_rpc_remove, dispatcher_rpc_remove_doc, 0}, + {"dispatcher.hash", dispatcher_rpc_hash, + dispatcher_rpc_hash_doc, 0}, {0, 0, 0, 0} }; /* clang-format on */

1 0

[kamailio/kamailio] Problem with rpms - Centos 6.x (#2333)
by nicoonline 20 May '20

20 May '20

http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. (3/6): kamailio-http_client-5.2.7-7.el6.x86_64.rpm | 69 kB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno 14] PYCURL ERROR 22 - "The requested URL returned error: 416 Requested Range Not Satisfiable" Trying other mirror. (5/6): kamailio-mysql-5.2.7-7.el6.x86_64.rpm | 73 kB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. (6/6): kamailio-unixodbc-5.2.7-7.el6.x86_64.rpm | 38 kB 00:00 http://download.opensuse.org/repositories/home%3A/kamailio%3A/v5.2.x-rpms/C…: [Errno -1] Package does not match intended download. Suggestion: run yum --enablerepo=home_kamailio_v5.2.x-rpms clean metadata Trying other mirror. -- 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/2333

2 2

git:master:4a7c3af7: modules: readme files regenerated - kafka ... [skip ci]
by Kamailio Dev 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 4a7c3af7095257fd2e32ce2e33d66346256abafb URL: https://github.com/kamailio/kamailio/commit/4a7c3af7095257fd2e32ce2e33d6634… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-20T14:16:17+02:00 modules: readme files regenerated - kafka ... [skip ci] --- Modified: src/modules/kafka/README --- Diff: https://github.com/kamailio/kamailio/commit/4a7c3af7095257fd2e32ce2e33d6634… Patch: https://github.com/kamailio/kamailio/commit/4a7c3af7095257fd2e32ce2e33d6634… --- diff --git a/src/modules/kafka/README b/src/modules/kafka/README index 315decd070..47452c21ff 100644 --- a/src/modules/kafka/README +++ b/src/modules/kafka/README @@ -35,6 +35,7 @@ Javier Gallart 2.4. Functions 2.4.1. kafka_send(topic, msg) + 2.4.2. kafka_send_key(topic, msg, key) 2.5. RPC Commands @@ -47,8 +48,9 @@ Javier Gallart 1.2. Set configuration parameter 1.3. Set topic parameter 1.4. kafka_send usage - 1.5. kafka.stats usage + 1.5. kafka_send_key usage 1.6. kafka.stats usage + 1.7. kafka.stats usage Chapter 1. Admin Guide @@ -68,6 +70,7 @@ Chapter 1. Admin Guide 2.4. Functions 2.4.1. kafka_send(topic, msg) + 2.4.2. kafka_send_key(topic, msg, key) 2.5. RPC Commands @@ -91,6 +94,7 @@ Chapter 1. Admin Guide 2.4. Functions 2.4.1. kafka_send(topic, msg) + 2.4.2. kafka_send_key(topic, msg, key) 2.5. RPC Commands @@ -206,13 +210,34 @@ modparam("kafka", "topic", "name=third_topic") kafka_send("my_topic", "test message"); ... +2.4.2. kafka_send_key(topic, msg, key) + + Send a message with an associated key to a specific topic via Kafka + server. + + This function returns -1 for all sort of errors. (So execution of + script continues) + + Parameters: + * topic: (string) name of the topic. It is mandatory. + * msg: (string) message to send. It is mandatory. + * key: (string) associate this key with the message. It is mandatory. + + Available via KEMI framework as kafka.send_key. + + Example 1.5. kafka_send_key usage +... +# Send "test message" to topic "my_topic" with key "my_key" +kafka_send_key("my_topic", "test message", "my_key"); +... + 2.5. RPC Commands 2.5.1. kafka.stats Show statistics about total sent messages and failed to deliver ones. - Example 1.5. kafka.stats usage + Example 1.6. kafka.stats usage ... kamcmd kafka.stats Total messages: 26 Errors: 0 @@ -225,7 +250,7 @@ Total messages: 26 Errors: 0 Parameter: topic (string) name of the topic. Required. - Example 1.6. kafka.stats usage + Example 1.7. kafka.stats usage ... # Show statistics for my_topic. kamcmd kafka.stats_topic "my_topic"

1 0

git:master:f0134bb5: kafka: doc about kafka_send_key function.
by Vicente Hernando 20 May '20

20 May '20

Module: kamailio Branch: master Commit: f0134bb58f30dbe9b450a0f9476f70d7eb1e3a4a URL: https://github.com/kamailio/kamailio/commit/f0134bb58f30dbe9b450a0f9476f70d… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2020-05-20T13:59:04+02:00 kafka: doc about kafka_send_key function. --- Modified: src/modules/kafka/doc/kafka_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f0134bb58f30dbe9b450a0f9476f70d… Patch: https://github.com/kamailio/kamailio/commit/f0134bb58f30dbe9b450a0f9476f70d… --- diff --git a/src/modules/kafka/doc/kafka_admin.xml b/src/modules/kafka/doc/kafka_admin.xml index 09c0eaf8c6..34ae1cf58c 100644 --- a/src/modules/kafka/doc/kafka_admin.xml +++ b/src/modules/kafka/doc/kafka_admin.xml @@ -185,6 +185,40 @@ modparam("kafka", "topic", "name=third_topic") ... # Send "test message" to topic "my_topic" kafka_send("my_topic", "test message"); +... + </programlisting> + </example> + </section> + <section id="kafka.f.kafka_send_key"> + <title> + <function moreinfo="none">kafka_send_key(topic, msg, key)</function> + </title> + <para> + Send a message with an associated key to a specific topic via Kafka server. + </para> + <para> + This function returns -1 for all sort of errors. (So execution of script continues) + </para> + <para> + Parameters: + <itemizedlist> + <listitem><emphasis>topic</emphasis>: (string) name of the topic. + It is mandatory.</listitem> + <listitem><emphasis>msg</emphasis>: (string) message to send. + It is mandatory.</listitem> + <listitem><emphasis>key</emphasis>: (string) associate this key with the message. + It is mandatory.</listitem> + </itemizedlist> + </para> + <para> + Available via KEMI framework as <emphasis>kafka.send_key</emphasis>. + </para> + <example> + <title><function>kafka_send_key</function> usage</title> + <programlisting format="linespecific"> +... +# Send "test message" to topic "my_topic" with key "my_key" +kafka_send_key("my_topic", "test message", "my_key"); ... </programlisting> </example>

1 0

git:master:4a714866: kafka: send messages with key via kafka_send_key function and kafka.send_key for KEMI.
by Vicente Hernando 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 4a71486624cc4ea896b87e422e6014f2393c5f7b URL: https://github.com/kamailio/kamailio/commit/4a71486624cc4ea896b87e422e6014f… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2020-05-20T13:58:49+02:00 kafka: send messages with key via kafka_send_key function and kafka.send_key for KEMI. --- Modified: src/modules/kafka/kafka_mod.c Modified: src/modules/kafka/kfk.c Modified: src/modules/kafka/kfk.h --- Diff: https://github.com/kamailio/kamailio/commit/4a71486624cc4ea896b87e422e6014f… Patch: https://github.com/kamailio/kamailio/commit/4a71486624cc4ea896b87e422e6014f…

1 0

git:master:cc098ecd: evapi: use getaddrinfo() instead of gethostbyname()
by Daniel-Constantin Mierla 20 May '20

20 May '20

Module: kamailio Branch: master Commit: cc098ecdfb556bf5efaab72fa767c773000f9fb6 URL: https://github.com/kamailio/kamailio/commit/cc098ecdfb556bf5efaab72fa767c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-20T13:35:32+02:00 evapi: use getaddrinfo() instead of gethostbyname() - the later is marked as deprecated - GH #1714 --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/cc098ecdfb556bf5efaab72fa767c77… Patch: https://github.com/kamailio/kamailio/commit/cc098ecdfb556bf5efaab72fa767c77… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index e16d4c5ad2..4d253865e9 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -618,9 +618,10 @@ void evapi_recv_notify(struct ev_loop *loop, struct ev_io *watcher, int revents) int evapi_run_dispatcher(char *laddr, int lport) { int evapi_srv_sock; - struct sockaddr_in evapi_srv_addr; struct ev_loop *loop; - struct hostent *h = NULL; + struct addrinfo ai_hints; + struct addrinfo *ai_res = NULL; + int ai_ret = 0; struct ev_io io_server; struct ev_io io_notify; int yes_true = 1; @@ -646,39 +647,37 @@ int evapi_run_dispatcher(char *laddr, int lport) return -1; } - h = gethostbyname(laddr); - if (h == NULL || (h->h_addrtype != AF_INET && h->h_addrtype != AF_INET6)) { - LM_ERR("cannot resolve local server address [%s]\n", laddr); + memset(&ai_hints, 0, sizeof(struct addrinfo)); + ai_hints.ai_family = AF_UNSPEC; /* allow IPv4 or IPv6 */ + ai_hints.ai_socktype = SOCK_STREAM; /* stream socket */ + ai_ret = getaddrinfo(laddr, NULL, &ai_hints, &ai_res); + if (ai_ret != 0) { + LM_ERR("getaddrinfo failed: %d %s\n", ai_ret, gai_strerror(ai_ret)); return -1; } - if(h->h_addrtype == AF_INET) { - evapi_srv_sock = socket(PF_INET, SOCK_STREAM, 0); - } else { - evapi_srv_sock = socket(PF_INET6, SOCK_STREAM, 0); - } - if( evapi_srv_sock < 0 ) - { - LM_ERR("cannot create server socket (family %d)\n", h->h_addrtype); + evapi_srv_sock = socket(ai_res->ai_family, ai_res->ai_socktype, + ai_res->ai_protocol); + if( evapi_srv_sock < 0 ) { + LM_ERR("cannot create server socket (family %d)\n", ai_res->ai_family); + freeaddrinfo(ai_res); return -1; } + /* set non-blocking flag */ fflags = fcntl(evapi_srv_sock, F_GETFL); if(fflags<0) { LM_ERR("failed to get the srv socket flags\n"); close(evapi_srv_sock); + freeaddrinfo(ai_res); return -1; } if (fcntl(evapi_srv_sock, F_SETFL, fflags | O_NONBLOCK)<0) { LM_ERR("failed to set srv socket flags\n"); close(evapi_srv_sock); + freeaddrinfo(ai_res); return -1; } - bzero(&evapi_srv_addr, sizeof(evapi_srv_addr)); - evapi_srv_addr.sin_family = h->h_addrtype; - evapi_srv_addr.sin_port = htons(lport); - evapi_srv_addr.sin_addr = *(struct in_addr*)h->h_addr; - /* Set SO_REUSEADDR option on listening socket so that we don't * have to wait for connections in TIME_WAIT to go away before * re-binding. @@ -688,15 +687,16 @@ int evapi_run_dispatcher(char *laddr, int lport) &yes_true, sizeof(int)) < 0) { LM_ERR("cannot set SO_REUSEADDR option on descriptor\n"); close(evapi_srv_sock); + freeaddrinfo(ai_res); return -1; } - if (bind(evapi_srv_sock, (struct sockaddr*)&evapi_srv_addr, - sizeof(evapi_srv_addr)) < 0) { + if (bind(evapi_srv_sock, ai_res->ai_addr, ai_res->ai_addrlen) < 0) { LM_ERR("cannot bind to local address and port [%s:%d]\n", laddr, lport); close(evapi_srv_sock); return -1; } + freeaddrinfo(ai_res); if (listen(evapi_srv_sock, 4) < 0) { LM_ERR("listen error\n"); close(evapi_srv_sock);

1 0

[kamailio/kamailio] ims_registrar_scscf: fix multiple contacts in 200OK (#2317)
by alexyosifov 20 May '20

20 May '20

- Prevent sending of multiple contacts in 200OK reply for UE Re-Registration. Now S-CSCF replies with the exact contact for Re-Registration.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] 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/2317 -- Commit Summary -- * ims_registrar_scscf: fix multiple contacts in 200OK -- File Changes -- M src/modules/ims_registrar_scscf/reply.c (152) M src/modules/ims_registrar_scscf/reply.h (2) M src/modules/ims_registrar_scscf/save.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2317.patch https://github.com/kamailio/kamailio/pull/2317.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/2317

3 3

git:master:23341c60: ims_registrar_scscf: fix multiple contacts in 200OK
by Henning Westerholt 20 May '20

20 May '20

Module: kamailio Branch: master Commit: 23341c60519bd3e8eb91974c7aca0b283735665e URL: https://github.com/kamailio/kamailio/commit/23341c60519bd3e8eb91974c7aca0b2… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-20T08:28:06+02:00 ims_registrar_scscf: fix multiple contacts in 200OK - Prevent sending of multiple contacts in 200OK reply for UE Re-Registration. Now S-CSCF replies with the exact contact for Re-Registration. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h Modified: src/modules/ims_registrar_scscf/reply.c Modified: src/modules/ims_registrar_scscf/reply.h Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/23341c60519bd3e8eb91974c7aca0b2… Patch: https://github.com/kamailio/kamailio/commit/23341c60519bd3e8eb91974c7aca0b2…

1 0

[kamailio/kamailio] error: 'pkg/docker' does not have a commit checked out (#2003)
by Daniel-Constantin Mierla 19 May '20

19 May '20

When I just tried to do a commit today, I got the following error: ``` kamailio $ git ci . error: 'pkg/docker' does not have a commit checked out fatal: updating files failed ``` It is related to the `pkg/docker` submodule referencing to kamailio/kamailio-ci. Not sure if this is due to a new git version or something else, because I did commits in that folder a few days ago. To get is sorted out, I did: ``` kamailio $ git submodule update pkg/docker Submodule path 'pkg/docker' not initialized Maybe you want to use 'update --init'? kamailio $ git submodule update --init pkg/docker Submodule 'pkg/docker' (https://github.com/kamailio/kamailio-ci.git) registered for path 'pkg/docker' Cloning into '/.../kamailio/pkg/docker'... Submodule path 'pkg/docker': checked out 'b92a1c899b8c474afadd0cf29dd7cb4ea01a3466' ``` Then it worked to do the commit. I wonder if this is going to break the process we were used with, specially the installation guidelines from GIT repo. Therefore I open this item to see if we really need the to have `pkg/docker` submodule, or better have the docker files directly in the repo. Other options to keep things sane and simple? Git version: ``` $ git --version git version 2.22.0 ``` -- 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/2003

5 10

git:master:f2458a66: core: kemi - functions to test http methods
by Daniel-Constantin Mierla 19 May '20

19 May '20

Module: kamailio Branch: master Commit: f2458a66ae46a74b83fe2a3f3886f6015249a960 URL: https://github.com/kamailio/kamailio/commit/f2458a66ae46a74b83fe2a3f3886f60… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-19T14:23:01+02:00 core: kemi - functions to test http methods --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/f2458a66ae46a74b83fe2a3f3886f60… Patch: https://github.com/kamailio/kamailio/commit/f2458a66ae46a74b83fe2a3f3886f60… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index c15621690a..2a63279795 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1076,6 +1076,38 @@ static int sr_kemi_core_is_method_kdmq(sip_msg_t *msg) } +/** + * + */ +static int sr_kemi_core_is_method_get(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_GET); +} + +/** + * + */ +static int sr_kemi_core_is_method_post(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_POST); +} + +/** + * + */ +static int sr_kemi_core_is_method_put(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_PUT); +} + +/** + * + */ +static int sr_kemi_core_is_method_delete(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_DELETE); +} + /** * */ @@ -1769,6 +1801,26 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_GET"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_get, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_POST"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_post, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_PUT"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_put, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("is_DELETE"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_delete, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:d14833d9: dispatcher: sync on load management operations
by Daniel-Constantin Mierla 19 May '20

19 May '20

Module: kamailio Branch: master Commit: d14833d9d1ad6cc92c65e279b7dd89b3b922f129 URL: https://github.com/kamailio/kamailio/commit/d14833d9d1ad6cc92c65e279b7dd89b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-19T13:43:10+02:00 dispatcher: sync on load management operations - use locks to increment/decrement call load and get least loaded dst - GH #2322 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/d14833d9d1ad6cc92c65e279b7dd89b… Patch: https://github.com/kamailio/kamailio/commit/d14833d9d1ad6cc92c65e279b7dd89b… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 589b54f5b8..b51b5b48d0 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -79,6 +79,22 @@ #define DS_ALG_RELWEIGHT 11 #define DS_ALG_PARALLEL 12 +/* increment call load */ +#define DS_LOAD_INC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + (dgrp)->dlist[didx].dload++; \ + lock_release(&(dgrp)->lock); \ + } while(0) + +/* decrement call load */ +#define DS_LOAD_DEC(dgrp, didx) do { \ + lock_get(&(dgrp)->lock); \ + if(likely((dgrp)->dlist[didx].dload > 0)) { \ + (dgrp)->dlist[didx].dload--; \ + } \ + lock_release(&(dgrp)->lock); \ + } while(0) + static int _ds_table_version = DS_TABLE_VERSION; static ds_ht_t *_dsht_load = NULL; @@ -1514,6 +1530,7 @@ int ds_get_leastloaded(ds_set_t *dset) k = -1; t = 0x7fffffff; /* high load */ + lock_get(&dset->lock); \ for(j = 0; j < dset->nr; j++) { if(!ds_skip_dst(dset->dlist[j].flags) && (dset->dlist[j].attrs.maxload == 0 @@ -1525,6 +1542,7 @@ int ds_get_leastloaded(ds_set_t *dset) } } } + lock_release(&dset->lock); \ return k; } @@ -1546,7 +1564,7 @@ int ds_load_add(struct sip_msg *msg, ds_set_t *dset, int setid, int dst) msg->callid->body.s); return -1; } - dset->dlist[dst].dload++; + DS_LOAD_INC(dset, dst); return 0; } @@ -1614,8 +1632,7 @@ int ds_load_replace(struct sip_msg *msg, str *duid) ds_unlock_cell(_dsht_load, &msg->callid->body); ds_del_cell(_dsht_load, &msg->callid->body); - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); if(ds_load_add(msg, idx, set, newdst) < 0) { LM_ERR("unable to replace destination load [%.*s / %.*s]\n", duid->len, @@ -1654,8 +1671,7 @@ int ds_load_remove_byid(int set, str *duid) return -1; } - if(idx->dlist[olddst].dload > 0) - idx->dlist[olddst].dload--; + DS_LOAD_DEC(idx, olddst); return 0; }

1 0

[kamailio/kamailio] Siptrace Module is ignoring force_send_sock parameter (#2330)
by iliesh 19 May '20

19 May '20

### Description Trying to duplicate TLS SIP messages to the remote host directly from Kamailio by using Siptrace Module. Those are the parameters used by the module: ``` modparam("siptrace", "trace_on", 1) modparam("siptrace", "force_send_sock", "sip:192.168.1.1:5000") modparam("siptrace", "trace_mode", 0) modparam("siptrace", "trace_flag", 22) modparam("siptrace", "duplicate_uri", "sip:192.168.1.100") modparam("siptrace", "trace_to_database", 0) modparam("siptrace", "hep_mode_on", 0) modparam("siptrace", "xheaders_write", 1) modparam("siptrace", "trace_local_ip", "MY_EXTERNAL_IP_ADDR") modparam("siptrace", "trace_sl_acks", 0) ``` But seems that Kamailio is ignoring the parameter "force_send_sock" and keep sending from the first listen interface from the configuration file. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.7 (x86_64/linux) 9ea54f ``` * **Operating System**:  ``` CentsOS 7 3.10.0-1127.el7.x86_64 ``` -- 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/2330

2 2

[kamailio/kamailio] keepalive: early start of OPTIONS checking (#2326)
by Nacho G. 19 May '20

19 May '20

- Current code takes some time to start checking (ping_interval). So, if someone sets a really high ping_interval it takes a while to get destination status. This change fires the first OPTIONS check just 3 seconds (fixed) after the destination is added. The checks would be done with the pace defined in ping_interval.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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 - [x] 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 - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Current code takes some time to start checking (ping_interval). So, if someone sets a really high ping_interval it takes a while to get destination status. This change fires the first OPTIONS check just 3 seconds (fixed) after the destination is added. The checks would be done with the pace defined in ping_interval. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2326 -- Commit Summary -- * keepalive: early start of OPTIONS checking -- File Changes -- M src/modules/keepalive/keepalive.h (5) M src/modules/keepalive/keepalive_api.c (4) M src/modules/keepalive/keepalive_core.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2326.patch https://github.com/kamailio/kamailio/pull/2326.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/2326

2 4

git:master:b26951c0: Merge pull request #2326 from NGSegovia/keepalive/first_check_on_start
by GitHub 19 May '20

19 May '20

Module: kamailio Branch: master Commit: b26951c06483a0e9720b65689179541b29c938c5 URL: https://github.com/kamailio/kamailio/commit/b26951c06483a0e9720b65689179541… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-19T12:56:58+02:00 Merge pull request #2326 from NGSegovia/keepalive/first_check_on_start keepalive: early start of OPTIONS checking --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b26951c06483a0e9720b65689179541… Patch: https://github.com/kamailio/kamailio/commit/b26951c06483a0e9720b65689179541… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index a8da607db8..41e8eab00a 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -48,6 +48,8 @@ extern int ka_ping_interval; #define KA_PROBE_INACTIVE 2 #define KA_PROBE_ONLYFLAGGED 3 +#define KA_FIRST_TRY_DELAY 500 /* First OPTIONS send is done 500 millis after adding the destination */ + typedef void (*ka_statechanged_f)(str *uri, int state, void *user_attr); typedef void (*ka_response_f)( str *uri, struct tmcb_params *ps, void *user_attr); @@ -62,6 +64,7 @@ typedef struct _ka_dest int state; time_t last_checked, last_up, last_down; int counter; // counts unreachable attemps + ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr; ka_statechanged_f statechanged_clb; @@ -70,7 +73,7 @@ typedef struct _ka_dest struct ip_addr ip_address; /*!< IP-Address of the entry */ unsigned short int port; /*!< Port of the URI */ unsigned short int proto; /*!< Protocol of the URI */ - struct timer_ln *timer; + struct timer_ln *timer; /*!< Timer firing the OPTIONS test */ struct _ka_dest *next; } ka_dest_t; diff --git a/src/modules/keepalive/keepalive_api.c b/src/modules/keepalive/keepalive_api.c index 18336084af..19339c4ba6 100644 --- a/src/modules/keepalive/keepalive_api.c +++ b/src/modules/keepalive/keepalive_api.c @@ -107,6 +107,7 @@ int ka_add_dest(str *uri, str *owner, int flags, int ping_interval, dest->statechanged_clb = statechanged_clb; dest->response_clb = response_clb; dest->user_attr = user_attr; + dest->ping_interval = MS_TO_TICKS((ping_interval == 0 ? ka_ping_interval : ping_interval) * 1000) ; dest->timer = timer_alloc(); if (dest->timer == NULL) { @@ -116,8 +117,7 @@ int ka_add_dest(str *uri, str *owner, int flags, int ping_interval, timer_init(dest->timer, ka_check_timer, dest, 0); - int actual_ping_interval = ping_interval == 0 ? ka_ping_interval : ping_interval; - if(timer_add(dest->timer, MS_TO_TICKS(actual_ping_interval * 1000)) < 0){ + if(timer_add(dest->timer, MS_TO_TICKS(KA_FIRST_TRY_DELAY)) < 0){ LM_ERR("failed to start timer\n"); goto err; } diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 04b520a62b..4daa57908d 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -82,7 +82,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest->last_checked = time(NULL); - return (ticks_t)(-1); /* periodical */ + return ka_dest->ping_interval; /* periodical, but based on dest->ping_interval, not on initial_timeout */ } /*! \brief

1 0

git:master:f6b5f782: keepalive: early start of OPTIONS checking
by Nacho Garcia Segovia 19 May '20

19 May '20

Module: kamailio Branch: master Commit: f6b5f782e0ebc8570d640415c61b9bf654336154 URL: https://github.com/kamailio/kamailio/commit/f6b5f782e0ebc8570d640415c61b9bf… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-15T08:21:15+02:00 keepalive: early start of OPTIONS checking - Current code takes some time to start checking (ping_interval). So, if someone sets a really high ping_interval it takes a while to get destination status. This change fires the first OPTIONS check just 3 seconds (fixed) after the destination is added. The checks would be done with the pace defined in ping_interval. --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/f6b5f782e0ebc8570d640415c61b9bf… Patch: https://github.com/kamailio/kamailio/commit/f6b5f782e0ebc8570d640415c61b9bf… --- diff --git a/src/modules/keepalive/keepalive.h b/src/modules/keepalive/keepalive.h index a8da607db8..41e8eab00a 100644 --- a/src/modules/keepalive/keepalive.h +++ b/src/modules/keepalive/keepalive.h @@ -48,6 +48,8 @@ extern int ka_ping_interval; #define KA_PROBE_INACTIVE 2 #define KA_PROBE_ONLYFLAGGED 3 +#define KA_FIRST_TRY_DELAY 500 /* First OPTIONS send is done 500 millis after adding the destination */ + typedef void (*ka_statechanged_f)(str *uri, int state, void *user_attr); typedef void (*ka_response_f)( str *uri, struct tmcb_params *ps, void *user_attr); @@ -62,6 +64,7 @@ typedef struct _ka_dest int state; time_t last_checked, last_up, last_down; int counter; // counts unreachable attemps + ticks_t ping_interval; /*!< Actual interval between OPTIONS */ void *user_attr; ka_statechanged_f statechanged_clb; @@ -70,7 +73,7 @@ typedef struct _ka_dest struct ip_addr ip_address; /*!< IP-Address of the entry */ unsigned short int port; /*!< Port of the URI */ unsigned short int proto; /*!< Protocol of the URI */ - struct timer_ln *timer; + struct timer_ln *timer; /*!< Timer firing the OPTIONS test */ struct _ka_dest *next; } ka_dest_t; diff --git a/src/modules/keepalive/keepalive_api.c b/src/modules/keepalive/keepalive_api.c index 18336084af..19339c4ba6 100644 --- a/src/modules/keepalive/keepalive_api.c +++ b/src/modules/keepalive/keepalive_api.c @@ -107,6 +107,7 @@ int ka_add_dest(str *uri, str *owner, int flags, int ping_interval, dest->statechanged_clb = statechanged_clb; dest->response_clb = response_clb; dest->user_attr = user_attr; + dest->ping_interval = MS_TO_TICKS((ping_interval == 0 ? ka_ping_interval : ping_interval) * 1000) ; dest->timer = timer_alloc(); if (dest->timer == NULL) { @@ -116,8 +117,7 @@ int ka_add_dest(str *uri, str *owner, int flags, int ping_interval, timer_init(dest->timer, ka_check_timer, dest, 0); - int actual_ping_interval = ping_interval == 0 ? ka_ping_interval : ping_interval; - if(timer_add(dest->timer, MS_TO_TICKS(actual_ping_interval * 1000)) < 0){ + if(timer_add(dest->timer, MS_TO_TICKS(KA_FIRST_TRY_DELAY)) < 0){ LM_ERR("failed to start timer\n"); goto err; } diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 04b520a62b..4daa57908d 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -82,7 +82,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest->last_checked = time(NULL); - return (ticks_t)(-1); /* periodical */ + return ka_dest->ping_interval; /* periodical, but based on dest->ping_interval, not on initial_timeout */ } /*! \brief

1 0

[kamailio/kamailio] core: add case functions for str_hash get and set (#2332)
by Victor Seva 19 May '20

19 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] 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) - [x] 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 - [x] Tested changes locally #### Description Add str_hash_case_get() and str_hash_case_set() functions You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2332 -- Commit Summary -- * core: add case functions for str_hash get and set -- File Changes -- M src/core/str_hash.h (34) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2332.patch https://github.com/kamailio/kamailio/pull/2332.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/2332

2 2

git:master:6ffe43a5: core: add case functions for str_hash get and set
by Victor Seva 19 May '20

19 May '20

Module: kamailio Branch: master Commit: 6ffe43a50cbc33bb83b14f3aef3341af6b34e6f6 URL: https://github.com/kamailio/kamailio/commit/6ffe43a50cbc33bb83b14f3aef3341a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-19T12:52:27+02:00 core: add case functions for str_hash get and set --- Modified: src/core/str_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/6ffe43a50cbc33bb83b14f3aef3341a… Patch: https://github.com/kamailio/kamailio/commit/6ffe43a50cbc33bb83b14f3aef3341a… --- diff --git a/src/core/str_hash.h b/src/core/str_hash.h index 8755a6272c..263bb3cd3d 100644 --- a/src/core/str_hash.h +++ b/src/core/str_hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006 iptelorg GmbH + * Copyright (C) 2006 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -70,17 +70,17 @@ inline static int str_hash_alloc(struct str_hash_table* ht, int size) inline static void str_hash_init(struct str_hash_table* ht) { int r; - + for (r=0; r<ht->size; r++) clist_init(&(ht->table[r]), next, prev); } -inline static void str_hash_add(struct str_hash_table* ht, +inline static void str_hash_add(struct str_hash_table* ht, struct str_hash_entry* e) { int h; - + h=get_hash1_raw(e->key.s, e->key.len) % ht->size; clist_insert(&ht->table[h], e, next, prev); } @@ -92,7 +92,7 @@ inline static struct str_hash_entry* str_hash_get(struct str_hash_table* ht, { int h; struct str_hash_entry* e; - + h=get_hash1_raw(key, len) % ht->size; clist_foreach(&ht->table[h], e, next){ if ((e->key.len==len) && (memcmp(e->key.s, key, len)==0)) @@ -101,6 +101,30 @@ inline static struct str_hash_entry* str_hash_get(struct str_hash_table* ht, return 0; } +inline static void str_hash_case_add(struct str_hash_table* ht, + struct str_hash_entry* e) +{ + int h; + + h=get_hash1_case_raw(e->key.s, e->key.len) % ht->size; + clist_insert(&ht->table[h], e, next, prev); +} + + + +inline static struct str_hash_entry* str_hash_case_get(struct str_hash_table* ht, + const char* key, int len) +{ + int h; + struct str_hash_entry* e; + + h=get_hash1_case_raw(key, len) % ht->size; + clist_foreach(&ht->table[h], e, next){ + if ((e->key.len==len) && (strncasecmp(e->key.s, key, len)==0)) + return e; + } + return 0; +} #define str_hash_del(e) clist_rm(e, next, prev)

1 0

RTPEngine - Support for Unified Plan SDP Format
by M S 19 May '20

19 May '20

Hi, Since Chrome M72, the default format of SDP generated by Chrome's WebRTC stack has been changed to "unified-plan" instead of Google's old "plan-b" format, which has no been deprecated and planned to be removed sometime in mid 2020. Here are more details about it. https://webrtc.org/getting-started/unified-plan-transition-guide This poses a big problem for non-web WebRTC clients, servers and proxies (such as RTPEngine) which will stop working as soon as Google Chrome removes support for legacy "plan-b" SDP format. In kmaialio's RTPEngine module, so far I have seen no support for this new "unified-plan" SDP format. Are there any support planed for future? Meanwhile, if there any way to add support for it in Kamailio via SDP manipulation e.g. SDPOPS module etc. Thank you. -- Muhammad Shahzad Shafi Tel: +49 176 24 73 85 20

3 3

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,jessie #1668
by kamailio＠sipwise.com 19 May '20

19 May '20

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> Changes: ------------------------------------------ [...truncated 5.35 KB...] + ls -la ./ total 8780 drwxr-xr-x 2 admin admin 4096 May 17 01:02 . drwxr-xr-x 3 admin admin 4096 May 17 01:02 .. -rw-r--r-- 1 admin admin 4926 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686.dsc -rw-r--r-- 1 admin admin 5701 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686_source.changes -rw-r--r-- 1 admin admin 8954008 May 17 00:57 kamailio_5.4.0~dev4+bpo8.20200517005639.1686.tar.xz -rw-r--r-- 1 admin admin 4156 May 17 00:57 lintian.txt + identify_package_name + PACKAGE=kamailiodev-nightly-binaries/architecture=i386,distribution=jessie + PACKAGE=kamailiodev-nightly + '[' -n kamailiodev-nightly ']' + echo '*** Identified Debian package name kamailiodev-nightly ***' *** Identified Debian package name kamailiodev-nightly *** + set_base_path + '[' -n '' ']' + BASE_PATH=<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> + echo '*** Using $WORKSPACE [<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…]> as default for BASE_PATH ***' *** Using $WORKSPACE [<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…]> as default for BASE_PATH *** + build_info + '[' -n '' ']' + REPOS=kamailiodev-nightly + REPOS=kamailiodev-nightly + '[' -z jessie ']' + REPOS=kamailiodev-nightly-jessie + echo '*** No repository supplied but distribution has been set, using repository name kamailiodev-nightly-jessie ***' *** No repository supplied but distribution has been set, using repository name kamailiodev-nightly-jessie *** + identify_sourcefile + '[' -n '' ']' + echo '*** Identifying newest package version ***' *** Identifying newest package version *** + newest_version= + for file in "${BASE_PATH}/"*.dsc ++ awk '/^Source: / {print $2}' <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> + SOURCE_PACKAGE=kamailio ++ basename <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> .dsc + p=kamailio_5.4.0~dev4+bpo8.20200517005639.1686 + '[' kamailio_5.4.0~dev4+bpo8.20200517005639.1686 = '*' ']' + cur_version=5.4.0~dev4+bpo8.20200517005639.1686 + '[' -z '' ']' + newest_version=5.4.0~dev4+bpo8.20200517005639.1686 + echo '*** Found package version 5.4.0~dev4+bpo8.20200517005639.1686 ***' *** Found package version 5.4.0~dev4+bpo8.20200517005639.1686 *** + sourcefile='<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + echo '*** Using <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> (version: 5.4.0~dev4+bpo8.20200517005639.1686)' *** Using <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> (version: 5.4.0~dev4+bpo8.20200517005639.1686) + dist_and_arch_settings + '[' -z i386 ']' + '[' i386 = all ']' + arch=i386 + echo '*** architecture is set to i386 ***' *** architecture is set to i386 *** + '[' -n jessie ']' + local DIST=jessie + '[' -n jessie ']' + echo '*** COWBUILDER_DIST is set to jessie - using it for base.cow if it does not exist yet. ***' *** COWBUILDER_DIST is set to jessie - using it for base.cow if it does not exist yet. *** + '[' -n '' ']' + COWBUILDER_BASE=/var/cache/pbuilder/base-jessie-i386.cow + echo '*** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jessie-i386.cow as cowbuilder base.cow ***' *** No COWBUILDER_BASE set, using /var/cache/pbuilder/base-jessie-i386.cow as cowbuilder base.cow *** + local lockfiles=/var/run/lock/jessie-i386 + build_lockfile=/var/run/lock/jessie-i386.building.7033 + update_lockfile=/var/run/lock/jessie-i386.update + update_lockfile_pid=/var/run/lock/jessie-i386.update.7033 + '[' -n '' ']' + cowbuilder_init ++ mktemp + pbuilderrc=/tmp/tmp.k2xcvcT5qy ++ date + echo '# pbuilder config file generated by jenkins-debian-glue on Sun May 17 01:02:59 UTC 2020' + '[' -n '' ']' + '[' '' = true ']' + use_eatmydata + '[' '' = false ']' + '[' '' = true ']' + grep -q '^install' + dpkg-query --show '--showformat=${Status}' eatmydata ++ dpkg-query --show '--showformat=${Version}' eatmydata + dpkg --compare-versions 105-5 gt 26-2 + echo '*** eatmydata is present on host system, now checking distribution support ***' *** eatmydata is present on host system, now checking distribution support *** + case "${COWBUILDER_DIST}" in + echo '*** Distribution jessie should provide recent eatmydata support, enabling eatmydata ***' *** Distribution jessie should provide recent eatmydata support, enabling eatmydata *** + enable_eatmydata + echo 'EXTRAPACKAGES="$EXTRAPACKAGES eatmydata"' + echo 'export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so"' + echo '# builtin support available with pbuilder >=0.225 (otherwise ignored):' + echo EATMYDATA=yes + use_ccache + '[' '' = true ']' + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config ***' *** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config *** + '[' -r /etc/jenkins/pbuilderrc ']' + echo '*** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile ***' *** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile *** + echo '# /etc/jenkins/pbuilderrc added via jenkins-debian-glue:' + cat /etc/jenkins/pbuilderrc + '[' -n '' ']' + echo '*** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround ***' *** COMPONENTS is not set, checking whether we need to enable Ubuntu workaround *** + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround ***' *** PBUILDER_CONFIG is set, not overwriting COMPONENTS for Ubuntu workaround *** + echo '*** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes '\''universe'\'' ***' *** NOTE: If you want to build for Ubuntu make sure COMPONENTS also includes 'universe' *** + grep -q Ubuntu + lsb_release --id + echo '*** Listing pbuilder configuration file as reference: ***' *** Listing pbuilder configuration file as reference: *** + cat /tmp/tmp.k2xcvcT5qy # pbuilder config file generated by jenkins-debian-glue on Sun May 17 01:02:59 UTC 2020 EXTRAPACKAGES="$EXTRAPACKAGES eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" # builtin support available with pbuilder >=0.225 (otherwise ignored): EATMYDATA=yes # /etc/jenkins/pbuilderrc added via jenkins-debian-glue: # distribution specific configuration case "$distribution" in xenial|bionic) MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; trusty|precise) # lacks eatmydata package, so explicitly configure it MIRRORSITE="http://archive.ubuntu.com/ubuntu/" # we need key id 40976EAF437D05B5 DEBOOTSTRAPOPTS=("${DEBOOTSTRAPOPTS[@]}" "--keyring=/usr/share/keyrings/ubuntu-archive-keyring.gpg") # cowdancer is in universe COMPONENTS="main universe" # security and updates OTHERMIRROR="deb http://archive.ubuntu.com/ubuntu/ ${distribution}-updates main universe|deb-src http://security.ubuntu.com/ubuntu ${distribution}-security main universe" # ensure it's unset unset LD_PRELOAD ;; wheezy) # nowadays also resides on archive MIRRORSITE="http://archive.debian.org/debian/" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; jessie|stretch|buster) MIRRORSITE="http://deb.debian.org/debian" # security and updates OTHERMIRROR="deb http://security.debian.org/debian-security ${distribution}/updates main" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; bullseye|*) MIRRORSITE="http://deb.debian.org/debian" # package install speedup EXTRAPACKAGES="eatmydata" export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so" ;; esac + ls '/var/cache/pbuilder/base-jessie-i386.cow.building.*' + ls '/var/run/lock/jessie-i386.update*' + flock --nonblock 9 + touch /var/run/lock/jessie-i386.update.7033 + '[' '!' -d /var/cache/pbuilder/base-jessie-i386.cow ']' + '[' '' = true ']' + echo '*** Updating cowbuilder cow base ***' *** Updating cowbuilder cow base *** + sudo DIST=jessie ARCH=i386 cowbuilder --update --basepath /var/cache/pbuilder/base-jessie-i386.cow --configfile=/tmp/tmp.k2xcvcT5qy I: Copying COW directory I: forking: rm -rf /var/cache/pbuilder/build/cow.7077 I: forking: cp -al /var/cache/pbuilder/base-jessie-i386.cow /var/cache/pbuilder/build/cow.7077 I: removed stale ilistfile /var/cache/pbuilder/build/cow.7077/.ilist I: Invoking pbuilder I: forking: pbuilder update --configfile /tmp/tmp.k2xcvcT5qy --buildplace /var/cache/pbuilder/build/cow.7077 --extrapackages eatmydata --no-targz --internal-chrootexec 'chroot /var/cache/pbuilder/build/cow.7077 cow-shell' W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: Current time: Sun May 17 01:03:00 UTC 2020 I: pbuilder-time-stamp: 1589677380 I: copying local configuration I: mounting /proc filesystem I: mounting /sys filesystem I: creating /{dev,run}/shm I: mounting /dev/pts filesystem I: redirecting /dev/ptmx to /dev/pts/ptmx I: policy-rc.d already exists I: using eatmydata during job I: Refreshing the base.tgz I: upgrading packages Ign http://deb.debian.org jessie InRelease Hit http://deb.debian.org jessie Release.gpg Hit http://deb.debian.org jessie Release Get:1 http://security.debian.org jessie/updates InRelease [44.9 kB] Hit http://deb.debian.org jessie/main i386 Packages Hit http://security.debian.org jessie/updates/main i386 Packages Fetched 44.9 kB in 10s (4223 B/s) W: Failed to fetch http://security.debian.org/debian-security/dists/jessie/updates/main/binary… Hash Sum mismatch E: Some index files failed to download. They have been ignored, or old ones used instead. I: unmounting dev/ptmx filesystem I: unmounting dev/pts filesystem I: unmounting dev/shm filesystem I: unmounting proc filesystem I: unmounting sys filesystem E: pbuilder update failed E: could not update with cowdancer, try --no-cowdancer-update option I: forking: rm -rf /var/cache/pbuilder/build/cow.7077 + '[' 1 -eq 0 ']' + exit 3 + case "$?" in + bailout 1 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' ']' + echo 'Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow.' Error: Failed to update cowbuilder base /var/cache/pbuilder/base-jessie-i386.cow. + rm -f /var/run/lock/jessie-i386.building.7033 + '[' -r /var/run/lock/jessie-i386.update.7033 ']' + rm -f /var/run/lock/jessie-i386.update.7033 + rm -f /var/run/lock/jessie-i386.update + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.k2xcvcT5qy ']' + rm -rf /tmp/tmp.k2xcvcT5qy + '[' -n '' ']' + '[' -n 215 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=20 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sun May 17 01:03:19 UTC 2020 [running 20 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sun May 17 01:03:19 UTC 2020 [running 20 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:master:d500589d: dmq: use module prefix for global variables
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: d500589d1503b62df0db9a837f1a80ae8425b840 URL: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T12:06:05+02:00 dmq: use module prefix for global variables - avoid potential conflicts with other globals, given that this module is used by other modules to perform replication --- Modified: src/modules/dmq/bind_dmq.h Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmq.h Modified: src/modules/dmq/dmq_funcs.c Modified: src/modules/dmq/dmq_funcs.h Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/dmq/message.h Modified: src/modules/dmq/notification_peer.c Modified: src/modules/dmq/notification_peer.h Modified: src/modules/dmq/peer.c Modified: src/modules/dmq/peer.h Modified: src/modules/dmq/worker.c Modified: src/modules/dmq/worker.h --- Diff: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a… Patch: https://github.com/kamailio/kamailio/commit/d500589d1503b62df0db9a837f1a80a…

1 0

git:master:17d30403: core: kemi - added KSR.is_KDQM()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 17d3040365400d14d251247c9c3319fc003f2cb2 URL: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T11:28:20+02:00 core: kemi - added KSR.is_KDQM() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Patch: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 7a5ba1068d..c15621690a 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1067,6 +1067,15 @@ static int sr_kemi_core_is_method_message(sip_msg_t *msg) } +/** + * + */ +static int sr_kemi_core_is_method_kdmq(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_KDMQ); +} + + /** * */ @@ -1755,6 +1764,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_KDMQ"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_kdmq, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] KSR.is_MESSAGE() Not implemented (#2331)
by hance2010 18 May '20

18 May '20

### Description KSR.is_MESSAGE() Not implemented. kamailio v5.3.4  ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2331

2 2

git:master:8db5a12f: core: kemi - added missing is_MESSAGE()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 8db5a12f7fab1a1fc7d50c87bbf1aee325b067c2 URL: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T08:29:09+02:00 core: kemi - added missing is_MESSAGE() - GH #2331 --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Patch: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8a77c227b7..7a5ba1068d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1057,6 +1057,16 @@ static int sr_kemi_core_is_method_prack(sip_msg_t *msg) return sr_kemi_core_is_method_type(msg, METHOD_PRACK); } + +/** + * + */ +static int sr_kemi_core_is_method_message(sip_msg_t *msg) +{ + return sr_kemi_core_is_method_type(msg, METHOD_MESSAGE); +} + + /** * */ @@ -1740,6 +1750,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_MESSAGE"), + SR_KEMIP_BOOL, sr_kemi_core_is_method_message, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_UDP"), SR_KEMIP_BOOL, sr_kemi_core_is_proto_udp, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:7749069c: uid_uri_db: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 7749069cd05b9619ee32237773097441e241bac4 URL: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:18+02:00 uid_uri_db: use file specific include guard --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Patch: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… --- diff --git a/src/modules/uid_uri_db/uid_uri_db_mod.h b/src/modules/uid_uri_db/uid_uri_db_mod.h index e4848ecd93..aa72a2aa5b 100644 --- a/src/modules/uid_uri_db/uid_uri_db_mod.h +++ b/src/modules/uid_uri_db/uid_uri_db_mod.h @@ -27,8 +27,8 @@ */ -#ifndef URIDB_MOD_H -#define URIDB_MOD_H +#ifndef _UID_URI_DB_MOD_H_ +#define _UID_URI_DB_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:master:3d73e8cb: acc_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 3d73e8cb9f7431383c5a4ce798e2610f37ff92dc URL: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:00:28+02:00 acc_diameter: use file specific include guard --- Modified: src/modules/acc_diameter/diam_message.h --- Diff: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Patch: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… --- diff --git a/src/modules/acc_diameter/diam_message.h b/src/modules/acc_diameter/diam_message.h index 9051f0f7a1..7ca1caf27e 100644 --- a/src/modules/acc_diameter/diam_message.h +++ b/src/modules/acc_diameter/diam_message.h @@ -26,8 +26,8 @@ * - Module: \ref acc */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _ACC_DIAM_MESSAGE_H_ +#define _ACC_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:9053c70f: auth_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 9053c70fe7e147b784c53a57014796282701c74d URL: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:00+02:00 auth_diameter: use file specific include guard --- Modified: src/modules/auth_diameter/diameter_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Patch: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… --- diff --git a/src/modules/auth_diameter/diameter_msg.h b/src/modules/auth_diameter/diameter_msg.h index 7ab5a8c383..e8e7eea875 100644 --- a/src/modules/auth_diameter/diameter_msg.h +++ b/src/modules/auth_diameter/diameter_msg.h @@ -13,15 +13,15 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _AAA_DIAMETER_MSG_H -#define _AAA_DIAMETER_MSG_H +#ifndef _AUTH_DIAM_MESSAGE_H_ +#define _AUTH_DIAM_MESSAGE_H_ #include "../../core/str.h" #include "../../core/mem/mem.h"

1 0

git:master:d26ccdea: core: define macro for signature to be used for server and user-agent
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: d26ccdea61230bfc7720a2523c7b6dd8d2692d6d URL: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:20:45+02:00 core: define macro for signature to be used for server and user-agent --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Patch: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… --- diff --git a/src/core/config.h b/src/core/config.h index 63ff8dc26c..e35fd6daba 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -79,12 +79,15 @@ #define CONTENT_LENGTH "Content-Length: " #define CONTENT_LENGTH_LEN (sizeof(CONTENT_LENGTH)-1) -#define USER_AGENT "User-Agent: " NAME \ +#define SRVAPP_SIGNATURE NAME \ " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SRVAPP_SIGNATURE_LEN (sizeof(SRVAPP_SIGNATURE)-1) + + +#define USER_AGENT "User-Agent: " SRVAPP_SIGNATURE #define USER_AGENT_LEN (sizeof(USER_AGENT)-1) -#define SERVER_HDR "Server: " NAME \ - " (" VERSION " (" ARCH "/" OS_QUOTED "))" +#define SERVER_HDR "Server: " SRVAPP_SIGNATURE #define SERVER_HDR_LEN (sizeof(SERVER_HDR)-1) #define MAX_WARNING_LEN 256

1 0

git:master:c0e687d8: websocket: use signature macro instead of offsetting inside server hdr define
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: c0e687d820f9bbf2b6b1ef6892e5b34c30f25a63 URL: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:21:43+02:00 websocket: use signature macro instead of offsetting inside server hdr define - pass rcv info structure by address - remove function name from logs --- Modified: src/modules/websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Patch: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 87cf4e3a5f..5cef5d6b1a 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -210,8 +210,8 @@ static int mod_init(void) } if(ws_ping_application_data.len < 1 || ws_ping_application_data.len > 125) { - ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA + 8; - ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN - 8; + ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA; + ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN; } if(ws_keepalive_mechanism != KEEPALIVE_MECHANISM_NONE) { diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a4442ae0d8..8570afa086 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -184,14 +184,14 @@ void wsconn_destroy(void) } } -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) { int cur_cons, max_cons; - int id = rcv.proto_reserved1; + int id = rcv->proto_reserved1; int id_hash = tcp_id_hash(id); ws_connection_t *wsc; - LM_DBG("wsconn_add id [%d]\n", id); + LM_DBG("connection id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -203,13 +203,13 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; - wsc->rcv = rcv; + wsc->rcv = *rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; wsc->frag_buf.s = ((char *)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); - LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); WSCONN_LOCK; @@ -229,7 +229,7 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) WSCONN_UNLOCK; - LM_DBG("wsconn_add added to conn_table wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("added to conn_table wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); /* Update connection statistics */ diff --git a/src/modules/websocket/ws_conn.h b/src/modules/websocket/ws_conn.h index 9319238e4d..f8aa93543c 100644 --- a/src/modules/websocket/ws_conn.h +++ b/src/modules/websocket/ws_conn.h @@ -95,7 +95,7 @@ extern stat_var *ws_msrp_max_concurrent_connections; int wsconn_init(void); void wsconn_destroy(void); -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol); +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol); int wsconn_rm(ws_connection_t *wsc, ws_conn_eventroute_t run_event_route); int wsconn_update(ws_connection_t *wsc); void wsconn_close_now(ws_connection_t *wsc); diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d0f8d84ed0..51a62e04c8 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -49,8 +49,8 @@ extern int ws_keepalive_mechanism; #define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ extern str ws_ping_application_data; -#define DEFAULT_PING_APPLICATION_DATA SERVER_HDR -#define DEFAULT_PING_APPLICATION_DATA_LEN SERVER_HDR_LEN +#define DEFAULT_PING_APPLICATION_DATA SRVAPP_SIGNATURE +#define DEFAULT_PING_APPLICATION_DATA_LEN SRVAPP_SIGNATURE_LEN extern stat_var *ws_failed_connections; extern stat_var *ws_local_closed_connections; diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 58e6077bb5..878c483f2a 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -310,7 +310,7 @@ int ws_handle_handshake(struct sip_msg *msg) (unsigned char *)reply_key.s, base64_enc_len(SHA_DIGEST_LENGTH)); /* Add the connection to the WebSocket connection table */ - wsconn_add(msg->rcv, sub_protocol); + wsconn_add(&msg->rcv, sub_protocol); /* Make sure Kamailio core sends future messages on this connection directly to this module */

1 0

git:master:97c7081d: path: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 97c7081df94eaabd8e48b084671ea831b5ec9024 URL: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:41+02:00 path: updates for outboud module api --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Patch: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 55cd859c90..137c73b720 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -80,7 +80,7 @@ static int handleOutbound(sip_msg_t* _m, str *user, path_param_t *param) if (path_obb.use_outbound != NULL && path_obb.use_outbound(_m)) { struct via_body *via; - if (path_obb.encode_flow_token(user, _m->rcv) != 0) { + if (path_obb.encode_flow_token(user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; }

1 0

git:master:6aca846d: rr: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 6aca846dce4b797a66aaa865fb5a1e81f7806b4c URL: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:50+02:00 rr: updates for outboud module api --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Patch: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 54da64cf99..0b74356905 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -398,7 +398,7 @@ int record_route(struct sip_msg* _m, str *params) } } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } @@ -529,7 +529,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) return -1; } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } @@ -781,7 +781,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -1; } } else if (use_ob == 1) { - if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { + if (rr_obb.encode_flow_token(&user, &_m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; }

1 0

git:master:56ea88ef: outbound: pass recv info struct by address
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 56ea88ef9a0628d7ca644f31840101ffe573e5c3 URL: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:49:17+02:00 outbound: pass recv info struct by address - fix performance inefficiency for passing large structs by value --- Modified: src/modules/outbound/api.h Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Patch: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… --- diff --git a/src/modules/outbound/api.h b/src/modules/outbound/api.h index 6e65e44e17..ae2b3b3615 100644 --- a/src/modules/outbound/api.h +++ b/src/modules/outbound/api.h @@ -30,7 +30,7 @@ #include "../../core/str.h" #include "../../core/sr_module.h" -typedef int (*encode_flow_token_t)(str *, struct receive_info); +typedef int (*encode_flow_token_t)(str *, struct receive_info *); typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info **, str); typedef int (*use_outbound_t)(struct sip_msg *); diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 788376541c..82d18a3eca 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -156,7 +156,7 @@ static void destroy(void) static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_MAX_LENGTH]; static unsigned char hmac_sha1[EVP_MAX_MD_SIZE]; -int encode_flow_token(str *flow_token, struct receive_info rcv) +int encode_flow_token(str *flow_token, struct receive_info *rcv) { int pos = FLOW_TOKEN_START_POS, i; @@ -168,19 +168,19 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv.dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv.proto; + (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for (i = 0; i < (rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.dst_port & 0xff; + for (i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->dst_port & 0xff; /* Encode source address */ - for (i = 0; i < (rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.src_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.src_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.src_port & 0xff; + for (i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->src_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->src_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->src_port & 0xff; /* HMAC-SHA1 the calculated flow-token, truncate to 80 bits, and prepend onto the flow-token */

1 0

[kamailio/kamailio] RPC Command tm.clean (#2329)
by Marat 15 May '20

15 May '20

Hello. I have a philosophical question about [tm.clean](https://kamailio.org/docs/modules/5.1.x/modules/tm.html#tm.rpc.cl… command. Unfortunately, I don’t understand what this command is for, because in my view, expired transactions are automatically deleted. This is all I could find: > pc command tm.clean to clean long time expired transactions (for troubleshooting purposes) [[1]](https://www.kamailio.org/wiki/features/new-in-5.1.x) So, can you give an example when a transaction can remain in memory? 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/issues/2329

2 2

possible bug on kemi dlg_ontimeout
by David Escartin 15 May '20

15 May '20

Hello all Testing dialog timeout event callback for kemi lua setup on kamailio 5.4.0-dev3 (x86_64/linux) d74157-dirty, i had some problems to perform the dlg timeroute behaviour the same as we could on native version. If i used KSR.dialog.var_sets to set $dlg_ctx(timeout_route), I saw that on a dialog timeout, the dlg_ontimeout event route was not triggered, and only the dialog callback was executed with evname dialog:end. (only executing event_route -1 on state 5) So i'm guessing that the kemi dialog var_sets is for $dlg_var only (¿?) Anycase, If i used KSR.pv.sets, i saw the kamailio was crashing ..... 16(5579) DEBUG: dialog [dlg_hash.c:1013]: dlg_ref_helper(): ref dlg 0x7f9a961f5f90 with 1 -> 3 16(5579) DEBUG: dialog [dlg_handlers.c:1589]: dlg_ontimeout(): executing route -1 on timeout 22(5645) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 8 22(5645) DEBUG: <core> [core/tcp_main.c:3762]: handle_ser_child(): dead child 16, pid 5579 (shutting down?) .... Adding some debug, i could see that the call was not attempting the kemi function of line 1598 of dlg_handlers.c, and was trying the code i think was for native on line 1593. We think the issue is that the toroute is defined as unsigned dlg_hash.h: unsigned int toroute; /*!< index of route that is executed on timeout */ but after that when setting $dlg_ctx(timeout_route) with pv module, it tries to compare an integer being unsigned, so it's always true and never uses kemi with this change we made it work + if ((int)(dlg->toroute) > 0) { + /*if(dlg->toroute>0) {*/ but i don't know maybe there is a better way to do it. best regards david

2 5

[kamailio/kamailio] tm core.when free ack cancel_buf. (#2321)
by zhangyang 15 May '20

15 May '20

### Description wh have a too long 500msg,when the build ack,it abort we use ka listen two port ,and use port 1 send port 2 after port2 send port1,it loop in kamailio.cfg.its my wrong,but kamailio core.... ### Troubleshooting #### Debugging Data this is core bt #0 0x00002ae1c343c5f7 in raise () from /lib64/libc.so.6 #1 0x00002ae1c343dce8 in abort () from /lib64/libc.so.6 #2 0x000000000068155a in qm_debug_check_frag (qm=0x2ae1c8fb4000, f=0x2ae1c93bf558, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", line=518, efile=0x7f1ca7 "core/mem/q_malloc.c", eline=504) at core/mem/q_malloc.c:139 #3 0x0000000000684bf5 in qm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:504 #4 0x000000000068e83f in qm_shm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:1268 #5 0x00002ae1c4951e76 in build_local_reparse (Trans=0x2ae1c94524d8, branch=0, len=0x7ffe977ff370, method=0x2ae1c4a2399b "ACK", method_len=3, to=0x7ffe977ff130, reason=0x0) at t_msgbuilder.c:518 #6 0x00002ae1c497336e in build_ack (rpl=0x2ae1c3d3bb08, trans=0x2ae1c94524d8, branch=0, ret_len=0x7ffe977ff370) at t_reply.c:354 #7 0x00002ae1c4986066 in reply_received (p_msg=0x2ae1c3d3bb08) at t_reply.c:2292 #8 0x000000000053da31 in do_forward_reply (msg=0x2ae1c3d3bb08, mode=0) at core/forward.c:748 #9 0x000000000053f5a9 in forward_reply (msg=0x2ae1c3d3bb08) at core/forward.c:853 #10 0x000000000059c633 in receive_msg ( buf=0xa6ee20 <buf.6868> "SIP/2.0 500 Internal Server Error\r\nVia: SIP/2.0/UDP 172.18.67.32;branch=z9hG4bK4301.6c6183869659ad37775254042e1ec6f4.0\r\nVia: SIP/2.0/UDP 172.18.67.32;branch=z9hG4bK4301.a149a0620b507cd0ba760eeb1cd32b3"..., len=27098, rcv_info=0x7ffe977ffae0) at core/receive.c:434 #11 0x000000000048e42c in udp_rcv_loop () at core/udp_server.c:541 #12 0x000000000042509d in main_loop () at main.c:1669 #13 0x000000000042c788 in main (argc=9, argv=0x7ffe97800028) at main.c:2710 (gdb) up #1 0x00002ae1c343dce8 in abort () from /lib64/libc.so.6 (gdb) up #2 0x000000000068155a in qm_debug_check_frag (qm=0x2ae1c8fb4000, f=0x2ae1c93bf558, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", line=518, efile=0x7f1ca7 "core/mem/q_malloc.c", eline=504) at core/mem/q_malloc.c:139 139 core/mem/q_malloc.c: 没有那个文件或目录. (gdb) up #3 0x0000000000684bf5 in qm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:504 504 in core/mem/q_malloc.c (gdb) up #4 0x000000000068e83f in qm_shm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:1268 1268 in core/mem/q_malloc.c (gdb) up #5 0x00002ae1c4951e76 in build_local_reparse (Trans=0x2ae1c94524d8, branch=0, len=0x7ffe977ff370, method=0x2ae1c4a2399b "ACK", method_len=3, to=0x7ffe977ff130, reason=0x0) at t_msgbuilder.c:518 518 t_msgbuilder.c: 没有那个文件或目录. (gdb) p cancel_buf $1 = 0x2ae1c93bf590 "ACK sip:2002@172.18.67.42 SIP/2.0\r\n\253" (gdb) p reason $2 = (struct cancel_reason *) 0x0 #### Log Messages [2020-05-11 11:10:27] (124796) INFO: <script>: IN_REPLY_PBX [2020-05-11 11:10:27] (124796) INFO: <script>: IN_REPLY_PBX IN Call <null>: Status 100 3001@172.18.67.42:5060 -----> 2002@172.18.67.32:5060 [2020-05-11 11:10:27] (124796) ERROR: tm [t_msgbuilder.c:516]: build_local_reparse(): HDR_EOH_T was not found [2020-05-11 11:10:27] (124796) CRITICAL: <core> [core/mem/q_malloc.c:137]: qm_debug_check_frag(): BUG: qm: fragm. 0x2ae1c93bf558 (address 0x2ae1c93bf590) end overwritten (2e322f5049532032, ab0a0d30)! Memory allocator was called from tm: t_msgbuilder.c:518. Fragment marked by tm: t_msgbuilder.c:345. Exec from core/mem/q_malloc.c:504. #### SIP Traffic we use ka listen two port ,and use port 1 send port 2 after port2 send port1,it loop in kamailio.cfg.its my wrong,but kamailio core.... ### Possible Solutions we see t_msgbuilder.c shm_free(cancel_buf); faild ... ### Additional Information version: kamailio 5.2.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 15:28:15 Nov 4 2019 with gcc 4.8.5 * **Operating System**: CentOS Linux release 7.2.1511 (Core) Linux localhost.localdomain 3.10.0-327.el7.x86_64 #1 SMP Thu Nov 19 22:10:57 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux -- 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/2321

3 8

git:master:7ae675bd: pua_reginfo: free xml doc in case of error
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 7ae675bd90b4420ebaa17768c97aa09219f53116 URL: https://github.com/kamailio/kamailio/commit/7ae675bd90b4420ebaa17768c97aa09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T21:21:51+02:00 pua_reginfo: free xml doc in case of error - a few whitespacing fixes --- Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae675bd90b4420ebaa17768c97aa09… Patch: https://github.com/kamailio/kamailio/commit/7ae675bd90b4420ebaa17768c97aa09… --- diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index f8a55480bb..f128680122 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -16,8 +16,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -57,7 +57,7 @@ void pua_reginfo_update_self_op(int v) } str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { - xmlDocPtr doc = NULL; + xmlDocPtr doc = NULL; xmlNodePtr root_node = NULL; xmlNodePtr registration_node = NULL; xmlNodePtr contact_node = NULL; @@ -78,11 +78,12 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { root_node = xmlNewNode(NULL, BAD_CAST "reginfo"); if(root_node==0) { LM_ERR("Unable to create reginfo-XML-Element\n"); + xmlFreeDoc(doc); return NULL; } /* This is our Root-Element: */ - xmlDocSetRootElement(doc, root_node); - + xmlDocSetRootElement(doc, root_node); + xmlNewProp(root_node, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:reginfo"); /* we set the version to 0 but it should be set to the correct value in the pua module */ @@ -163,7 +164,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { memset(buf, 0, sizeof(buf)); snprintf(buf, sizeof(buf), "%.*s", ptr->received.len, ptr->received.s); xmlNewProp(contact_node, BAD_CAST "received", BAD_CAST buf); - + /* path Attribute */ memset(buf, 0, sizeof(buf)); snprintf(buf, sizeof(buf), "%.*s", ptr->path.len, ptr->path.s); @@ -216,7 +217,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { } if(doc) xmlFreeDoc(doc); return NULL; -} +} void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str* body= NULL; @@ -240,7 +241,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { content_type.s = "application/reginfo+xml"; content_type.len = 23; - + /* Debug Output: */ LM_DBG("AOR: %.*s (%.*s)\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); if(type & UL_CONTACT_INSERT) LM_DBG("type= UL_CONTACT_INSERT\n"); @@ -292,7 +293,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { } uri.len = snprintf(uri.s, uri.len, "sip:%.*s", record->aor.len, record->aor.s); } - + /* Build the XML-Body: */ body = build_reginfo_full(record, uri, c, type); @@ -315,8 +316,8 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ.id.len = id_buf_len; publ.content_type = content_type; publ.expires = 3600; - - /* make UPDATE_TYPE, as if this "publish dialog" is not found + + /* make UPDATE_TYPE, as if this "publish dialog" is not found by pua it will fallback to INSERT_TYPE anyway */ publ.flag|= UPDATE_TYPE; publ.source_flag |= REGINFO_PUBLISH; @@ -328,7 +329,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(pua.send_publish(&publ) < 0) { LM_ERR("Error while sending publish\n"); - } + } error: if (uri.s) pkg_free(uri.s); if(body) { @@ -338,4 +339,4 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(record) ul.release_urecord(record); return; -} +}

1 0

git:master:4ad790f6: evapi: cast to void* when printing logs with pointer value
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 4ad790f697554332ea590793d3ec56e13437e82f URL: https://github.com/kamailio/kamailio/commit/4ad790f697554332ea590793d3ec56e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T21:15:51+02:00 evapi: cast to void* when printing logs with pointer value --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/4ad790f697554332ea590793d3ec56e… Patch: https://github.com/kamailio/kamailio/commit/4ad790f697554332ea590793d3ec56e… --- diff --git a/src/modules/evapi/evapi_dispatch.c b/src/modules/evapi/evapi_dispatch.c index 52e8f1d23e..e16d4c5ad2 100644 --- a/src/modules/evapi/evapi_dispatch.c +++ b/src/modules/evapi/evapi_dispatch.c @@ -606,7 +606,7 @@ void evapi_recv_notify(struct ev_loop *loop, struct ev_io *watcher, int revents) return; } - LM_DBG("received [%p] [%.*s] (%d)\n", emsg, + LM_DBG("received [%p] [%.*s] (%d)\n", (void*)emsg, emsg->data.len, emsg->data.s, emsg->data.len); evapi_dispatch_notify(emsg); shm_free(emsg); @@ -774,8 +774,8 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) emsg->unicast = unicast; } - LM_DBG("sending [%p] [%.*s] (%d)\n", emsg, emsg->data.len, emsg->data.s, - emsg->data.len); + LM_DBG("sending [%p] [%.*s] (%d)\n", (void*)emsg, emsg->data.len, + emsg->data.s, emsg->data.len); if(_evapi_notify_sockets[1]!=-1) { len = write(_evapi_notify_sockets[1], &emsg, sizeof(evapi_msg_t*)); if(len<=0) { @@ -785,7 +785,7 @@ int _evapi_relay(str *evdata, str *ctag, int unicast) } } else { cfg_update(); - LM_DBG("dispatching [%p] [%.*s] (%d)\n", emsg, + LM_DBG("dispatching [%p] [%.*s] (%d)\n", (void*)emsg, emsg->data.len, emsg->data.s, emsg->data.len); if(evapi_dispatch_notify(emsg) == 0) { shm_free(emsg); @@ -855,7 +855,7 @@ int evapi_relay(str *event, str *data) LM_ERR("failed to pass the pointer to evapi dispatcher\n"); return -1; } - LM_DBG("sent [%p] [%.*s] (%d)\n", sbuf, sbuf->len, sbuf->s, sbuf->len); + LM_DBG("sent [%p] [%.*s] (%d)\n", (void*)sbuf, sbuf->len, sbuf->s, sbuf->len); return 0; } #endif

1 0

git:master:c4591349: tm: safety checks for branch request len
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: c45913497f222c67bcccdbc8724b25bb083c556f URL: https://github.com/kamailio/kamailio/commit/c45913497f222c67bcccdbc8724b25b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T20:38:22+02:00 tm: safety checks for branch request len --- Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/c45913497f222c67bcccdbc8724b25b… Patch: https://github.com/kamailio/kamailio/commit/c45913497f222c67bcccdbc8724b25b…

1 0

git:master:a5722aa7: ctl: small spelling fix in comment
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: a5722aa7773eb4153e8c3b241cae6e3f5f7a9894 URL: https://github.com/kamailio/kamailio/commit/a5722aa7773eb4153e8c3b241cae6e3… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:38:31Z ctl: small spelling fix in comment --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/a5722aa7773eb4153e8c3b241cae6e3… Patch: https://github.com/kamailio/kamailio/commit/a5722aa7773eb4153e8c3b241cae6e3… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 29e06670ed..3642a0015b 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -136,7 +136,7 @@ more bytes available */ #define E_BINRPC_EOP -5 /* end of packet reached */ #define E_BINRPC_NOTINIT -6 /* parse ctx not initialized */ -#define E_BINRPC_TYPE -7 /* unkown type for record, or requested +#define E_BINRPC_TYPE -7 /* unknown type for record, or requested type doesn't match record type */ #define E_BINRPC_RECORD -8 /* bad record (unexpected, bad struct a.s.o)*/ #define E_BINRPC_BUG -9 /* internal error, bug */

1 0

git:master:cbb070b7: cdp: small spelling fix in log message
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: cbb070b74e63017a23355dd8d5266c2d57b762f9 URL: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:37:34Z cdp: small spelling fix in log message --- Modified: src/modules/cdp/diameter_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Patch: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… --- diff --git a/src/modules/cdp/diameter_peer.c b/src/modules/cdp/diameter_peer.c index 043d4f3d72..38386be5d9 100644 --- a/src/modules/cdp/diameter_peer.c +++ b/src/modules/cdp/diameter_peer.c @@ -257,7 +257,7 @@ int diameter_peer_start(int blocking) /* fork receiver for unknown peers */ seed = random(); - pid = fork_process(1001+k,"cdp_receiver_peer_unkown",1); + pid = fork_process(1001+k,"cdp_receiver_peer_unknown",1); if (pid==-1){ LM_CRIT("init_diameter_peer(): Error on fork() for unknown peer receiver!\n");

1 0

git:master:fc09015b: core: small spelling fix in comment
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: fc09015bbad342b435de7ddb3300e19a415c340d URL: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:38:00Z core: small spelling fix in comment --- Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Patch: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… --- diff --git a/src/core/dns_cache.h b/src/core/dns_cache.h index 3552e8392f..b09c79be8a 100644 --- a/src/core/dns_cache.h +++ b/src/core/dns_cache.h @@ -70,7 +70,7 @@ enum dns_errors{ -- returned only by the dns_resolve* functions when called iteratively,; it signals the end of the ip/records list */ - E_DNS_UNKNOWN /**< unkown error */, + E_DNS_UNKNOWN /**< unknown error */, E_DNS_INTERNAL_ERR /**< internal error */, E_DNS_BAD_SRV_ENTRY, E_DNS_NO_SRV /**< unresolvable srv record */,

1 0

[kamailio/kamailio] Debian package version don't support distribution upgrades (#2160)
by Bas Couwenberg 14 May '20

14 May '20

When upgrading from stretch to buster the kamailio packages aren't upgraded because the 5.3.1+stretch version is greater than 5.3.1+buster: ``` $ dpkg --compare-versions 5.3.1+stretch gt 5.3.1+buster ; echo $? 0 ``` The package version should include the release version instead of its codename, e.g. 5.3.1+deb9u1 & 5.3.1+deb10u1 like done for [stable updates](https://www.debian.org/doc/manuals/developers-reference/pkgs.en.ht…: ``` $ dpkg --compare-versions 5.3.1+deb10u1 gt 5.3.1+deb9u1 ; echo $? 0 ``` -- 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/2160

3 5

[kamailio/kamailio] jansson_set() "result has json error" on long json strings (#2327)
by Victor Seva 14 May '20

14 May '20

### Description We noticed random errors from jansson module when: ``` xlog("L_NOTICE", "**** PRE '«$avp(i:901)»' - [% logres %]\n"); jansson_set("str", "cc_sub", "$avp(s:caller_concurrent_calls_count)", "$(avp(i:901)[*])"); ``` ``` May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'TEwMDEiLCJkX' ``` ### Troubleshooting #### Reproduction `` jansson_set(type, key/path, value, result)`` Using a long json result, in my tests longer than 400 chars fires the ERROR #### Log Messages ``` May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: Setting acc destination-leg for uuid '«0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e»': '«{"gpp":["long long long long","long long long long","long long long long","long long long long","long long long long","l ong long long long","long long long long","long long long long","long long long long","long long long long"],"plu":0,"s_id":"","c_id":"","a_id":315,"dialed":"4311001","uuid":"0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e","u":"testuser1001","d":"spce.test","u_in ":"4311001","d_in":"spce.test","lcr":0,"lnp_p":"","u_out":"testuser1001","lnp_t":"","fci":"","cc_quota":"","cc_sub":"","cc_cust":""}»' - R=«sip:conf=4311001@conference.local» ID=«NGCP%invite_conference_update%///1-23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: **** PRE '«{"gpp":[null,null,null,null,null,null,null,null,null,null],"clir":0,"uuid":"adeff08b-bd66-4578-8a01-194185d06827","u":"testuser1002","d":"spce.test","cli":"43110011002","s_id":"","c_id":""," a_id":315,"pau":"","par":"","s":"call","ip":"127.126.0.1","t":1589443897.908021,"lnp_p":"","cli_out":"43110011002","lnp_t":"","pai":"","div":"","cid":"","u2u":"","lcr":0,"cc_quota":"","cc_sub":"","cc_cust":""}»' - ID=«NGCP%invite_conference_update%///1- 23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' ``` ### Possible Solutions In my fast check I notice the result is forced to end in '\0'. Preparing a PR with a solution. ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise's version but with no jansson patches at all ``` version: kamailio 5.3.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 8.3.0 ``` -- 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/2327

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev