sr-dev October 2018

sr-dev@lists.kamailio.org

23 participants
274 discussions

git:master:99368909: db_postgres: docs for bytea_output_escape

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 99368909cdfc5140a1948525c5c734252f998efb URL: https://github.com/kamailio/kamailio/commit/99368909cdfc5140a1948525c5c7342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-12T02:12:18+02:00 db_postgres: docs for bytea_output_escape --- Modified: src/modules/db_postgres/doc/db_postgres_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/99368909cdfc5140a1948525c5c7342… Patch: https://github.com/kamailio/kamailio/commit/99368909cdfc5140a1948525c5c7342… --- diff --git a/src/modules/db_postgres/doc/db_postgres_admin.xml b/src/modules/db_postgres/doc/db_postgres_admin.xml index f41507c295..bb04acd466 100644 --- a/src/modules/db_postgres/doc/db_postgres_admin.xml +++ b/src/modules/db_postgres/doc/db_postgres_admin.xml @@ -151,6 +151,25 @@ modparam("db_postgres", "lockset", 6) </example> </section> + <section id="db_postgres.p.bytea_output_escape"> + <title><varname>bytea_output_escape</varname> (integer)</title> + <para> + Control if the module should request escaping the output for + bytea fields. + </para> + <para> + Default value is 1 (do the escape). + </para> + <example> + <title>Set <varname>bytea_output_escape</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("db_postgres", "bytea_output_escape", 0) +... +</programlisting> + </example> + </section> + </section> <section>

6 years, 2 months

git:master:861205b8: db_postgres: new parameter bytea_output_escape

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 861205b8aeed19fe8693e21fe5f1856f1dcb08c5 URL: https://github.com/kamailio/kamailio/commit/861205b8aeed19fe8693e21fe5f1856… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-10-12T02:09:21+02:00 db_postgres: new parameter bytea_output_escape - control escaping output for bytea fields - default 1 (do the escape) --- Modified: src/modules/db_postgres/km_pg_con.c Modified: src/modules/db_postgres/pg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/861205b8aeed19fe8693e21fe5f1856… Patch: https://github.com/kamailio/kamailio/commit/861205b8aeed19fe8693e21fe5f1856… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index b66a94a0fb..f6a2b8c8e0 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -37,6 +37,8 @@ #include <netinet/tcp.h> +extern int pg_bytea_output_escape; + /*! * \brief Create a new connection * @@ -52,7 +54,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; - PGresult *res; + PGresult *res = NULL; LM_DBG("db_id = %p\n", id); @@ -142,15 +144,16 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif - res = PQexec(ptr->con, "SET bytea_output=escape"); - if (PQresultStatus(res) != PGRES_COMMAND_OK) - { - LM_ERR("cannot set blob output escaping format\n"); + if(pg_bytea_output_escape!=0) { + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } PQclear(res); - goto err; } - PQclear(res); - return ptr; err: diff --git a/src/modules/db_postgres/pg_mod.c b/src/modules/db_postgres/pg_mod.c index 070fc66a49..7ebee934c4 100644 --- a/src/modules/db_postgres/pg_mod.c +++ b/src/modules/db_postgres/pg_mod.c @@ -58,6 +58,7 @@ int pg_retries = int pg_lockset = 4; int pg_timeout = 0; /* default = no timeout */ int pg_keepalive = 0; +int pg_bytea_output_escape = 1; /* * Postgres module interface @@ -91,6 +92,7 @@ static param_export_t params[] = { {"lockset", PARAM_INT, &pg_lockset}, {"timeout", PARAM_INT, &pg_timeout}, {"tcp_keepalive", PARAM_INT, &pg_keepalive}, + {"bytea_output_escape", PARAM_INT, &pg_bytea_output_escape}, {0, 0, 0} };

6 years, 2 months

[kamailio/kamailio] db_postgres: Fixed blob hex encoding (#1255) (#1672)

by sergey-safarov

#### Pre-Submission Checklist - [x] 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) - [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 #XXXX (replace XXXX with an open issue number) #### Description Required for postgresql usage in kazoo cluster You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1672 -- Commit Summary -- * db_postgres: Fixed blob hex encoding (#1255) -- File Changes -- M src/modules/db_postgres/km_pg_con.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1672.patch https://github.com/kamailio/kamailio/pull/1672.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/1672

6 years, 2 months

git:master:167ff2b2: Merge pull request #1672 from sergey-safarov/psql

by GitHub

Module: kamailio Branch: master Commit: 167ff2b29d82cbd96dab3435c1694d6b40e245cf URL: https://github.com/kamailio/kamailio/commit/167ff2b29d82cbd96dab3435c1694d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-12T02:02:24+02:00 Merge pull request #1672 from sergey-safarov/psql db_postgres: Fixed blob hex encoding (#1255) --- Modified: src/modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/167ff2b29d82cbd96dab3435c1694d6… Patch: https://github.com/kamailio/kamailio/commit/167ff2b29d82cbd96dab3435c1694d6… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index 5a7225cefa..b66a94a0fb 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -52,6 +52,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; + PGresult *res; LM_DBG("db_id = %p\n", id); @@ -141,6 +142,15 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } + PQclear(res); + return ptr; err:

6 years, 2 months

git:master:5557a441: db_postgres: Fixed blob hex encoding (#1255)

by Sergey Safarov

Module: kamailio Branch: master Commit: 5557a441a4969994c2a82a89d53dec710164a034 URL: https://github.com/kamailio/kamailio/commit/5557a441a4969994c2a82a89d53dec7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-10-10T06:13:17Z db_postgres: Fixed blob hex encoding (#1255) --- Modified: src/modules/db_postgres/km_pg_con.c --- Diff: https://github.com/kamailio/kamailio/commit/5557a441a4969994c2a82a89d53dec7… Patch: https://github.com/kamailio/kamailio/commit/5557a441a4969994c2a82a89d53dec7… --- diff --git a/src/modules/db_postgres/km_pg_con.c b/src/modules/db_postgres/km_pg_con.c index 5a7225cefa..b66a94a0fb 100644 --- a/src/modules/db_postgres/km_pg_con.c +++ b/src/modules/db_postgres/km_pg_con.c @@ -52,6 +52,7 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) int i = 0; const char *keywords[10], *values[10]; char to[16]; + PGresult *res; LM_DBG("db_id = %p\n", id); @@ -141,6 +142,15 @@ struct pg_con *db_postgres_new_connection(struct db_id *id) } #endif + res = PQexec(ptr->con, "SET bytea_output=escape"); + if (PQresultStatus(res) != PGRES_COMMAND_OK) + { + LM_ERR("cannot set blob output escaping format\n"); + PQclear(res); + goto err; + } + PQclear(res); + return ptr; err:

6 years, 2 months

[kamailio/kamailio] kamctl: make jsonrpc filter portable (#1669)

by micmac1

The filter has a regex looking for a literal '{' in the beginning of a line. Some awk implementations interpret this as a meta character, so the regex is deemed broken. Example with busybox awk (POSIX): `root@hank2:~# kamctl ps` `awk: bad regex '^{.+"id"[ ]*:[ ]*[0-9]+[ ]*}$': Invalid contents of {}` `root@hank2:~#` To fix this enclose the character in square brackets. This always matches for a literal '{' and is portable. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> #### 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 #1429 #### Description Hi all, I was trying to run kamctl on OpenWrt and the regex failed. I found a (closed) issue and the remedy was to use gawk. But it's actually easy to fix in the regex and when I can run busybox awk I can't save the space which would be needed for gawk. OpenWrt is usually run on embedded so space is often an issue :) Thanks for looking at this! Kind regards, Seb You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1669 -- Commit Summary -- * kamctl: make jsonrpc filter portable -- File Changes -- M utils/kamctl/kamctl.base (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1669.patch https://github.com/kamailio/kamailio/pull/1669.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/1669

6 years, 2 months

git:master:2db33ab3: Merge pull request #1669 from micmac1/master-jsonrpc-portable

by GitHub

Module: kamailio Branch: master Commit: 2db33ab33441cff2c40db84b057416659f8b53b2 URL: https://github.com/kamailio/kamailio/commit/2db33ab33441cff2c40db84b0574166… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-12T00:33:54+02:00 Merge pull request #1669 from micmac1/master-jsonrpc-portable kamctl: make jsonrpc filter portable --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/2db33ab33441cff2c40db84b0574166… Patch: https://github.com/kamailio/kamailio/commit/2db33ab33441cff2c40db84b0574166… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index adeceb77fb..a776e10d82 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -715,7 +715,7 @@ filter_json() $AWK 'function ltrim(s) { sub(/^[ \t\r\n]+/, "", s); return s } BEGIN { line=0; IGNORECASE=1; } { line++; } - NR == 1 && /^{.+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } + NR == 1 && /^[{].+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } NR == 1 && /^200 OK/ { next; } /^[ \t]*"jsonrpc":[ \t]*"2.0"/ { print; next; } /^[ \t]*"result":[ \t]*\[.+/ {

6 years, 2 months

git:master:59d28758: kamctl: make jsonrpc filter portable

by Sebastian Kemper

Module: kamailio Branch: master Commit: 59d287586f502a8df71c2e91899fde49594e072e URL: https://github.com/kamailio/kamailio/commit/59d287586f502a8df71c2e91899fde4… Author: Sebastian Kemper <sebastian_ml(a)gmx.net> Committer: Sebastian Kemper <sebastian_ml(a)gmx.net> Date: 2018-10-07T19:03:51+02:00 kamctl: make jsonrpc filter portable The filter has a regex looking for a literal '{' in the beginning of a line. Some awk implementations interpret this as a meta character, so the regex is deemed broken. Example with busybox awk (POSIX): root@hank2:~# kamctl ps awk: bad regex '^{.+"id"[ ]*:[ ]*[0-9]+[ ]*}$': Invalid contents of {} root@hank2:~# To fix this enclose the character in square brackets. This always matches for a literal '{' and is portable. Signed-off-by: Sebastian Kemper <sebastian_ml(a)gmx.net> --- Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/59d287586f502a8df71c2e91899fde4… Patch: https://github.com/kamailio/kamailio/commit/59d287586f502a8df71c2e91899fde4… --- diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index adeceb77fb..a776e10d82 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -715,7 +715,7 @@ filter_json() $AWK 'function ltrim(s) { sub(/^[ \t\r\n]+/, "", s); return s } BEGIN { line=0; IGNORECASE=1; } { line++; } - NR == 1 && /^{.+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } + NR == 1 && /^[{].+"id"[ \t]*:[ \t]*[0-9]+[ \t]*}$/ { print; next; } NR == 1 && /^200 OK/ { next; } /^[ \t]*"jsonrpc":[ \t]*"2.0"/ { print; next; } /^[ \t]*"result":[ \t]*\[.+/ {

6 years, 2 months

Addition of a code of conduct to the Kamailio repository

by Henning Westerholt

Hello, with commit a213d9d1 I introduced a Code of Conduct to the Kamailio repository [1]. This topic was initially discussed during the Kamailio development workshop, started from Daniel. During the development workshop we came to the conclusion that this is a policy decision and needs broader discussion in the Kamailio Management board and also the Kamailio Admin-Team. This discussion started last Friday, and after several days of discussion we decided to choose an existing Code of Conduct. We adapted the CoC of the Debian Project [2] and did a few changes for readability and also to adapt it to the (smaller) scope of our project. This CoC is in my opinion a good, generic and pragmatic document. Many people in our community are already in one way or the other involved in the Debian project. I am aware that this is (especially right now) a hot topic for some people. My personal opinion is that we managed to get a great fit to the existing Kamailio community culture. The history of this project shows that we are an open project and welcome contributions from anybody. So I don't expect any impact because of this change. We also ensured that the CoC only applies inside the Kamailio project, and that the Kamailio Management board is the authoritative instance in any conflicts about this topic. I don't want to start a classical "bike-shedding" discussion on this list about this topic.. But if you have any questions about this, lets us know. You can also contact the Kamailio Management Board, if you want to keep it private. Best regards, Henning Westerholt [1] https://github.com/kamailio/kamailio/blob/master/CODE_OF_CONDUCT.md [2] https://www.debian.org/code_of_conduct

6 years, 2 months

git:master:a213d9d1: add code of conduct, as decided from the Kamailio management and admin team

by GitHub

Module: kamailio Branch: master Commit: a213d9d1c9f9f8146d791e151710fe88ac31d86a URL: https://github.com/kamailio/kamailio/commit/a213d9d1c9f9f8146d791e151710fe8… Author: Henning Westerholt <henningw(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2018-10-11T09:47:29+02:00 add code of conduct, as decided from the Kamailio management and admin team - add code of conduct, as decided from the Kamailio management and admin team - this code of conduct was adapted from the Debian Code of Conduct - several edits have been made from the team for readability and to fit to our project scope --- Added: CODE_OF_CONDUCT.md --- Diff: https://github.com/kamailio/kamailio/commit/a213d9d1c9f9f8146d791e151710fe8… Patch: https://github.com/kamailio/kamailio/commit/a213d9d1c9f9f8146d791e151710fe8… --- diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000000..3f47a94f58 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,31 @@ +# Kamailio Code of Conduct + +## Be respectful + +Inevitably there will be people in the Kamailio project with whom you may disagree, or find it difficult to cooperate. Accept that, but even so, remain respectful. Disagreement is no excuse for poor behaviour or personal attacks, and a community in which people feel threatened is not a healthy community. + +## Assume good faith + +Contributors have many ways of reaching the common goals of the project which may differ from your ways. Assume that other people are working towards this goal. Note that many of our Contributors are not native English speakers or may have different cultural backgrounds. + +## Be collaborative + +It's good to ask for help when you need it. Similarly, offers for help should be seen in the context of our shared goal of improving Kamailio. When you make something for the benefit of the project, be willing to explain to others how it works, so that they can build on your work to make it even better. + +## Try to be concise + +Keep in mind that what you write once will be read by many persons. Writing a short email means people can understand the conversation as efficiently as possible. When a long explanation is necessary, consider adding a summary. + +## Be open + +Most ways of communication used within Kamailio allow for public and private communication. You should preferably use public methods of communication for Kamailio-related messages, unless posting something sensitive. This applies also to messages for help or Kamailio-related support. + +## In case of problems + +While this code of conduct should be adhered to by participants, we recognize that sometimes people may have a bad day, or be unaware of the Kamailio code of conduct. When that happens, you may reply to them and point out this code of conduct. Such messages may be in public or in private, whatever is most appropriate. However, your message should still adhere to the relevant parts of this code of conduct; in particular, it should not be abusive or disrespectful. Assume good faith; participants are probably unaware of their bad behaviour. + +Serious or persistent offenders will be temporarily or permanently banned from the Kamailio project infrastructure. Complaints should be made (in private) to the Kamailio management board, by email to: management [at] kamailio (dot) org + +The Kamailio management board, while committed to applying its discretion sparingly and judiciously, is the final arbiter on controversies arising from this code of conduct, and indeed, any other controversies. + +#### Adapted from the Debian Code of Conduct: https://www.debian.org/code_of_conduct.

6 years, 2 months

← Newer
1
...
14
15
16
17
18
19
20
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2018