sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
530 discussions

git:lazedo/4.2:bff4e99d: usrloc: fixed issue updating last_modified

by Victor Seva

Module: kamailio Branch: lazedo/4.2 Commit: bff4e99d81353dbf02e0a6f609f762237ff589fd URL: https://github.com/kamailio/kamailio/commit/bff4e99d81353dbf02e0a6f609f7622… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-06T22:34:29+01:00 usrloc: fixed issue updating last_modified - introduced in previos commit (cherry picked from commit 767c2bc60f7f5a601118329df2c16b2646dbb58f) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/bff4e99d81353dbf02e0a6f609f7622… Patch: https://github.com/kamailio/kamailio/commit/bff4e99d81353dbf02e0a6f609f7622… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index b0cbb28..cc1c2e5 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -827,7 +827,7 @@ int db_update_ucontact_addr(ucontact_t* _c) keys2[nr_cols2] = &last_mod_col; vals2[nr_cols2].nul = 0; - vals2[nr_cols2].val = _c->last_modified; + UL_DB_EXPIRES_SET(&vals2[nr_cols2], _c->last_modified); nr_cols2++; keys2[nr_cols2] = &ruid_col;

9 years, 10 months

git:lazedo/4.2:84100f03: usrloc: fix db_update_addr and db_delete_ucontact_addr

by Victor Seva

Module: kamailio Branch: lazedo/4.2 Commit: 84100f0399c765c58d0de74086f97bc70440f5e9 URL: https://github.com/kamailio/kamailio/commit/84100f0399c765c58d0de74086f97bc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-06T22:33:43+01:00 usrloc: fix db_update_addr and db_delete_ucontact_addr use query WHERE columns depending on matching_mode option (cherry picked from commit e8a795a6a413ae453f619e3deaf36c26b85b0077) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/84100f0399c765c58d0de74086f97bc… Patch: https://github.com/kamailio/kamailio/commit/84100f0399c765c58d0de74086f97bc…

9 years, 10 months

git:lazedo/4.2:a0d6ec44: test/travis: move travis scripts to tests/travis ( Closes #20 )

by Victor Seva

Module: kamailio Branch: lazedo/4.2 Commit: a0d6ec4487530147d90c0dd988824fd57260cfcc URL: https://github.com/kamailio/kamailio/commit/a0d6ec4487530147d90c0dd988824fd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-06T22:24:09+01:00 test/travis: move travis scripts to tests/travis ( Closes #20 ) (cherry picked from commit d8642e20ae37e7724b9b9c517054b5d41c3c52f8) Conflicts: .travis.yml test/travis/databases_travis.sh --- Added: test/travis/build_deps.sh Added: test/travis/build_travis.sh Modified: .travis.yml Removed: pkg/kamailio/deb/build_deps.sh Removed: pkg/kamailio/deb/build_travis.sh --- Diff: https://github.com/kamailio/kamailio/commit/a0d6ec4487530147d90c0dd988824fd… Patch: https://github.com/kamailio/kamailio/commit/a0d6ec4487530147d90c0dd988824fd… --- diff --git a/.travis.yml b/.travis.yml index ecd40fd..c0708df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,8 @@ compiler: before_install: - sudo apt-get update -qq - sudo apt-get install -y gdebi-core - - sudo pkg/kamailio/deb/build_deps.sh precise $TRAVIS_BUILD_DIR -script: ./pkg/kamailio/deb/build_travis.sh + - sudo test/travis/build_deps.sh precise $TRAVIS_BUILD_DIR +script: ./test/travis/build_travis.sh branches: only: - master diff --git a/pkg/kamailio/deb/build_deps.sh b/pkg/kamailio/deb/build_deps.sh deleted file mode 100755 index 10387b2..0000000 --- a/pkg/kamailio/deb/build_deps.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# build_deps script for travis CI -# installs the build_deps packages needed to build Kamailio -# environment based on Ubuntu 12.04 LTS (precise) -# -DIST=${1:-precise} -BASE_DIR=${2:-$(pwd)} -CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control" -if ! [ -f "${CONTROL_FILE}" ]; then - echo "Error: No ${CONTROL_FILE} found" - exit 1 -fi - -BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \ - --option=APT::Install-Recommends=false \ - --apt-line ${CONTROL_FILE}) -if [ -z "${BUILD_DEPS}" ]; then - echo "Error: no build deps packages resolved" - exit 2 -fi - -apt-get install -y $BUILD_DEPS diff --git a/pkg/kamailio/deb/build_travis.sh b/pkg/kamailio/deb/build_travis.sh deleted file mode 100755 index a18b2e7..0000000 --- a/pkg/kamailio/deb/build_travis.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# build script for travis CI -# environment based on Ubuntu 12.04 LTS (precise) -# -export JAVA_HOME="/usr/lib/jvm/java-gcj" -EXCLUDED_MODULES="" -EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc" -PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \ - snmpstats carrierroute xmpp cpl redis python geoip\ - sqlite json mono ims sctp java \ - purple tls outbound websocket autheph" -echo "make cfg" -make FLAVOUR=kamailio cfg \ - skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \ - group_include="kstandard" -echo "make all" -make all -echo "make groups" -for grp in ${PACKAGE_GROUPS}; do - make every-module group_include="k${grp}" -done diff --git a/test/travis/build_deps.sh b/test/travis/build_deps.sh new file mode 100755 index 0000000..10387b2 --- /dev/null +++ b/test/travis/build_deps.sh @@ -0,0 +1,23 @@ +#!/bin/bash +# +# build_deps script for travis CI +# installs the build_deps packages needed to build Kamailio +# environment based on Ubuntu 12.04 LTS (precise) +# +DIST=${1:-precise} +BASE_DIR=${2:-$(pwd)} +CONTROL_FILE="${BASE_DIR}/pkg/kamailio/deb/${DIST}/control" +if ! [ -f "${CONTROL_FILE}" ]; then + echo "Error: No ${CONTROL_FILE} found" + exit 1 +fi + +BUILD_DEPS=$(/usr/bin/gdebi --quiet --non-interactive \ + --option=APT::Install-Recommends=false \ + --apt-line ${CONTROL_FILE}) +if [ -z "${BUILD_DEPS}" ]; then + echo "Error: no build deps packages resolved" + exit 2 +fi + +apt-get install -y $BUILD_DEPS diff --git a/test/travis/build_travis.sh b/test/travis/build_travis.sh new file mode 100755 index 0000000..a18b2e7 --- /dev/null +++ b/test/travis/build_travis.sh @@ -0,0 +1,22 @@ +#!/bin/bash +# +# build script for travis CI +# environment based on Ubuntu 12.04 LTS (precise) +# +export JAVA_HOME="/usr/lib/jvm/java-gcj" +EXCLUDED_MODULES="" +EXTRA_EXCLUDED_MODULES="bdb dbtext oracle pa iptrtpproxy mi_xmlrpc dnssec kazoo cnxcc" +PACKAGE_GROUPS="mysql postgres berkeley unixodbc radius presence ldap xml perl utils lua memcached \ + snmpstats carrierroute xmpp cpl redis python geoip\ + sqlite json mono ims sctp java \ + purple tls outbound websocket autheph" +echo "make cfg" +make FLAVOUR=kamailio cfg \ + skip_modules="${EXCLUDED_MODULES} ${EXTRA_EXCLUDED_MODULES}" \ + group_include="kstandard" +echo "make all" +make all +echo "make groups" +for grp in ${PACKAGE_GROUPS}; do + make every-module group_include="k${grp}" +done

9 years, 10 months

[tracker] Task closed: Kamailio does not handle HTTP Via: headers in requests and responses

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#237 - Kamailio does not handle HTTP Via: headers in requests and responses User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: Pushed the code to deal with HTTP Via, replacing it with Hia or Sia in order to be ignored. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=237 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

9 years, 10 months

git:master:dfb34a65: core: use Sia header name instead of Via for HTTP responses sent out

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dfb34a6516e358023543f2a30664d30ed723e934 URL: https://github.com/kamailio/kamailio/commit/dfb34a6516e358023543f2a30664d30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-06T23:41:59+01:00 core: use Sia header name instead of Via for HTTP responses sent out --- Modified: msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/dfb34a6516e358023543f2a30664d30… Patch: https://github.com/kamailio/kamailio/commit/dfb34a6516e358023543f2a30664d30… --- diff --git a/msg_translator.c b/msg_translator.c index 5e6bb24..5afb739 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -2281,6 +2281,8 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, char *after_body; str to_tag; char *totags; + int httpreq; + char *pvia; body = 0; buf=0; @@ -2302,6 +2304,8 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, /*computes the length of the new response buffer*/ len = 0; + httpreq = IS_HTTP(msg); + /* check if received needs to be added */ if (received_test(msg)) { if ((received_buf=received_builder(msg,&received_len))==0) { @@ -2410,6 +2414,8 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, switch (hdr->type) { case HDR_VIA_T: + /* if is HTTP, backup start of Via header in response */ + if(unlikely(httpreq)) pvia = p; if (hdr==msg->h_via1){ if (rport_buf){ if (msg->via1->rport){ /* delete the old one */ @@ -2443,6 +2449,10 @@ char * build_res_buf_from_sip_req( unsigned int code, str *text ,str *new_tag, (hdr->body.s+hdr->body.len)-hdr->name.s, msg); } append_str( p, CRLF,CRLF_LEN); + /* if is HTTP, replace Via with Sia + * - HTTP Via format is different than SIP Via + */ + if(unlikely(httpreq)) *pvia = 'S'; break; case HDR_RECORDROUTE_T: /* RR only for 1xx and 2xx replies */

9 years, 10 months

git:master:54c178a9: core: tcp - handle http read on \n\n EOH and deal with HTTP Via header

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 54c178a9072339233085372e60e611ba889f46b3 URL: https://github.com/kamailio/kamailio/commit/54c178a9072339233085372e60e611b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-06T23:23:43+01:00 core: tcp - handle http read on \n\n EOH and deal with HTTP Via header - handling \n\n for http makes same code as for sip, being easier to test injecting a request from file - HTTP Via is not compatible with SIP Via, resulting in errors - replace its name with Hia to be ignored. FS#237 --- Modified: tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/54c178a9072339233085372e60e611b… Patch: https://github.com/kamailio/kamailio/commit/54c178a9072339233085372e60e611b… --- diff --git a/tcp_read.c b/tcp_read.c index 4778662..08342cc 100644 --- a/tcp_read.c +++ b/tcp_read.c @@ -172,6 +172,16 @@ int tcp_http11_continue(struct tcp_connection *c) c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1; } + /* check for HTTP Via header + * - HTTP Via format is different that SIP Via + * - workaround: replace with Hia to be ignored by SIP parser + */ + if((p=strfindcasestrz(&msg, "\nVia:"))!=NULL) + { + p++; + *p = 'H'; + LM_DBG("replaced HTTP Via with Hia [[\n%.*s]]\n", msg.len, msg.s); + } return ret; } #endif /* HTTP11 */ @@ -452,6 +462,10 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) case '\n': /* found LF LF */ r->state=H_BODY; +#ifdef READ_HTTP11 + if (cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) + tcp_http11_continue(c); +#endif if (TCP_REQ_HAS_CLEN(r)){ r->body=p+1; r->bytes_to_go=r->content_len; @@ -461,9 +475,42 @@ int tcp_read_headers(struct tcp_connection *c, int* read_flags) goto skip; } }else{ - DBG("tcp_read_headers: ERROR: no clen, p=%X\n", - *p); - r->error=TCP_REQ_BAD_LEN; + if(cfg_get(tcp, tcp_cfg, accept_no_cl)!=0) { +#ifdef READ_MSRP + /* if MSRP message */ + if(c->req.flags&F_TCP_REQ_MSRP_FRAME) + { + r->body=p+1; + /* at least 3 bytes: 0\r\n */ + r->bytes_to_go=3; + p++; + r->content_len = 0; + r->state=H_MSRP_BODY; + break; + } +#endif + +#ifdef READ_HTTP11 + if(TCP_REQ_BCHUNKED(r)) { + r->body=p+1; + /* at least 3 bytes: 0\r\n */ + r->bytes_to_go=3; + p++; + r->content_len = 0; + r->state=H_HTTP11_CHUNK_START; + break; + } +#endif + r->body=p+1; + r->bytes_to_go=0; + r->flags|=F_TCP_REQ_COMPLETE; + p++; + goto skip; + } else { + DBG("tcp_read_headers: ERROR: no clen, p=%X\n", + *p); + r->error=TCP_REQ_BAD_LEN; + } } break; case '-':

9 years, 10 months

Re: [sr-dev] [kamailio] usrloc: REGISTER with new callid gets updated on memory but not on DB (#6)

by Victor Seva

Closed #6. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/6#event-214969321

9 years, 10 months

Re: [sr-dev] [kamailio] usrloc: REGISTER with new callid gets updated on memory but not on DB (#6)

by Victor Seva

backported to 4.1 and 4.2 --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/6#issuecomment-68943918

9 years, 10 months

git:4.1:8bed6769: usrloc: fixed issue updating last_modified

by Victor Seva

Module: kamailio Branch: 4.1 Commit: 8bed6769527eaf5aca47b5d1b3fe096090dac1f2 URL: https://github.com/kamailio/kamailio/commit/8bed6769527eaf5aca47b5d1b3fe096… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-06T23:01:49+01:00 usrloc: fixed issue updating last_modified - introduced in previous commit ( Closes #6 ) (based on commit 767c2bc60f7f5a601118329df2c16b2646dbb58f) --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/8bed6769527eaf5aca47b5d1b3fe096… Patch: https://github.com/kamailio/kamailio/commit/8bed6769527eaf5aca47b5d1b3fe096… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 90c32d7..79a0a1f 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -805,7 +805,7 @@ int db_update_ucontact_addr(ucontact_t* _c) keys2[nr_cols2] = &last_mod_col; vals2[nr_cols2].type = DB1_DATETIME; vals2[nr_cols2].nul = 0; - vals2[nr_cols2].val = _c->last_modified; + vals2[nr_cols2].val.time_val = _c->last_modified; nr_cols2++; keys2[nr_cols2] = &ruid_col;

9 years, 10 months

git:4.1:56b54a57: usrloc: fix db_update_addr and db_delete_ucontact_addr

by Victor Seva

Module: kamailio Branch: 4.1 Commit: 56b54a5767a3ad0df446fe181aee0ee5fd64276d URL: https://github.com/kamailio/kamailio/commit/56b54a5767a3ad0df446fe181aee0ee… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-01-06T22:56:03+01:00 usrloc: fix db_update_addr and db_delete_ucontact_addr use query WHERE columns depending on matching_mode option (cherry picked from commit e8a795a6a413ae453f619e3deaf36c26b85b0077) Conflicts: modules/usrloc/ucontact.c --- Modified: modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/56b54a5767a3ad0df446fe181aee0ee… Patch: https://github.com/kamailio/kamailio/commit/56b54a5767a3ad0df446fe181aee0ee…

9 years, 10 months

← Newer
1
...
37
38
39
40
41
42
43
...
53
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015