sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:4.4:9d4e2e1c: dialog Use correct default name for toroute_name database column

by Olle E. Johansson

Module: kamailio Branch: 4.4 Commit: 9d4e2e1c987e2c5d15dd6f6c434e0467d678a46e URL: https://github.com/kamailio/kamailio/commit/9d4e2e1c987e2c5d15dd6f6c434e046… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T14:05:55+02:00 dialog Use correct default name for toroute_name database column (cherry picked from commit 6196309a05c5de13dab2606bd2e227cebd7fa477) --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d4e2e1c987e2c5d15dd6f6c434e046… Patch: https://github.com/kamailio/kamailio/commit/9d4e2e1c987e2c5d15dd6f6c434e046… --- diff --git a/modules/dialog/README b/modules/dialog/README index 3d5bd6c..ef73c14 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -968,7 +968,7 @@ modparam("dialog", "sflags_column", "s_flags") The column name in the database to store the index of the route to be executed at timeout. - Default value is "toroute". + Default value is "toroute_name". Example 1.35. Set toroute_column parameter ... diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 52e54be..b8fb5bb 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -935,7 +935,7 @@ modparam("dialog", "sflags_column", "s_flags") </para> <para> <emphasis> - Default value is <quote>toroute</quote>. + Default value is <quote>toroute_name</quote>. </emphasis> </para> <example>

8 years, 5 months

git:master:6196309a: dialog Use correct default name for toroute_name database column

by Olle E. Johansson

Module: kamailio Branch: master Commit: 6196309a05c5de13dab2606bd2e227cebd7fa477 URL: https://github.com/kamailio/kamailio/commit/6196309a05c5de13dab2606bd2e227c… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T14:05:17+02:00 dialog Use correct default name for toroute_name database column --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6196309a05c5de13dab2606bd2e227c… Patch: https://github.com/kamailio/kamailio/commit/6196309a05c5de13dab2606bd2e227c… --- diff --git a/modules/dialog/README b/modules/dialog/README index 4c804dc..9767c34 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -978,7 +978,7 @@ modparam("dialog", "sflags_column", "s_flags") The column name in the database to store the index of the route to be executed at timeout. - Default value is "toroute". + Default value is "toroute_name". Example 1.35. Set toroute_column parameter ... diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 705a9dd..4e935a7 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -941,7 +941,7 @@ modparam("dialog", "sflags_column", "s_flags") </para> <para> <emphasis> - Default value is <quote>toroute</quote>. + Default value is <quote>toroute_name</quote>. </emphasis> </para> <example>

8 years, 5 months

git:master:6b8db4a9: dialog fix typo in README and doc

by Olle E. Johansson

Module: kamailio Branch: master Commit: 6b8db4a9170eedc92fd7f93d834a755d20d2ae23 URL: https://github.com/kamailio/kamailio/commit/6b8db4a9170eedc92fd7f93d834a755… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T13:52:00+02:00 dialog fix typo in README and doc The call_id_column variable was named callid_column in the doc. (cherry picked from commit 09cb608ee56ca4d336d5a02c8bf2fd5ea05ff4d0) --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b8db4a9170eedc92fd7f93d834a755… Patch: https://github.com/kamailio/kamailio/commit/6b8db4a9170eedc92fd7f93d834a755… --- diff --git a/modules/dialog/README b/modules/dialog/README index 04ff644..4c804dc 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -62,7 +62,7 @@ Olle E. Johansson 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -193,7 +193,7 @@ Olle E. Johansson 1.13. Set db_fetch_rows parameter 1.14. Set db_skip_load parameter 1.15. Set table_name parameter - 1.16. Set callid_column parameter + 1.16. Set call_id_column parameter 1.17. Set from_uri_column parameter 1.18. Set from_tag_column parameter 1.19. Set to_uri_column parameter @@ -278,7 +278,7 @@ Chapter 1. Admin Guide 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -485,7 +485,7 @@ Chapter 1. Admin Guide 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -752,15 +752,15 @@ modparam("dialog", "db_skip_load", 1) modparam("dialog", "table_name", "my_dialog") ... -5.16. callid_column (string) +5.16. call_id_column (string) The column name in the database to store the dialog call-id. Default value is "callid". - Example 1.16. Set callid_column parameter + Example 1.16. Set call_id_column parameter ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... 5.17. from_uri_column (string) diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 4b2d08c..705a9dd 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -538,8 +538,8 @@ modparam("dialog", "table_name", "my_dialog") </example> </section> - <section id="dialog.p.callid_column"> - <title><varname>callid_column</varname> (string)</title> + <section id="dialog.p.call_id_column"> + <title><varname>call_id_column</varname> (string)</title> <para> The column name in the database to store the dialog call-id. </para> @@ -549,10 +549,10 @@ modparam("dialog", "table_name", "my_dialog") </emphasis> </para> <example> - <title>Set <varname>callid_column</varname> parameter</title> + <title>Set <varname>call_id_column</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... </programlisting> </example>

8 years, 5 months

git:4.4:09cb608e: dialog fix typo in README and doc

by Olle E. Johansson

Module: kamailio Branch: 4.4 Commit: 09cb608ee56ca4d336d5a02c8bf2fd5ea05ff4d0 URL: https://github.com/kamailio/kamailio/commit/09cb608ee56ca4d336d5a02c8bf2fd5… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-06-07T13:48:52+02:00 dialog fix typo in README and doc The call_id_column variable was named callid_column in the doc. --- Modified: modules/dialog/README Modified: modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/09cb608ee56ca4d336d5a02c8bf2fd5… Patch: https://github.com/kamailio/kamailio/commit/09cb608ee56ca4d336d5a02c8bf2fd5… --- diff --git a/modules/dialog/README b/modules/dialog/README index 97c2602..3d5bd6c 100644 --- a/modules/dialog/README +++ b/modules/dialog/README @@ -56,7 +56,7 @@ Alex Balashov 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -271,7 +271,7 @@ Chapter 1. Admin Guide 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -477,7 +477,7 @@ Chapter 1. Admin Guide 5.13. db_fetch_rows (integer) 5.14. db_skip_load (integer) 5.15. table_name (string) - 5.16. callid_column (string) + 5.16. call_id_column (string) 5.17. from_uri_column (string) 5.18. from_tag_column (string) 5.19. to_uri_column (string) @@ -744,7 +744,7 @@ modparam("dialog", "db_skip_load", 1) modparam("dialog", "table_name", "my_dialog") ... -5.16. callid_column (string) +5.16. call_id_column (string) The column name in the database to store the dialogs' callid. @@ -752,7 +752,7 @@ modparam("dialog", "table_name", "my_dialog") Example 1.16. Set callid_column parameter ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... 5.17. from_uri_column (string) diff --git a/modules/dialog/doc/dialog_admin.xml b/modules/dialog/doc/dialog_admin.xml index 3fff0fe..52e54be 100644 --- a/modules/dialog/doc/dialog_admin.xml +++ b/modules/dialog/doc/dialog_admin.xml @@ -533,7 +533,7 @@ modparam("dialog", "table_name", "my_dialog") </section> <section> - <title><varname>callid_column</varname> (string)</title> + <title><varname>call_id_column</varname> (string)</title> <para> The column name in the database to store the dialogs' callid. </para> @@ -546,7 +546,7 @@ modparam("dialog", "table_name", "my_dialog") <title>Set <varname>callid_column</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("dialog", "callid_column", "callid_c_name") +modparam("dialog", "call_id_column", "callid_c_name") ... </programlisting> </example>

8 years, 5 months

git:master:5fdd5f73: Merge pull request #657 from linuxmaniac/vseva/fix_warnings

by Victor Seva

Module: kamailio Branch: master Commit: 5fdd5f73411b81f9619e6ddc292ab510bacdc26e URL: https://github.com/kamailio/kamailio/commit/5fdd5f73411b81f9619e6ddc292ab51… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-07T12:19:41+02:00 Merge pull request #657 from linuxmaniac/vseva/fix_warnings fix compilation warnings --- Modified: modules/app_java/java_msgobj.c Modified: modules/auth_radius/authorize.c Modified: modules/cdp/diameter_api.h Modified: modules/cdp/diameter_msg.c Modified: modules/cdp/peerstatemachine.c Modified: modules/cdp/peerstatemachine.h Modified: modules/cdp/session.c Modified: modules/db_berkeley/km_db_berkeley.c Modified: modules/ims_auth/cxdx_avp.c Modified: modules/ims_auth/cxdx_mar.c Modified: modules/ims_dialog/dlg_handlers.c Modified: modules/misc_radius/functions.c Modified: modules/peering/verify.c Modified: modules/pua_xmpp/xmpp2simple.c Modified: modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/5fdd5f73411b81f9619e6ddc292ab51… Patch: https://github.com/kamailio/kamailio/commit/5fdd5f73411b81f9619e6ddc292ab51…

8 years, 5 months

git:master:f0ac15dc: tls: fix compilation warning

by Victor Seva

Module: kamailio Branch: master Commit: f0ac15dc896f959cb92ad85fd1426fac1aa0bb55 URL: https://github.com/kamailio/kamailio/commit/f0ac15dc896f959cb92ad85fd1426fa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-06T12:05:39+02:00 tls: fix compilation warning > tls_config.c:403:6: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > write(out_fd, &ch, 1); > ^~~~~ ~~~~~~~~~~~~~~ > tls_config.c:408:5: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > write(out_fd, &ch, 1); > ^~~~~ ~~~~~~~~~~~~~~ > 2 warnings generated. --- Modified: modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/f0ac15dc896f959cb92ad85fd1426fa… Patch: https://github.com/kamailio/kamailio/commit/f0ac15dc896f959cb92ad85fd1426fa… --- diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c index af1d88a..fc63155 100644 --- a/modules/tls/tls_config.c +++ b/modules/tls/tls_config.c @@ -400,12 +400,16 @@ tls_domains_cfg_t* tls_load_config(str* filename) pkg_free(file_path); file_path = NULL; while (read(in_fd, &ch, 1)) { - write(out_fd, &ch, 1); + if (write(out_fd, &ch, 1)<0) { + LOG(L_ERR, "write error: %s\n", strerror(errno)); + } } close(in_fd); in_fd = 0; ch = '\n'; - write(out_fd, &ch, 1); + if (write(out_fd, &ch, 1)<0) { + LOG(L_ERR, "write error: %s\n", strerror(errno)); + } } } closedir(dir);

8 years, 5 months

git:master:44d17221: app_java: fix compiler warning

by Victor Seva

Module: kamailio Branch: master Commit: 44d17221c3a72401b1d3157cc969acf07cb80bd0 URL: https://github.com/kamailio/kamailio/commit/44d17221c3a72401b1d3157cc969acf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-06T12:05:39+02:00 app_java: fix compiler warning > java_msgobj.c:233:80: warning: comparison of array 'msg->add_to_branch_s' equal to a null pointer is always false [-Wtautological-pointer-compare] > jStrParam = (*env)->NewStringUTF(env, (msg->add_to_branch_len <= 0 || msg->add_to_branch_s == NULL) ? "" : strdup(msg->add_to_branch_s)); > ~~~~~^~~~~~~~~~~~~~~ ~~~~ > 1 warning generated. --- Modified: modules/app_java/java_msgobj.c --- Diff: https://github.com/kamailio/kamailio/commit/44d17221c3a72401b1d3157cc969acf… Patch: https://github.com/kamailio/kamailio/commit/44d17221c3a72401b1d3157cc969acf… --- diff --git a/modules/app_java/java_msgobj.c b/modules/app_java/java_msgobj.c index 0a43786..fc32849 100644 --- a/modules/app_java/java_msgobj.c +++ b/modules/app_java/java_msgobj.c @@ -230,7 +230,7 @@ jobject *fill_sipmsg_object(JNIEnv *env, struct sip_msg *msg) LM_ERR("%s: Can't find symbol org.siprouter.SipMsg.add_to_branch_s\n", APP_NAME); return NULL; } - jStrParam = (*env)->NewStringUTF(env, (msg->add_to_branch_len <= 0 || msg->add_to_branch_s == NULL) ? "" : strdup(msg->add_to_branch_s)); + jStrParam = (*env)->NewStringUTF(env, (msg->add_to_branch_len <= 0) ? "" : strdup(msg->add_to_branch_s)); (*env)->SetObjectField(env, SipMsgInstance, fid, jStrParam); if ((*env)->ExceptionCheck(env)) {

8 years, 5 months

git:master:8b759049: ims_auth: fix compilation warnigns

by Victor Seva

Module: kamailio Branch: master Commit: 8b75904980f7f7669fe35676a4042e387e29f352 URL: https://github.com/kamailio/kamailio/commit/8b75904980f7f7669fe35676a4042e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-06T12:05:39+02:00 ims_auth: fix compilation warnigns > cxdx_avp.c:661:26: warning: comparison of constant 4 with boolean expression is always false [-Wtautological-constant-out-of-range-compare] > if (!avp||!avp->data.len==4) *item_number=0; > ~~~~~~~~~~~~~~^ ~ > 1 warning generated. > cxdx_mar.c:372:45: warning: comparison of constant 32 with boolean expression is always false [-Wtautological-constant-out-of-range-compare] > if (!tmp->response_auth.len == 32 > ~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~ --- Modified: modules/ims_auth/cxdx_avp.c Modified: modules/ims_auth/cxdx_mar.c --- Diff: https://github.com/kamailio/kamailio/commit/8b75904980f7f7669fe35676a4042e3… Patch: https://github.com/kamailio/kamailio/commit/8b75904980f7f7669fe35676a4042e3… --- diff --git a/modules/ims_auth/cxdx_avp.c b/modules/ims_auth/cxdx_avp.c index a09e6b2..bd4031c 100644 --- a/modules/ims_auth/cxdx_avp.c +++ b/modules/ims_auth/cxdx_avp.c @@ -658,7 +658,7 @@ int cxdx_get_auth_data_item_answer(AAAMessage *msg, AAA_AVP **auth_data, avp = cdpb.AAAFindMatchingAVPList(list,0,AVP_IMS_SIP_Item_Number, IMS_vendor_id_3GPP,0); - if (!avp||!avp->data.len==4) *item_number=0; + if (!avp||avp->data.len!=4) *item_number=0; else *item_number = get_4bytes(avp->data.s); avp = cdpb.AAAFindMatchingAVPList(list,0,AVP_IMS_SIP_Authentication_Scheme, diff --git a/modules/ims_auth/cxdx_mar.c b/modules/ims_auth/cxdx_mar.c index 1f81d0c..a949edd 100644 --- a/modules/ims_auth/cxdx_mar.c +++ b/modules/ims_auth/cxdx_mar.c @@ -373,7 +373,7 @@ void async_cdp_callback(int is_timeout, void *param, AAAMessage *maa, long elaps &scscf_name_str, 0, result_hex); pkg_free(etsi_nonce.s); - if (!tmp->response_auth.len == 32 + if (tmp->response_auth.len != 32 || strncasecmp(tmp->response_auth.s, result_hex, 32)) { LM_ERR("The HSS' Response-Auth is different from what we compute locally!\n" " BUT! If you sent an MAR with auth scheme unknown (HSS-Selected Authentication), this is normal.\n"

8 years, 5 months

git:master:4fa83825: ims_dialog: fix compilation warning

by Victor Seva

Module: kamailio Branch: master Commit: 4fa83825c7bd51d59d9788c6fd7dd532b5bce398 URL: https://github.com/kamailio/kamailio/commit/4fa83825c7bd51d59d9788c6fd7dd53… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-06T12:05:39+02:00 ims_dialog: fix compilation warning > dlg_handlers.c:1345:63: warning: address of 'rpl->via1->branch->value' will always evaluate to 'true' [-Wpointer-bool-conversion] > if (rpl->via1->branch && (&rpl->via1->branch->value) && (rpl->via1->branch->value.len > 0)) { > ~~ ~~~~~~~~~~~~~~~~~~~^~~~~ > 1 warning generated. --- Modified: modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/4fa83825c7bd51d59d9788c6fd7dd53… Patch: https://github.com/kamailio/kamailio/commit/4fa83825c7bd51d59d9788c6fd7dd53… --- diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index 394c779..faf7678 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -1342,7 +1342,7 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { if (!dlg_out) { if (rpl->first_line.u.reply.statuscode < 299) { /*we don't care about failure responses to dialog - not necessary to create dialog out...*/ - if (rpl->via1->branch && (&rpl->via1->branch->value) && (rpl->via1->branch->value.len > 0)) { + if (rpl->via1->branch && (rpl->via1->branch->value.len > 0)) { branch = rpl->via1->branch->value; }

8 years, 5 months

git:master:64091168: cdp: fix compilation warning

by Victor Seva

Module: kamailio Branch: master Commit: 64091168246c28b560e79ad0a19d1f97c12cb894 URL: https://github.com/kamailio/kamailio/commit/64091168246c28b560e79ad0a19d1f9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-06T12:05:39+02:00 cdp: fix compilation warning > diameter_msg.c:443:10: warning: implicit conversion from enumeration type 'AAAReturnCode' to different enumeration type 'AAAResultCode' [-Wenum-conversion] > return AAA_ERR_SUCCESS; > ~~~~~~ ^~~~~~~~~~~~~~~ > 1 warning generated. --- Modified: modules/cdp/diameter_api.h Modified: modules/cdp/diameter_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/64091168246c28b560e79ad0a19d1f9… Patch: https://github.com/kamailio/kamailio/commit/64091168246c28b560e79ad0a19d1f9… --- diff --git a/modules/cdp/diameter_api.h b/modules/cdp/diameter_api.h index c0d0495..f9ba418 100644 --- a/modules/cdp/diameter_api.h +++ b/modules/cdp/diameter_api.h @@ -76,7 +76,7 @@ typedef AAAReturnCode (*AAAFreeAVPList_f)(AAA_AVP_LIST *avpList); -AAAResultCode AAASetMessageResultCode(AAAMessage *message,AAAResultCode resultCode); +AAAReturnCode AAASetMessageResultCode(AAAMessage *message,AAAResultCode resultCode); void AAAPrintMessage(AAAMessage *msg); diff --git a/modules/cdp/diameter_msg.c b/modules/cdp/diameter_msg.c index 0814a93..3630d40 100644 --- a/modules/cdp/diameter_msg.c +++ b/modules/cdp/diameter_msg.c @@ -434,7 +434,7 @@ AAAReturnCode AAAFreeMessage(AAAMessage **msg) * @param resultCode - code to set as result * \note This function is taken from DISC http://developer.berlios.de/projects/disc/ */ -AAAResultCode AAASetMessageResultCode( +AAAReturnCode AAASetMessageResultCode( AAAMessage *message, AAAResultCode resultCode) {

8 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2016