sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:1d53ef3b: modules/ims_qos, modules/ims_registrar_scscf, modules/ims_auth: Warning logical-op-parentheses
by jaybeepee 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 1d53ef3b4756cdd0692c9867f56e0c3f2d8535dd URL: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-07T08:42:15+02:00 modules/ims_qos,modules/ims_registrar_scscf,modules/ims_auth: Warning logical-op-parentheses --- Modified: modules/ims_auth/pvt_message.c Modified: modules/ims_qos/mod.c Modified: modules/ims_registrar_scscf/pvt_message.c --- Diff: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… Patch: https://github.com/kamailio/kamailio/commit/1d53ef3b4756cdd0692c9867f56e0c3… --- diff --git a/modules/ims_auth/pvt_message.c b/modules/ims_auth/pvt_message.c index ba8a53b..3b8274e 100644 --- a/modules/ims_auth/pvt_message.c +++ b/modules/ims_auth/pvt_message.c @@ -84,7 +84,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */ diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index af9ed91..b0ec900 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -683,7 +683,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */ diff --git a/modules/ims_registrar_scscf/pvt_message.c b/modules/ims_registrar_scscf/pvt_message.c index ba8a53b..3b8274e 100644 --- a/modules/ims_registrar_scscf/pvt_message.c +++ b/modules/ims_registrar_scscf/pvt_message.c @@ -84,7 +84,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { (which we cannot assume) then we would pollute the shm_msg t->uas.request if we did any parsing on it. Instead, we need to make a private copy of the message and free it when we are done */ - if (_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp + if ((_pv_treq.T != t || t->uas.request != _pv_treq.tmsgp) && t->uas.request->id != _pv_treq.id) { /* make a copy */

1 0

git:master:46bb888e: modules/ims_registrar_scscf: expires should be int and not unsigned int
by jaybeepee 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 46bb888e49524b1fe1e583bd45348fe6b1f12f46 URL: https://github.com/kamailio/kamailio/commit/46bb888e49524b1fe1e583bd45348fe… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-07T08:42:15+02:00 modules/ims_registrar_scscf: expires should be int and not unsigned int --- Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/46bb888e49524b1fe1e583bd45348fe… Patch: https://github.com/kamailio/kamailio/commit/46bb888e49524b1fe1e583bd45348fe… --- diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 4d7707a..624e0a9 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -108,7 +108,7 @@ static inline int randomize_expires(int expires, int range) { * 3) If the message contained no expires header field, use * the default value */ -static inline int calc_contact_expires(contact_t *c, unsigned int expires_hdr, int sos_reg) { +static inline int calc_contact_expires(contact_t *c, int expires_hdr, int sos_reg) { unsigned int r; if (expires_hdr >= 0U) @@ -513,7 +513,7 @@ static inline int is_impu_registered(udomain_t* _d, str* public_identity) { * update the contacts for a public identity. Make sure you have the lock on the domain before calling this * returns 0 on success, -1 on failure */ -static inline int update_contacts_helper(struct sip_msg* msg, impurecord_t* impu_rec, int assignment_type, unsigned int expires_hdr) { +static inline int update_contacts_helper(struct sip_msg* msg, impurecord_t* impu_rec, int assignment_type, int expires_hdr) { struct hdr_field* h; contact_t* chi; //contact header information ucontact_info_t* ci; //ucontact info

1 0

git:master:1368c576: modules/ims_charging: remove useless conditions
by jaybeepee 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 1368c576e11186134caeb02fca62ccc8f0c8c48b URL: https://github.com/kamailio/kamailio/commit/1368c576e11186134caeb02fca62ccc… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-07T08:42:15+02:00 modules/ims_charging: remove useless conditions --- Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/1368c576e11186134caeb02fca62ccc… Patch: https://github.com/kamailio/kamailio/commit/1368c576e11186134caeb02fca62ccc… --- diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index d720f4a..ded2a4b 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -431,10 +431,7 @@ void ro_session_ontimeout(struct ro_tl *tl) { counter_add(ims_charging_cnts_h.billed_secs, used_secs); - if (ro_session->callid.s != NULL - && ro_session->dlg_h_entry >= 0U - && ro_session->dlg_h_id >= 0U - && ro_session->ro_session_id.s != NULL) { + if (ro_session->callid.s != NULL && ro_session->ro_session_id.s != NULL) { LM_DBG("Found a session to re-apply for timing [%.*s] and user is [%.*s]\n", ro_session->ro_session_id.len, ro_session->ro_session_id.s,

1 0

git:master:832f7a9b: modules/ims_auth: return null instead of integer
by jaybeepee 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 832f7a9b063ec2afe2d360417b0413fadaf9e08c URL: https://github.com/kamailio/kamailio/commit/832f7a9b063ec2afe2d360417b0413f… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-07T08:42:15+02:00 modules/ims_auth: return null instead of integer --- Modified: modules/ims_auth/pvt_message.c --- Diff: https://github.com/kamailio/kamailio/commit/832f7a9b063ec2afe2d360417b0413f… Patch: https://github.com/kamailio/kamailio/commit/832f7a9b063ec2afe2d360417b0413f… --- diff --git a/modules/ims_auth/pvt_message.c b/modules/ims_auth/pvt_message.c index fc397f5..ba8a53b 100644 --- a/modules/ims_auth/pvt_message.c +++ b/modules/ims_auth/pvt_message.c @@ -101,7 +101,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { if (_pv_treq.buf == NULL) { LM_ERR("no more pkg\n"); _pv_treq.buf_size = 0; - return -1; + return 0; } } if (_pv_treq.tmsgp) @@ -122,7 +122,7 @@ struct sip_msg* get_request_from_tx(struct cell *t) { _pv_treq.buf = NULL; _pv_treq.tmsgp = NULL; _pv_treq.T = NULL; - return -1; + return 0; } }

1 0

git:master:ee14cf1e: httpapitest Small cosmetic fixes
by Olle E. Johansson 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: ee14cf1e6bd866dfc7e433381df079bb2adda5dc URL: https://github.com/kamailio/kamailio/commit/ee14cf1e6bd866dfc7e433381df079b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T08:37:50+02:00 httpapitest Small cosmetic fixes --- Modified: test/mod_httpapitest/httpapitest.c Modified: test/mod_httpapitest/test/curlapi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ee14cf1e6bd866dfc7e433381df079b… Patch: https://github.com/kamailio/kamailio/commit/ee14cf1e6bd866dfc7e433381df079b… --- diff --git a/test/mod_httpapitest/httpapitest.c b/test/mod_httpapitest/httpapitest.c index be50d51..921074d 100644 --- a/test/mod_httpapitest/httpapitest.c +++ b/test/mod_httpapitest/httpapitest.c @@ -56,6 +56,7 @@ static httpc_api_t httpapi; /* Exported functions */ static cmd_export_t cmds[] = { + /* Test_http_connect(connection, <URL>, <result pvar>) - HTTP GET */ {"test_http_connect", (cmd_function)w_testcurl_connect, 3, fixup_testcurl_connect, fixup_free_testcurl_connect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, @@ -123,20 +124,24 @@ static void destroy(void) /* - * Fix curl_connect params: connection(string/pvar) url (string that may contain pvars) and - * result (writable pvar). + * Fix test_curl_connect params: + * 1. connection(string/pvar) + * 2. url (string that may contain pvars) and + * 3. result (writable pvar). */ static int fixup_testcurl_connect(void** param, int param_no) { + /* 1. Connection */ if (param_no == 1) { /* We want char * strings */ return 0; } - /* URL and data may contain pvar */ + /* 2. URL and data may contain pvar */ if (param_no == 2) { return fixup_spve_null(param, 1); } + /* 3. PVAR for result */ if (param_no == 3) { if (fixup_pvar_null(param, 1) != 0) { LM_ERR("failed to fixup result pvar\n"); diff --git a/test/mod_httpapitest/test/curlapi.cfg b/test/mod_httpapitest/test/curlapi.cfg index 4cd6ff0..a6d5a8a 100644 --- a/test/mod_httpapitest/test/curlapi.cfg +++ b/test/mod_httpapitest/test/curlapi.cfg @@ -5,7 +5,7 @@ # # -debug=3 +debug=2 log_stderror=yes fork=no @@ -55,12 +55,12 @@ onsend_route # This route is executed at Kamailio start event_route[htable:mod-init] { - xlog("L_ERR", "### Kamailio starting $timef(HH:mm) \n"); + xlog("L_ERR", "### Kamailio starting $timef(%HH:%mm) \n"); $var(html) = ""; $var(res) = test_http_connect("lisa", "", "$avp(html)"); - xlog("L_ERR", "-- Lisa http_client connection: $avp(gurka) Result $var(res)\n"); + xlog("L_ERR", "-- Lisa http_client connection: Result $var(res) Response:\n--------\n$avp(html)\n------\n"); }

1 0

git:master:756d1520: httpapitest Actually use the API function :-)
by Olle E. Johansson 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 756d1520c254842b313e85d6fdd0dee71bf19fed URL: https://github.com/kamailio/kamailio/commit/756d1520c254842b313e85d6fdd0dee… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T08:37:50+02:00 httpapitest Actually use the API function :-) --- Modified: test/mod_httpapitest/httpapitest.c Modified: test/mod_httpapitest/test/curlapi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/756d1520c254842b313e85d6fdd0dee… Patch: https://github.com/kamailio/kamailio/commit/756d1520c254842b313e85d6fdd0dee… --- diff --git a/test/mod_httpapitest/httpapitest.c b/test/mod_httpapitest/httpapitest.c index e9ee538..be50d51 100644 --- a/test/mod_httpapitest/httpapitest.c +++ b/test/mod_httpapitest/httpapitest.c @@ -52,6 +52,7 @@ static int fixup_free_testcurl_connect(void** param, int param_no); static int fixup_testcurl_connect_post(void** param, int param_no); static int fixup_free_testcurl_connect_post(void** param, int param_no); static int w_testcurl_connect(struct sip_msg* _m, char* _con, char * _url, char* _result); +static httpc_api_t httpapi; /* Exported functions */ static cmd_export_t cmds[] = { @@ -83,12 +84,12 @@ struct module_exports exports = { child_init /* per-child init function */ }; + /* Module initialization function */ static int mod_init(void) { LM_DBG("init httpapitest module\n"); - httpc_api_t httpapi; if (httpc_load_api(&httpapi) != 0) { LM_ERR("Can not bind to http_client API \n"); @@ -199,7 +200,9 @@ static int w_testcurl_connect(struct sip_msg* _m, char* _con, char * _url, char* LM_DBG("**** Curl Connection %s URL %s Result var %s\n", _con, _url, _result); - ret = curl_con_query_url(_m, &con, &url, &result, NULL, NULL); + + /* API http_connect(msg, connection, url, result, content_type, post) */ + ret = httpapi.http_connect(_m, &con, &url, &result, NULL, NULL); val.rs = result; val.flags = PV_VAL_STR; diff --git a/test/mod_httpapitest/test/curlapi.cfg b/test/mod_httpapitest/test/curlapi.cfg index 2dc29ab..4cd6ff0 100644 --- a/test/mod_httpapitest/test/curlapi.cfg +++ b/test/mod_httpapitest/test/curlapi.cfg @@ -56,8 +56,10 @@ onsend_route event_route[htable:mod-init] { xlog("L_ERR", "### Kamailio starting $timef(HH:mm) \n"); - $avp(gurka) = ""; - $var(res) = test_http_connect("lisa", "", "$avp(gurka)"); + $var(html) = ""; + + $var(res) = test_http_connect("lisa", "", "$avp(html)"); + xlog("L_ERR", "-- Lisa http_client connection: $avp(gurka) Result $var(res)\n");

1 0

git:master:ac64b4d3: httpapitest Fixing test function
by Olle E. Johansson 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: ac64b4d347d44102ffbcf14c7ad0c791d1f85cfc URL: https://github.com/kamailio/kamailio/commit/ac64b4d347d44102ffbcf14c7ad0c79… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T08:37:50+02:00 httpapitest Fixing test function --- Modified: test/mod_httpapitest/httpapitest.c Modified: test/mod_httpapitest/test/curlapi.cfg --- Diff: https://github.com/kamailio/kamailio/commit/ac64b4d347d44102ffbcf14c7ad0c79… Patch: https://github.com/kamailio/kamailio/commit/ac64b4d347d44102ffbcf14c7ad0c79… --- diff --git a/test/mod_httpapitest/httpapitest.c b/test/mod_httpapitest/httpapitest.c index 0b68953..e9ee538 100644 --- a/test/mod_httpapitest/httpapitest.c +++ b/test/mod_httpapitest/httpapitest.c @@ -55,7 +55,7 @@ static int w_testcurl_connect(struct sip_msg* _m, char* _con, char * _url, char* /* Exported functions */ static cmd_export_t cmds[] = { - {"test_http_connect", (cmd_function)w_testcurl_connect, 2, fixup_testcurl_connect, + {"test_http_connect", (cmd_function)w_testcurl_connect, 3, fixup_testcurl_connect, fixup_free_testcurl_connect, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, }; diff --git a/test/mod_httpapitest/test/curlapi.cfg b/test/mod_httpapitest/test/curlapi.cfg index 6082c70..2dc29ab 100644 --- a/test/mod_httpapitest/test/curlapi.cfg +++ b/test/mod_httpapitest/test/curlapi.cfg @@ -18,16 +18,15 @@ loadmodule "xlog.so" # For extended logging with pseudovariables loadmodule "kex.so" # Kamailio extensions: # Script flags and basic mi commands (version, pwd, get_statistics) # -loadmodule "tm.so" # Transactions are needed in order to fork -loadmodule "tmx.so" # Kamailio extras to TM # loadmodule "sl.so" # Stateless replies - needed by registrar.so loadmodule "rtimer.so" # For ticks loadmodule "htable.so" # For init event route -loadmodule "http_client.so" # THe CURL module -loadmodule "httpapitest.so" # THe CURL module loadmodule "cfgutils.so" # Memory debugging +loadmodule "http_client.so" # The HTTP client module +loadmodule "httpapitest.so" # The HTTP client API test module -using the API to http_client.so + # main routing logic modparam("http_client", "connection_timeout", 42); @@ -48,11 +47,6 @@ onreply_route { xlog("L_INFO", "<-- Incoming response: $rs $rr - from $si\n"); } -branch_route[BRANCH_ROUTE] -{ - xlog("L_INFO", " --> Outgoing branch $T_branch_idx : $rm from $si to $ru \n"); -} - onsend_route { xlog("ONSEND --> Sending from $sndfrom(proto):$sndfrom(ip):$sndfrom(port) to $sndto(proto):$sndto(ip):$sndto(port) \n"); @@ -63,7 +57,7 @@ event_route[htable:mod-init] { xlog("L_ERR", "### Kamailio starting $timef(HH:mm) \n"); $avp(gurka) = ""; - $var(res) = http_connect("lisa", "", "$avp(gurka)"); + $var(res) = test_http_connect("lisa", "", "$avp(gurka)"); xlog("L_ERR", "-- Lisa http_client connection: $avp(gurka) Result $var(res)\n");

1 0

git:master:94b4c256: modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression
by Mikko Lehto 07 Jun '16

07 Jun '16

Module: kamailio Branch: master Commit: 94b4c25640c0f486c578a9e0670dad0aa5dda0c1 URL: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2016-05-25T13:49:21+03:00 modules/ims_qos modules/ims_registrar_scscf: fix comparison of unsigned expression --- Modified: modules/ims_qos/rx_avp.c Modified: modules/ims_registrar_scscf/save.c --- Diff: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0… Patch: https://github.com/kamailio/kamailio/commit/94b4c25640c0f486c578a9e0670dad0… --- diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 657716c..124855c 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -489,7 +489,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RS"); LM_DBG("Answer: Got bandwidth %i from b=RS-Line\n", bandwidth); - if (bandwidth >= 0) { + if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rs_bw = cdpb.AAACreateAVP(AVP_EPC_RS_Bandwidth, @@ -501,7 +501,7 @@ inline int rx_add_media_component_description_avp(AAAMessage *msg, int number, s // Get A=RS-bandwidth from SDP-Reply: bandwidth = sdp_b_value(rpl_raw_payload, "RR"); LM_DBG("Answer: Got bandwidth %i from b=RR-Line\n", bandwidth); - if (bandwidth >= 0) { + if (bandwidth > 0) { // Add AVP set_4bytes(x,bandwidth); rr_bw = cdpb.AAACreateAVP(AVP_EPC_RR_Bandwidth, diff --git a/modules/ims_registrar_scscf/save.c b/modules/ims_registrar_scscf/save.c index 501eaa7..47dcf80 100644 --- a/modules/ims_registrar_scscf/save.c +++ b/modules/ims_registrar_scscf/save.c @@ -111,7 +111,7 @@ static inline int randomize_expires(int expires, int range) { static inline int calc_contact_expires(contact_t *c, unsigned int expires_hdr, int sos_reg) { unsigned int r; - if (expires_hdr >= 0) + if (expires_hdr > 0) r = expires_hdr; else { r = (sos_reg > 0) ? default_registrar_cfg.em_default_expires : default_registrar_cfg.default_expires;

3 3

[kamailio] SNMPstats dialog 0 afeter reboot (#424)
by igorPot 06 Jun '16

06 Jun '16

I have rebooted my kamailio machine and now the value of kamailio dialogs is always 0: KAMAILIO-MIB::kamailioCurNumDialogs.0 = Gauge32: 0 KAMAILIO-MIB::kamailioCurNumDialogsInProgress.0 = Gauge32: 0 KAMAILIO-MIB::kamailioCurNumDialogsInSetup.0 = Gauge32: 0 KAMAILIO-MIB::kamailioTotalNumFailedDialogSetups.0 = Counter32: 0 And also the status is: KAMAILIO-MIB::kamailioDialogUsageState.0 = INTEGER: idle(0) How can I change it to active(1)? I have dialog.so loaded as well as modparam("dialog", "dlg_flag", 4) and dlg_manage(). If I do 'kamctl stats dialog': # kamctl stats dialog dialog:active_dialogs = 498 dialog:early_dialogs = 57 dialog:expired_dialogs = 24 dialog:failed_dialogs = 73222 dialog:processed_dialogs = 539449 I have the same configruation of SNMPstats and kamailio in 2 other machines and it works perfectly. In this machine it worked until I rebooted the machine. I asked this question in th emailing list and I got the following response: "Must be something in how the SNMP module reads the data from the statistics counters." I don't know if this could help. Thank you. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/424

3 9

[kamailio] Lots of tcp_read_* errors in log, multi-transport server, lack of context in messages (#385)
by Andrey Utkin 06 Jun '16

06 Jun '16

Hi devs, The logs of our Kamailio servers are rich for such lines: ``` Oct 28 06:57:35 ip-172-31-0-139 /usr/local/sbin/kamailio[31963]: ERROR: <core> [tcp_read.c:271]: tcp_read_data(): error reading: Connection reset by peer (104) Oct 28 06:57:35 ip-172-31-0-139 /usr/local/sbin/kamailio[31963]: ERROR: <core> [tcp_read.c:1296]: tcp_read_req(): ERROR: tcp_read_req: error reading ``` The servers serve WS, WSS, UDP, TCP and TLS as connection transports. So we cannot figure what happens and if this is really a problem, but we get accused by whoever audits the servers. What could be done to make this more trackable? Or maybe these messages should be suppressed, if there's no way to track them and they don't mean any problem? --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/385

3 5

← Newer
1
...
25
26
27
28
29
30
31
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016