sr-dev May 2016

sr-dev@lists.kamailio.org

28 participants
348 discussions

Errored: kamailio/kamailio#2421 (master - fee3637)
by Travis CI 13 May '16

13 May '16

Build Update for kamailio/kamailio ------------------------------------- Build: #2421 Status: Errored Duration: 11 minutes and 2 seconds Commit: fee3637 (master) Author: Daniel-Constantin Mierla Message: lib/srdb1: support for db result with allocated column names - a db connector module can allocate column names in the result, in that case it must set the flag: RES_COL_FLAGS(res) |= DB1_FCOL_FREE; - the flag is per result, all column names must be allocated or not - following the discussion on GH #611 View the changeset: https://github.com/kamailio/kamailio/compare/d322a84ceb92...fee3637648b1 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/129923867 -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:fee36376: lib/srdb1: support for db result with allocated column names
by Daniel-Constantin Mierla 13 May '16

13 May '16

Module: kamailio Branch: master Commit: fee3637648b137391fec7a8ec862b977333ca4be URL: https://github.com/kamailio/kamailio/commit/fee3637648b137391fec7a8ec862b97… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-05-13T08:08:35+02:00 lib/srdb1: support for db result with allocated column names - a db connector module can allocate column names in the result, in that case it must set the flag: RES_COL_FLAGS(res) |= DB1_FCOL_FREE; - the flag is per result, all column names must be allocated or not - following the discussion on GH #611 --- Modified: lib/srdb1/db_res.c Modified: lib/srdb1/db_res.h --- Diff: https://github.com/kamailio/kamailio/commit/fee3637648b137391fec7a8ec862b97… Patch: https://github.com/kamailio/kamailio/commit/fee3637648b137391fec7a8ec862b97… --- diff --git a/lib/srdb1/db_res.c b/lib/srdb1/db_res.c index b07965b..d3b9729 100644 --- a/lib/srdb1/db_res.c +++ b/lib/srdb1/db_res.c @@ -81,6 +81,10 @@ int db_free_columns(db1_res_t* _r) for(col = 0; col < RES_COL_N(_r); col++) { if (RES_NAMES(_r)[col]!=NULL) { LM_DBG("freeing RES_NAMES[%d] at %p\n", col, RES_NAMES(_r)[col]); + /* free column name if it was allocated */ + if ((RES_COL_FLAGS(_r) & DB1_FCOL_FREE) && RES_NAMES(_r)[col]->s != NULL) { + pkg_free(RES_NAMES(_r)[col]->s); + } pkg_free((str *)RES_NAMES(_r)[col]); RES_NAMES(_r)[col] = NULL; } diff --git a/lib/srdb1/db_res.h b/lib/srdb1/db_res.h index c424d9d..5fe0796 100644 --- a/lib/srdb1/db_res.h +++ b/lib/srdb1/db_res.h @@ -38,8 +38,12 @@ struct db_row; +/* -- column name flags -- */ +/* column name must be freed when db result is destroyed */ +#define DB1_FCOL_FREE (1<<1) + /** - * This type represents a result returned by db_query function (see below). The + * This type represents a result returned by db_query function (see below). The * result can consist of zero or more rows (see db_row_t description). * * Note: A variable of type db1_res_t returned by db_query function uses dynamicaly @@ -54,6 +58,7 @@ typedef struct db1_res { db_key_t* names; /**< Column names */ db_type_t* types; /**< Column types */ int n; /**< Number of columns */ + int cflags; /**< Flags of columns */ } col; struct db_row* rows; /**< Rows */ int n; /**< Number of rows in current fetch */ @@ -69,6 +74,8 @@ typedef struct db1_res { #define RES_TYPES(re) ((re)->col.types) /** Return the number of columns */ #define RES_COL_N(re) ((re)->col.n) +/** Return the flags of columns */ +#define RES_COL_FLAGS(re) ((re)->col.cflags) /** Return the result rows */ #define RES_ROWS(re) ((re)->rows) /** Return the number of current result rows */

1 0

[kamailio/kamailio] pkg/kamailio/deb/jessie: change default location (#609)
by Fred Posner 12 May '16

12 May '16

- default config file is /usr/local/etc/kamailio. kamailio.init CFGFILE should match installed location. - kamailio is installed in /usr/local/sbin. kamailio.init PATH should have /usr/local/bin:/usr/local/sbin. - kamailio is installed in /usr/local/sbin. kamailio.init DAEMON should match installed location. - CFGFILE and ExecStart should match installed locations of kamailio.cfg and kamailio You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/609 -- Commit Summary -- * pkg/kamailio/deb/jessie: change default location * pkg/kamailio/deb/jessie: kamailio.service should match installed location -- File Changes -- M pkg/kamailio/deb/jessie/kamailio.init (6) M pkg/kamailio/deb/jessie/kamailio.service (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/609.patch https://github.com/kamailio/kamailio/pull/609.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/609

3 4

git:master:d322a84c: kex: add extended core stats (#605)
by Victor Seva 12 May '16

12 May '16

Module: kamailio Branch: master Commit: d322a84ceb929e101090de875cc0360ea14ecd59 URL: https://github.com/kamailio/kamailio/commit/d322a84ceb929e101090de875cc0360… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-12T22:23:55+02:00 kex: add extended core stats (#605) * requests by method * replies by status code --- Modified: modules/kex/core_stats.c Modified: modules/kex/core_stats.h --- Diff: https://github.com/kamailio/kamailio/commit/d322a84ceb929e101090de875cc0360… Patch: https://github.com/kamailio/kamailio/commit/d322a84ceb929e101090de875cc0360…

1 0

git:master:a61ff084: sms: fix compiler warning #612 (#617)
by Victor Seva 12 May '16

12 May '16

Module: kamailio Branch: master Commit: a61ff084bc87c7d3dd05b14afd35795b466d37dc URL: https://github.com/kamailio/kamailio/commit/a61ff084bc87c7d3dd05b14afd35795… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-05-12T22:08:28+02:00 sms: fix compiler warning #612 (#617) * show error message if error in write > CC (clang) [M sms.so] libsms_modem.o > libsms_modem.c:77:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > write(mdm->fd,cmd,cmd_len); > ^~~~~ ~~~~~~~~~~~~~~~~~~~ >1 warning generated. --- Modified: modules/sms/libsms_modem.c --- Diff: https://github.com/kamailio/kamailio/commit/a61ff084bc87c7d3dd05b14afd35795… Patch: https://github.com/kamailio/kamailio/commit/a61ff084bc87c7d3dd05b14afd35795… --- diff --git a/modules/sms/libsms_modem.c b/modules/sms/libsms_modem.c index d0f5b33..e9d88fa 100644 --- a/modules/sms/libsms_modem.c +++ b/modules/sms/libsms_modem.c @@ -74,7 +74,9 @@ int put_command( struct modem *mdm, char* cmd, int cmd_len, char* answer, LM_DBG("-<%d>-->[%.*s] \n",cmd_len,cmd_len,cmd); #endif /* send the command to the modem */ - write(mdm->fd,cmd,cmd_len); + if (write(mdm->fd,cmd,cmd_len)<0) { + LM_ERR("write error: %s\n", strerror(errno)); + } tcdrain(mdm->fd); /* read from the modem */

1 0

[kamailio/kamailio] sms: fix compiler warning #612 (#617)
by Victor Seva 12 May '16

12 May '16

* show error message if error in write > CC (clang) [M sms.so] libsms_modem.o > libsms_modem.c:77:2: warning: ignoring return value of function declared with warn_unused_result attribute [-Wunused-result] > write(mdm->fd,cmd,cmd_len); > ^~~~~ ~~~~~~~~~~~~~~~~~~~ >1 warning generated. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/617 -- Commit Summary -- * sms: fix compiler warning #612 -- File Changes -- M modules/sms/libsms_modem.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/617.patch https://github.com/kamailio/kamailio/pull/617.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/617

2 2

git:master:1d63275f: http_client Investigate needs of improvements to the API and add some thoughts to the TODO document
by Olle E. Johansson 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 1d63275f4b1ec07bc554bc1fa77e82dc43159919 URL: https://github.com/kamailio/kamailio/commit/1d63275f4b1ec07bc554bc1fa77e82d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-12T21:38:10+02:00 http_client Investigate needs of improvements to the API and add some thoughts to the TODO document --- Modified: modules/http_client/TODO.txt --- Diff: https://github.com/kamailio/kamailio/commit/1d63275f4b1ec07bc554bc1fa77e82d… Patch: https://github.com/kamailio/kamailio/commit/1d63275f4b1ec07bc554bc1fa77e82d… --- diff --git a/modules/http_client/TODO.txt b/modules/http_client/TODO.txt index 17eb0b9..81bde1b 100644 --- a/modules/http_client/TODO.txt +++ b/modules/http_client/TODO.txt @@ -68,10 +68,33 @@ The http_client module - todo - Option to configure DNS resolvers for CURL to use + +Development API +--------------- +- xcap_client needs to add headers: + char* hdr_name= NULL; + + memset(buf, 0, 128* sizeof(char)); + match_header= buf; + + hdr_name= (match_type==IF_MATCH)?"If-Match":"If-None-Match"; + + len=sprintf(match_header, "%s: %s\n", hdr_name, match_etag); + + match_header[len]= '\0'; + https://curl.haxx.se/libcurl/c/CURLOPT_HEADERFUNCTION.html + +- It also does get a headers from the reply, which needs a callback +- auth_identify sets the CURLOPT_CAINFO option + https://curl.haxx.se/libcurl/c/CURLOPT_CAINFO.html + This can be set in the httpconf object + + + Issues in the bug tracker ------------------------- -- https://github.com/kamailio/kamailio/issues/542 - open - Support connection reuse. Needs private memory structures to track connections + +- none Solved issues @@ -87,4 +110,6 @@ Solved issues Support TLS client certificates - https://github.com/kamailio/kamailio/pull/435 - closed Pull request that fixed a lot of issues. +- https://github.com/kamailio/kamailio/issues/542 - closed + Support connection reuse. Needs private memory structures to track connections

1 0

git:master:f8191981: http_client Update README
by Olle E. Johansson 12 May '16

12 May '16

Module: kamailio Branch: master Commit: f8191981483683ec2e570ad5f9f806bc7cd01eda URL: https://github.com/kamailio/kamailio/commit/f8191981483683ec2e570ad5f9f806b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-12T21:11:57+02:00 http_client Update README --- Modified: modules/http_client/README Modified: modules/http_client/doc/http_client.xml --- Diff: https://github.com/kamailio/kamailio/commit/f8191981483683ec2e570ad5f9f806b… Patch: https://github.com/kamailio/kamailio/commit/f8191981483683ec2e570ad5f9f806b… --- diff --git a/modules/http_client/README b/modules/http_client/README index 3261911..e43fbd0 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -3,18 +3,22 @@ http_client Olle E. Johansson Edvina AB + <oej(a)edvina.net> Juha Heinanen TutPro Inc. + <jh(a)tutpro.com> Carsten Bock ng-voice GmbH + <carsten(a)ng-voice.com> Hugh Waite Xura Inc + <hugh.waite(a)xura.com> Copyright © 2008-2009 Juha Heinanen diff --git a/modules/http_client/doc/http_client.xml b/modules/http_client/doc/http_client.xml index c870bb9..00d1c7d 100644 --- a/modules/http_client/doc/http_client.xml +++ b/modules/http_client/doc/http_client.xml @@ -17,33 +17,25 @@ <firstname>Olle E.</firstname> <surname>Johansson</surname> <affiliation><orgname>Edvina AB</orgname></affiliation> - <address> - <email>oej(a)edvina.net</email> - </address> + <email>oej(a)edvina.net</email> </author> <author> <firstname>Juha</firstname> <surname>Heinanen</surname> <affiliation><orgname>TutPro Inc.</orgname></affiliation> - <address> - <email>jh(a)tutpro.com</email> - </address> + <email>jh(a)tutpro.com</email> </author> <author> <firstname>Carsten</firstname> <surname>Bock</surname> <affiliation><orgname>ng-voice GmbH</orgname></affiliation> - <address> - <email>carsten(a)ng-voice.com</email> - </address> + <email>carsten(a)ng-voice.com</email> </author> <author> <firstname>Hugh</firstname> <surname>Waite</surname> <affiliation><orgname>Xura Inc</orgname></affiliation> - <address> - <email>hugh.waite(a)xura.com</email> - </address> + <email>hugh.waite(a)xura.com</email> </author> </authorgroup> <copyright>

1 0

git:master:38ea2e8d: http_client update README
by Olle E. Johansson 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 38ea2e8df7aad20eafbadc02ad5e5618954b749b URL: https://github.com/kamailio/kamailio/commit/38ea2e8df7aad20eafbadc02ad5e561… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-12T21:11:00+02:00 http_client update README --- Modified: modules/http_client/README --- Diff: https://github.com/kamailio/kamailio/commit/38ea2e8df7aad20eafbadc02ad5e561… Patch: https://github.com/kamailio/kamailio/commit/38ea2e8df7aad20eafbadc02ad5e561… --- diff --git a/modules/http_client/README b/modules/http_client/README index 467b87f..3261911 100644 --- a/modules/http_client/README +++ b/modules/http_client/README @@ -84,7 +84,8 @@ Hugh Waite 1.1. http_connect(msg, connection, url, result, content_type, post) - 1.2. http_query(msg, url, dest, post) + 1.2. int http_connection_exists(str *connection) + 1.3. http_query(msg, url, dest, post) List of Examples @@ -741,12 +742,14 @@ Chapter 2. Developer Guide 1.1. http_connect(msg, connection, url, result, content_type, post) - 1.2. http_query(msg, url, dest, post) + 1.2. int http_connection_exists(str *connection) + 1.3. http_query(msg, url, dest, post) 1. Available Functions 1.1. http_connect(msg, connection, url, result, content_type, post) - 1.2. http_query(msg, url, dest, post) + 1.2. int http_connection_exists(str *connection) + 1.3. http_query(msg, url, dest, post) 1.1. http_connect(msg, connection, url, result, content_type, post) @@ -777,7 +780,15 @@ Chapter 2. Developer Guide A string containing the message body to send. Use NULL when a message body is not required. -1.2. http_query(msg, url, dest, post) +1.2. int http_connection_exists(str *connection) + + Check if a connection definition exists. Connections are defined as + modparam's in the http_client modules. + + Returns 1 if the connection exists, 0 if a connection with the given + name can't be found. + +1.3. http_query(msg, url, dest, post) Sends HTTP GET or POST request to a given connection. If post data is defined, POST will be used, otherwise GET. The default settings defined

1 0

git:master:35014d46: http_client Add a function to check if a connection exists to the development API
by Olle E. Johansson 12 May '16

12 May '16

Module: kamailio Branch: master Commit: 35014d465152fbd297fc3c2c951f0a24eabcd84a URL: https://github.com/kamailio/kamailio/commit/35014d465152fbd297fc3c2c951f0a2… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-05-12T21:10:07+02:00 http_client Add a function to check if a connection exists to the development API --- Modified: modules/http_client/curl_api.c Modified: modules/http_client/curl_api.h Modified: modules/http_client/curlcon.c Modified: modules/http_client/curlcon.h Modified: modules/http_client/doc/http_client_devel.xml --- Diff: https://github.com/kamailio/kamailio/commit/35014d465152fbd297fc3c2c951f0a2… Patch: https://github.com/kamailio/kamailio/commit/35014d465152fbd297fc3c2c951f0a2… --- diff --git a/modules/http_client/curl_api.c b/modules/http_client/curl_api.c index c0f8fc5..c0e9d71 100644 --- a/modules/http_client/curl_api.c +++ b/modules/http_client/curl_api.c @@ -30,6 +30,7 @@ int bind_httpc_api(httpc_api_t *api) } api->http_connect = curl_con_query_url; api->http_query = http_query; + api->http_connection_exists = http_connection_exists; return 0; } diff --git a/modules/http_client/curl_api.h b/modules/http_client/curl_api.h index 236aef6..cbca5e3 100644 --- a/modules/http_client/curl_api.h +++ b/modules/http_client/curl_api.h @@ -30,14 +30,17 @@ #include "../../sr_module.h" #include "functions.h" +#include "curlcon.h" typedef int (*httpcapi_httpconnect_f)(struct sip_msg *msg, const str *connection, const str* _url, str* _result, const char *contenttype, const str* _post); typedef int (*httpcapi_httpquery_f)(struct sip_msg* _m, char* _url, str* _dst, char* _post); +typedef int (*httpcapi_curlcon_exists_f)(str* _name); typedef struct httpc_api { httpcapi_httpconnect_f http_connect; httpcapi_httpquery_f http_query; + httpcapi_curlcon_exists_f http_connection_exists; } httpc_api_t; typedef int (*bind_httpc_api_f)(httpc_api_t *api); diff --git a/modules/http_client/curlcon.c b/modules/http_client/curlcon.c index aa03fba..b2caa4a 100644 --- a/modules/http_client/curlcon.c +++ b/modules/http_client/curlcon.c @@ -124,6 +124,20 @@ unsigned int curl_connection_count() } +/*! Check if CURL connection exists + */ +int http_connection_exists(str *name) +{ + curl_con_t *cc; + + if (curl_get_connection(name) != NULL) { + return 1; + } + + LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", name->len, name->s); + return 0; +} + /*! Find CURL connection by name */ curl_con_t* curl_get_connection(str *name) diff --git a/modules/http_client/curlcon.h b/modules/http_client/curlcon.h index 0380648..f878258 100644 --- a/modules/http_client/curlcon.h +++ b/modules/http_client/curlcon.h @@ -39,6 +39,10 @@ extern curl_con_t *_curl_con_root; */ unsigned int curl_connection_count(); +/*! Check if CURL connection exists + */ +int http_connection_exists(str *name); + int http_client_load_config(str *config_file); int curl_parse_param(char *val); diff --git a/modules/http_client/doc/http_client_devel.xml b/modules/http_client/doc/http_client_devel.xml index 542f50e..ad06026 100644 --- a/modules/http_client/doc/http_client_devel.xml +++ b/modules/http_client/doc/http_client_devel.xml @@ -73,6 +73,19 @@ </section> <section> <title> + <function moreinfo="none">int http_connection_exists(str *connection)</function> + </title> + <para> + Check if a connection definition exists. Connections are defined as modparam's + in the http_client modules. + </para> + <para> + Returns 1 if the connection exists, 0 if a connection with the given name can't + be found. + </para> + </section> + <section> + <title> <function moreinfo="none">http_query(msg, url, dest, post)</function> </title> <para>

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
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 May 2016