sr-dev February 2015

sr-dev@lists.kamailio.org

39 participants
341 discussions

[kamailio] modules/sctp - Fixes FreeBSD compile error and 2 warnings (#74)

by Mikko Lehto

This patch makes SCTP module compile without errors or warnings on FreeBSD 10.1 CC (clang) [M sctp.so] sctp_server.o sctp_server.c:2400:54: error: too few arguments provided to function-like macro invocation SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su); ^ ./sctp_ev.h:37:9: note: macro 'SCTP_EV_REMOTE_ERROR' defined here #define SCTP_EV_REMOTE_ERROR(lip, lport, src, err) ^ sctp_server.c:2400:4: error: use of undeclared identifier 'SCTP_EV_REMOTE_ERROR' SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su); ^ sctp_server.c:2662:13: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] if ((errno==ENOENT)){ sctp_server.c:2829:13: warning: equality comparison with extraneous parentheses [-Wparentheses-equality] if ((errno==ENOENT)){ You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/74 -- Commit Summary -- * modules/sctp Fixes FreeBSD 10.1 compile error and 2 warnings -- File Changes -- M modules/sctp/sctp_server.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/74.patch https://github.com/kamailio/kamailio/pull/74.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/74

9 years, 11 months

Registrar: check local path - backport?

by Charles Chance

Hi, Is it OK to backport the above ( https://github.com/kamailio/kamailio/commit/635f23b12eff2431ca9a14bb39f4204…) to 4.2? The patch preserves existing behaviour, having optional parameter to enable (default disabled). Cheers, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

9 years, 11 months

git:master:b06626e8: sctp: fixes for FreeBSD 10.1 compile error and 2 warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b06626e811edae93c5f28dc132eca7542a6dcc97 URL: https://github.com/kamailio/kamailio/commit/b06626e811edae93c5f28dc132eca75… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-10T09:57:31+01:00 sctp: fixes for FreeBSD 10.1 compile error and 2 warnings - missing argument for macro SCTP_EV_REMOTE_ERROR() and two extraneous parentheses --- Modified: modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/b06626e811edae93c5f28dc132eca75… Patch: https://github.com/kamailio/kamailio/commit/b06626e811edae93c5f28dc132eca75… --- diff --git a/modules/sctp/sctp_server.c b/modules/sctp/sctp_server.c index 4f21b20..0bf6235 100644 --- a/modules/sctp/sctp_server.c +++ b/modules/sctp/sctp_server.c @@ -2397,7 +2397,7 @@ static int sctp_handle_notification(struct socket_info* si, case SCTP_SENDER_DRY_EVENT: ERR_LEN_TOO_SMALL(len, sizeof(struct sctp_sender_dry_event), si, su, "SCTP_SENDER_DRY_EVENT"); - SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su); + SCTP_EV_REMOTE_ERROR(&si->address, si->port_no, su, 0); SNOT("sctp notification from %s on %.*s:%d: " "SCTP_SENDER_DRY_EVENT on %d\n", su2a(su, sizeof(*su)), si->name.len, si->name.s, @@ -2659,7 +2659,7 @@ static int sctp_raw_send(int socket, char* buf, unsigned len, goto again; } #elif defined __OS_freebsd - if ((errno==ENOENT)){ + if (errno==ENOENT){ /* it didn't work, no retrying */ WARN("unexpected sendmsg() failure (ENOENT)," " assoc_id %d\n", sinfo->sinfo_assoc_id); @@ -2826,7 +2826,7 @@ static int sctp_msg_send_ext(struct dest_info* dst, char* buf, unsigned len, goto again; } #elif defined __OS_freebsd - if ((errno==ENOENT)){ + if (errno==ENOENT){ /* it didn't work, no retrying */ WARN("sctp sendmsg: unexpected sendmsg() failure (ENOENT)," " assoc_id %d\n", assoc_id);

9 years, 11 months

Planing to release Kamailio v4.2.3

by Daniel-Constantin Mierla

Hello, I am planning to release a new version from latest stable branch - 4.2. Most likely it will be Tuesday next week (Feb 10). If there is something important to take in consideration for this version, reply to sr-dev mailing list. Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

9 years, 11 months

possible bug involving location_attrs table

by Luis Azedo

Hi, i'm collecting some avps on the registration process and getting the location_attrs table filled as intended. however, i'm noticing that when a registration expires or UA de-registers (Expires = 0) the values in location table table are deleted (OK) but in location_attrs they are not deleted (NOT OK). when the UA registers back the it creates new records in location and location_attrs (OK). this is filling up the location_attrs table very quickly because of the records that are not deleted. Best

9 years, 11 months

git:master:44b20f67: Merge pull request #70 from jda/master

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 44b20f67e925ae2ba30f8bb16402dd2f5ec48b66 URL: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-02-09T22:51:30+01:00 Merge pull request #70 from jda/master fix compile errors in srutils/sha256 on SunOS (SmartOS) --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… Patch: https://github.com/kamailio/kamailio/commit/44b20f67e925ae2ba30f8bb16402dd2… --- diff --git a/lib/srutils/sha256.c b/lib/srutils/sha256.c index 087736d..5e87beb 100644 --- a/lib/srutils/sha256.c +++ b/lib/srutils/sha256.c @@ -36,6 +36,12 @@ #include <assert.h> /* assert() */ #include "sha256.h" +/* discover byte order on solaris */ +#if defined(__SVR4) || defined(__sun) + #include <sys/isa_defs.h> + #define BYTE_ORDER _BYTE_ORDER +#endif + /* * ASSERT NOTE: * Some sanity checking code is included using assert(). On my FreeBSD diff --git a/lib/srutils/sha256.h b/lib/srutils/sha256.h index 78393e5..4c134d2 100644 --- a/lib/srutils/sha256.h +++ b/lib/srutils/sha256.h @@ -53,6 +53,12 @@ extern "C" { #endif /* SHA2_USE_INTTYPES_H */ +/* fix types for Sun Solaris */ +#if defined(__SVR4) || defined(__sun) + typedef uint8_t u_int8_t; + typedef uint32_t u_int32_t; + typedef uint64_t u_int64_t; +#endif /*** SHA-256/384/512 Various Length Definitions ***********************/ #define SHA256_BLOCK_LENGTH 64

9 years, 11 months

git:master:fdb4c775: fix compile errors in srutils/sha256 on SunOS (SmartOS)

by Jon Auer

Module: kamailio Branch: master Commit: fdb4c7758f0d6d6ebed8cf9d01a412ed024efb8b URL: https://github.com/kamailio/kamailio/commit/fdb4c7758f0d6d6ebed8cf9d01a412e… Author: Jon Auer <jauer(a)corp.netwurx.net> Committer: Jon Auer <jauer(a)corp.netwurx.net> Date: 2015-02-05T23:34:59Z fix compile errors in srutils/sha256 on SunOS (SmartOS) --- Modified: lib/srutils/sha256.c Modified: lib/srutils/sha256.h --- Diff: https://github.com/kamailio/kamailio/commit/fdb4c7758f0d6d6ebed8cf9d01a412e… Patch: https://github.com/kamailio/kamailio/commit/fdb4c7758f0d6d6ebed8cf9d01a412e… --- diff --git a/lib/srutils/sha256.c b/lib/srutils/sha256.c index 087736d..5e87beb 100644 --- a/lib/srutils/sha256.c +++ b/lib/srutils/sha256.c @@ -36,6 +36,12 @@ #include <assert.h> /* assert() */ #include "sha256.h" +/* discover byte order on solaris */ +#if defined(__SVR4) || defined(__sun) + #include <sys/isa_defs.h> + #define BYTE_ORDER _BYTE_ORDER +#endif + /* * ASSERT NOTE: * Some sanity checking code is included using assert(). On my FreeBSD diff --git a/lib/srutils/sha256.h b/lib/srutils/sha256.h index 78393e5..4c134d2 100644 --- a/lib/srutils/sha256.h +++ b/lib/srutils/sha256.h @@ -53,6 +53,12 @@ extern "C" { #endif /* SHA2_USE_INTTYPES_H */ +/* fix types for Sun Solaris */ +#if defined(__SVR4) || defined(__sun) + typedef uint8_t u_int8_t; + typedef uint32_t u_int32_t; + typedef uint64_t u_int64_t; +#endif /*** SHA-256/384/512 Various Length Definitions ***********************/ #define SHA256_BLOCK_LENGTH 64

9 years, 11 months

[kamailio] fix compile errors in srutils/sha256 on SunOS (SmartOS) (#70)

by Jon Auer

This PR fixes missing types and endian defs in srutils/sha256 that prevent compilation on Solaris derivatives. Specifically, this fixes the following errors when compiling: ``` CC (gcc) [L libsrutils.so.1.0] sha256.o In file included from sha256.c:37:0: sha256.h:111:2: error: unknown type name 'u_int32_t' sha256.h:112:2: error: unknown type name 'u_int64_t' sha256.h:113:2: error: unknown type name 'u_int8_t' sha256.h:116:2: error: unknown type name 'u_int64_t' sha256.h:117:2: error: unknown type name 'u_int64_t' sha256.h:118:2: error: unknown type name 'u_int8_t' sha256.h:151:1: error: unknown type name 'u_int8_t' sha256.h:152:19: error: unknown type name 'u_int8_t' sha256.h:154:1: error: unknown type name 'u_int8_t' sha256.h:157:1: error: unknown type name 'u_int8_t' sha256.h:158:19: error: unknown type name 'u_int8_t' sha256.h:160:1: error: unknown type name 'u_int8_t' sha256.h:163:1: error: unknown type name 'u_int8_t' sha256.h:164:19: error: unknown type name 'u_int8_t' sha256.h:166:1: error: unknown type name 'u_int8_t' sha256.c:89:2: error: #error Define BYTE_ORDER to be equal to either LITTLE_ENDIAN or BIG_ENDIAN sha256.c:114:1: error: unknown type name 'u_int8_t' sha256.c:115:1: error: unknown type name 'u_int32_t' sha256.c:116:1: error: unknown type name 'u_int64_t' ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/70 -- Commit Summary -- * fix compile errors in srutils/sha256 on SunOS (SmartOS) -- File Changes -- M lib/srutils/sha256.c (6) M lib/srutils/sha256.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/70.patch https://github.com/kamailio/kamailio/pull/70.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/70

9 years, 11 months

git:master:a8783c03: Merge pull request #73 from kamailio/coudot/rtpengine_pv_sdp

by Camille Oudot

Module: kamailio Branch: master Commit: a8783c033c8e00f57e9d3a5b074d0bb820a34cd6 URL: https://github.com/kamailio/kamailio/commit/a8783c033c8e00f57e9d3a5b074d0bb… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-09T16:41:58+01:00 Merge pull request #73 from kamailio/coudot/rtpengine_pv_sdp New parameter to return SDP in a pv instead of message body --- Modified: modules/rtpengine/README Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/a8783c033c8e00f57e9d3a5b074d0bb… Patch: https://github.com/kamailio/kamailio/commit/a8783c033c8e00f57e9d3a5b074d0bb…

9 years, 11 months

git:master:e6252246: modules/rtpengine: return the new SDP in an AVP

by Camille Oudot

Module: kamailio Branch: master Commit: e6252246ea8056e06115d82a57372c8f241164a2 URL: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… Author: Camille Oudot <camille.oudot(a)orange.com> Committer: Camille Oudot <camille.oudot(a)orange.com> Date: 2015-02-09T13:51:27+01:00 modules/rtpengine: return the new SDP in an AVP if the new module param `write_sdp_pv` is set to a valid $avp() or $var() specifier, the SDP returned by rtpengine in the offer/answer operations is returned in the specified pv instead of the message body --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… Patch: https://github.com/kamailio/kamailio/commit/e6252246ea8056e06115d82a57372c8… --- diff --git a/modules/rtpengine/doc/rtpengine_admin.xml b/modules/rtpengine/doc/rtpengine_admin.xml index 4a1ea6f..7a01b0d 100644 --- a/modules/rtpengine/doc/rtpengine_admin.xml +++ b/modules/rtpengine/doc/rtpengine_admin.xml @@ -260,6 +260,26 @@ modparam("rtpengine", "force_send_interface", "10.3.7.123") </programlisting> </example> </section> + <section id="rtpengine.p.write_sdp_avp"> + <title><varname>write_sdp_avp</varname> (string)</title> + <para> + If this parameter is set to a valid AVP specifier, the + SDP returned by rtpengine in the offer/answer operations + is returned in the specified SDP instead of the + message body. + </para> + <para> + There is no default value. + </para> + <example> + <title>Set <varname>write_sdp_avp</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("rtpengine", "write_sdp_avp", "$avp(sdp)") +... +</programlisting> + </example> + </section> <section id="rtpengine.p.rtp_inst_pvar"> <title><varname>rtp_inst_pvar</varname> (string)</title> diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 5ff6f36..ff9223d 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -211,8 +211,13 @@ static int *rtpp_socks = 0; static int setid_avp_type; static int_str setid_avp; +static str write_sdp_pvar_str = {NULL, 0}; +static pv_spec_t* write_sdp_pvar = NULL; + + char* force_send_ip_str=""; + typedef struct rtpp_set_link { struct rtpp_set *rset; pv_spec_t *rpv; @@ -282,6 +287,7 @@ static param_export_t params[] = { {"setid_avp", PARAM_STRING, &setid_avp_param }, {"force_send_interface", PARAM_STRING, &force_send_ip_str }, {"rtp_inst_pvar", PARAM_STR, &rtp_inst_pv_param }, + {"write_sdp_pv", PARAM_STR, &write_sdp_pvar_str }, {0, 0, 0} }; @@ -853,6 +859,16 @@ mod_init(void) setid_avp_type = avp_flags; } + if (write_sdp_pvar_str.len > 0) { + write_sdp_pvar = pv_cache_get(&write_sdp_pvar_str); + if (write_sdp_pvar == NULL + || (write_sdp_pvar->type != PVT_AVP && write_sdp_pvar->type != PVT_SCRIPTVAR) ) { + LM_ERR("write_sdp_pv: not a valid AVP or VAR definition <%.*s>\n", + write_sdp_pvar_str.len, write_sdp_pvar_str.s); + return -1; + } + } + if (rtpp_strings) pkg_free(rtpp_strings); @@ -1962,6 +1978,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) bencode_item_t *dict; str body, newbody; struct lump *anchor; + pv_value_t pv_val; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -1978,14 +1995,28 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) if (more) body_intermediate = newbody; else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); - if (!anchor) { - LM_ERR("del_lump failed\n"); - goto error_free; - } - if (!insert_new_lump_after(anchor, newbody.s, newbody.len, 0)) { - LM_ERR("insert_new_lump_after failed\n"); - goto error_free; + if (write_sdp_pvar!= NULL) { + pv_val.rs = newbody; + pv_val.flags = PV_VAL_STR; + + if (write_sdp_pvar->setf(msg,&write_sdp_pvar->pvp, (int)EQ_T, &pv_val) < 0) + { + LM_ERR("error setting pvar <%.*s>\n", write_sdp_pvar_str.len, write_sdp_pvar_str.s); + goto error_free; + } + + pkg_free(newbody.s); + + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + if (!anchor) { + LM_ERR("del_lump failed\n"); + goto error_free; + } + if (!insert_new_lump_after(anchor, newbody.s, newbody.len, 0)) { + LM_ERR("insert_new_lump_after failed\n"); + goto error_free; + } } }

9 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
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 February 2015