sr-dev September 2016

sr-dev@lists.kamailio.org

29 participants
319 discussions

git:master:2cf9dbad: ipops: adding detailed_ip_type() functions

by Lucian Balaceanu

Module: kamailio Branch: master Commit: 2cf9dbadfc4a294927798a1aaf50601c68711a50 URL: https://github.com/kamailio/kamailio/commit/2cf9dbadfc4a294927798a1aaf50601… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2016-09-01T18:47:14+03:00 ipops: adding detailed_ip_type() functions Returns the detailed type of the given IP, analogue to perl's Net::IP ip_iptype() (see also http://www.iana.org/assignments/ipv6-address-space/ipv6-address-space.txt, http://www.iana.org/assignments/iana-ipv6-special-registry/iana-ipv6-specia…, RFC 5735 and RFC 6598: PRIVATE, SHARED, LOOPBACK, IPV4MAP, DISCARD etc) --- Added: modules/ipops/detailed_ip_type.c Added: modules/ipops/detailed_ip_type.h Modified: modules/ipops/README Modified: modules/ipops/doc/ipops_admin.xml Modified: modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2cf9dbadfc4a294927798a1aaf50601… Patch: https://github.com/kamailio/kamailio/commit/2cf9dbadfc4a294927798a1aaf50601…

7 years, 7 months

git:master:648704f2: dialog: ensure all headers are parsed to find the custom ones for cseq refresh

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 648704f209d8916a1840ae5f3de8b404edb3d8ab URL: https://github.com/kamailio/kamailio/commit/648704f209d8916a1840ae5f3de8b40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T17:24:07+02:00 dialog: ensure all headers are parsed to find the custom ones for cseq refresh - GH #752 --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/648704f209d8916a1840ae5f3de8b40… Patch: https://github.com/kamailio/kamailio/commit/648704f209d8916a1840ae5f3de8b40… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 7c95ce0..7aaad02 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -383,9 +383,10 @@ int dlg_cseq_msg_sent(void *data) goto done; } + parse_headers(&msg, HDR_EOH_F, 0); + /* check if transaction is marked for a new increment */ if(get_cseq(&msg)->method_id!=METHOD_ACK) { - parse_headers(&msg, HDR_EOH_F, 0); hfk = sr_hdr_get_z(&msg, "P-K-Auth-CSeq"); if(hfk!=NULL) { LM_DBG("new cseq inc requested\n"); @@ -405,6 +406,7 @@ int dlg_cseq_msg_sent(void *data) } } if(nval.len<=0) { + LM_DBG("cseq refresh requested, but no new value found\n"); goto done; }

7 years, 7 months

git:master:a04755ad: jansson: test if pkg-config knows about jansson library

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a04755addf8f930fa51b1913a1ff5b6361785418 URL: https://github.com/kamailio/kamailio/commit/a04755addf8f930fa51b1913a1ff5b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T14:15:51+02:00 jansson: test if pkg-config knows about jansson library --- Modified: modules/jansson/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/a04755addf8f930fa51b1913a1ff5b6… Patch: https://github.com/kamailio/kamailio/commit/a04755addf8f930fa51b1913a1ff5b6… --- diff --git a/modules/jansson/Makefile b/modules/jansson/Makefile index 2d033a4..7680f71 100644 --- a/modules/jansson/Makefile +++ b/modules/jansson/Makefile @@ -1,21 +1,28 @@ # # jansson module makefile # -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs auto_gen= NAME=jansson.so -BUILDER = $(shell which pkg-config) -ifeq ($(BUILDER),) - DEFS+=-I$(LOCALBASE)/include \ - LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljansson +ifeq ($(CROSS_COMPILE),) +JNS_BUILDER=$(shell \ + if pkg-config --exists jansson; then \ + echo 'pkg-config jansson'; \ + fi) +endif + +ifneq ($(JNS_BUILDER),) + DEFS += $(shell $(JNS_BUILDER) --cflags) + LIBS += $(shell $(JNS_BUILDER) --libs) else - DEFS+= $(shell pkg-config --cflags jansson) - LIBS+= $(shell pkg-config --libs jansson) + DEFS+=-I$(LOCALBASE)/include + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljansson endif + DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib

7 years, 7 months

git:master:41727b76: topos: store record route set only for initial 200ok response

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 41727b768406383924d87b3d426d5f79df0f45be URL: https://github.com/kamailio/kamailio/commit/41727b768406383924d87b3d426d5f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T13:33:23+02:00 topos: store record route set only for initial 200ok response --- Modified: modules/topos/tps_storage.c Modified: modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/41727b768406383924d87b3d426d5f7… Patch: https://github.com/kamailio/kamailio/commit/41727b768406383924d87b3d426d5f7… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index 13c7c77..faf202f 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -1015,6 +1015,7 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) return 0; } + ret = tps_storage_link_msg(msg, md, md->direction); if(ret<0) return -1; @@ -1044,15 +1045,18 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_contact); nr_ucols++; - db_ucols[nr_ucols] = &td_col_b_rr; - db_uvals[nr_ucols].type = DB1_STR; - db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_rr); - nr_ucols++; - if(msg->first_line.type==SIP_REPLY) { if(sd->b_tag.len<=0 && msg->first_line.u.reply.statuscode>=200 && msg->first_line.u.reply.statuscode<300) { + + if((sd->iflags&TPS_IFLAG_DLGON) == 0) { + db_ucols[nr_ucols] = &td_col_b_rr; + db_uvals[nr_ucols].type = DB1_STR; + db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_rr); + nr_ucols++; + } + db_ucols[nr_ucols] = &td_col_b_tag; db_uvals[nr_ucols].type = DB1_STR; db_uvals[nr_ucols].val.str_val = TPS_STRZ(md->b_tag); @@ -1060,7 +1064,7 @@ int tps_storage_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) db_ucols[nr_ucols] = &td_col_iflags; db_uvals[nr_ucols].type = DB1_INT; - db_uvals[nr_ucols].val.int_val = 1; + db_uvals[nr_ucols].val.int_val = sd->iflags|TPS_IFLAG_DLGON; nr_ucols++; } } diff --git a/modules/topos/tps_storage.h b/modules/topos/tps_storage.h index 63793db..ad37048 100644 --- a/modules/topos/tps_storage.h +++ b/modules/topos/tps_storage.h @@ -34,6 +34,9 @@ #define TPS_DIR_DOWNSTREAM 0 #define TPS_DIR_UPSTREAM 1 +#define TPS_IFLAG_INIT 1 +#define TPS_IFLAG_DLGON 2 + #define TPS_DATA_SIZE 8192 typedef struct tps_data { char cbuf[TPS_DATA_SIZE];

7 years, 7 months

[kamailio/kamailio] sca: terminate all error and debug messages with a new line (#762)

by Kevin Scott Adams

Reported by oej GH #580. Includes whitespace cleanup and normalizing. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/762 -- Commit Summary -- * Merge remote-tracking branch 'refs/remotes/kamailio/master' * sca: terminate all error and debug messages with a new line -- File Changes -- M modules/sca/sca.c (554) M modules/sca/sca.h (36) M modules/sca/sca_appearance.c (2239) M modules/sca/sca_appearance.h (188) M modules/sca/sca_call_info.c (3557) M modules/sca/sca_call_info.h (42) M modules/sca/sca_common.h (13) M modules/sca/sca_db.c (251) M modules/sca/sca_db.h (71) M modules/sca/sca_dialog.c (151) M modules/sca/sca_dialog.h (22) M modules/sca/sca_event.c (73) M modules/sca/sca_event.h (16) M modules/sca/sca_hash.c (451) M modules/sca/sca_hash.h (78) M modules/sca/sca_notify.c (597) M modules/sca/sca_notify.h (6) M modules/sca/sca_reply.c (54) M modules/sca/sca_reply.h (2) M modules/sca/sca_rpc.c (820) M modules/sca/sca_rpc.h (44) M modules/sca/sca_subscribe.c (2668) M modules/sca/sca_subscribe.h (71) M modules/sca/sca_util.c (718) M modules/sca/sca_util.h (32) M utils/kamctl/mysql/ims_dialog-create.sql (104) -- Patch Links -- https://github.com/kamailio/kamailio/pull/762.patch https://github.com/kamailio/kamailio/pull/762.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/762

7 years, 7 months

git:master:c1e0ba69: sca: terminate all error and debug messages with a new line

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c1e0ba6992eea8af9f152bdfa6f5b0398811b40d URL: https://github.com/kamailio/kamailio/commit/c1e0ba6992eea8af9f152bdfa6f5b03… Author: Kevin Scott Adams <kevin.adams(a)ksatechnologies.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T13:11:41+02:00 sca: terminate all error and debug messages with a new line - issue reported by oej, GH #580 - commmit also includes whitespace cleanup - (outcome of PR GH #762) --- Modified: modules/sca/sca.c Modified: modules/sca/sca.h Modified: modules/sca/sca_appearance.c Modified: modules/sca/sca_appearance.h Modified: modules/sca/sca_call_info.c Modified: modules/sca/sca_call_info.h Modified: modules/sca/sca_common.h Modified: modules/sca/sca_db.c Modified: modules/sca/sca_db.h Modified: modules/sca/sca_dialog.c Modified: modules/sca/sca_dialog.h Modified: modules/sca/sca_event.c Modified: modules/sca/sca_event.h Modified: modules/sca/sca_hash.c Modified: modules/sca/sca_hash.h Modified: modules/sca/sca_notify.c Modified: modules/sca/sca_notify.h Modified: modules/sca/sca_reply.c Modified: modules/sca/sca_reply.h Modified: modules/sca/sca_rpc.c Modified: modules/sca/sca_rpc.h Modified: modules/sca/sca_subscribe.c Modified: modules/sca/sca_subscribe.h Modified: modules/sca/sca_util.c Modified: modules/sca/sca_util.h --- Diff: https://github.com/kamailio/kamailio/commit/c1e0ba6992eea8af9f152bdfa6f5b03… Patch: https://github.com/kamailio/kamailio/commit/c1e0ba6992eea8af9f152bdfa6f5b03…

7 years, 7 months

[kamailio/kamailio] dont use url encoding for transport tag in path header (#765)

by Sebastian Denz

the transport tag was the only string which used urlencoding for ';' and '=' see line 90 for example this has lead (on the wire) to headers like: Path: <sip:inbound_webrtc@10.3.66.231;lr;received=sip:127.0.0.1:41988%3Btransport%3Dws;ob> to me this does not look like intention?! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/765 -- Commit Summary -- * dont use url encoding for transport tag in path header -- File Changes -- M modules/path/path.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/765.patch https://github.com/kamailio/kamailio/pull/765.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/765

7 years, 7 months

git:master:040106fc: path: added section ids in docs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 040106fc3f7b807d978cb8112c2637419ffb9926 URL: https://github.com/kamailio/kamailio/commit/040106fc3f7b807d978cb8112c26374… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T13:01:15+02:00 path: added section ids in docs --- Modified: modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/040106fc3f7b807d978cb8112c26374… Patch: https://github.com/kamailio/kamailio/commit/040106fc3f7b807d978cb8112c26374… --- diff --git a/modules/path/doc/path_admin.xml b/modules/path/doc/path_admin.xml index 2a7ade6..218915a 100644 --- a/modules/path/doc/path_admin.xml +++ b/modules/path/doc/path_admin.xml @@ -98,7 +98,7 @@ <section> <title>External Libraries or Applications</title> <para> - The following libraries or applications must be installed before + The following libraries or applications must be installed before running &kamailio; with this module loaded: <itemizedlist> <listitem> @@ -113,7 +113,7 @@ <section> <title>Parameters</title> - <section> + <section id="path.p.use_received"> <title><varname>use_received</varname> (int)</title> <para> If set to 1, the <quote>received</quote> parameter of the first Route &uri; is evaluated and @@ -137,12 +137,12 @@ modparam("path", "use_received", 1) <section> <title>Functions</title> - <section> + <section id="path.f.add_path"> <title> <function moreinfo="none">add_path()</function> </title> <para> - This function is used to insert a Path header in the form + This function is used to insert a Path header in the form <quote>Path: <sip:1.2.3.4;lr></quote>, where <quote>1.2.3.4</quote> is the address of the outgoing interface. </para> @@ -170,12 +170,12 @@ if (!add_path()) { </example> </section> - <section> + <section id="path.f.add_path_u"> <title> <function moreinfo="none">add_path(user)</function> </title> <para> - This function adds a Path header in the form + This function adds a Path header in the form <quote>Path: <sip:user@1.2.3.4;lr></quote>. </para> <para>Meaning of the parameters is as follows:</para> @@ -203,12 +203,12 @@ if (!add_path("loadbalancer")) { </example> </section> - <section> + <section id="path.f.add_path_up"> <title> <function moreinfo="none">add_path(user, parameters)</function> </title> <para> - This function adds a Path header in the form + This function adds a Path header in the form <quote>Path: <sip:user@1.2.3.4;lr></quote> and appends the given <emphasis>parameters</emphasis> as additional URI parameters. </para> @@ -245,13 +245,13 @@ if (!add_path("loadbalancer", "ob")) { </example> </section> - <section> + <section id="path.f.add_path_rcv"> <title> <function moreinfo="none">add_path_received()</function> </title> <para> - This function adds a Path header in the form - <quote>Path: <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr></quote>, setting its own + This function adds a Path header in the form + <quote>Path: <sip:1.2.3.4;received=sip:2.3.4.5:1234;lr></quote>, setting its own outgoing address as domain-part, and the address the request has been received from as received-parameter. </para> @@ -271,14 +271,14 @@ if (!add_path_received()) { </example> </section> - <section> + <section id="path.f.add_path_rcv_u"> <title> <function moreinfo="none">add_path_received(user)</function> </title> <para> - This function adds a Path header in the form + This function adds a Path header in the form <quote>Path: <sip:user@1.2.3.4;received=sip:2.3.4.5:1234;lr></quote>, setting - 'user' as username part of address, its own + 'user' as username part of address, its own outgoing address as domain-part, and the address the request has been received from as received-parameter. </para> @@ -298,14 +298,14 @@ if (!add_path_received("inbound")) { </example> </section> - <section> + <section id="path.f.add_path_rcv_up"> <title> <function moreinfo="none">add_path_received(user, parameters)</function> </title> <para> - This function adds a Path header in the form + This function adds a Path header in the form <quote>Path: <sip:user@1.2.3.4;received=sip:2.3.4.5:1234;lr></quote>, setting - 'user' as username part of address, its own + 'user' as username part of address, its own outgoing address as domain-part, and the address the request has been received from as received-parameter. </para>

7 years, 7 months

git:master:3fec5152: topos: error message about missing uuid when loading dlg made dbg

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3fec5152c85844ab4fe950d8564c4cc47eef0529 URL: https://github.com/kamailio/kamailio/commit/3fec5152c85844ab4fe950d8564c4cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-09-01T12:55:37+02:00 topos: error message about missing uuid when loading dlg made dbg - this can be the case of local generated requests that are not handled by topos - reported by Daniel Tryba --- Modified: modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/3fec5152c85844ab4fe950d8564c4cc… Patch: https://github.com/kamailio/kamailio/commit/3fec5152c85844ab4fe950d8564c4cc… --- diff --git a/modules/topos/tps_storage.c b/modules/topos/tps_storage.c index ecce41c..13c7c77 100644 --- a/modules/topos/tps_storage.c +++ b/modules/topos/tps_storage.c @@ -871,7 +871,7 @@ int tps_storage_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) return -1; if(md->a_uuid.len<=0 && md->b_uuid.len<=0) { - LM_ERR("no dlg uuid provided\n"); + LM_DBG("no dlg uuid provided\n"); return -1; }

7 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2016