sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

[kamailio/kamailio] memcached: fix deletion bug (#857)

by Armen Babikyan

current implementation sets a 0-byte value into memcached instead. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/857 -- Commit Summary -- * memcached: fix deletion bug -- File Changes -- M modules/memcached/mcd_var.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/857.patch https://github.com/kamailio/kamailio/pull/857.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/857

8 years

git:master:2b751e06: auth_db dbtext Making email address optional so kamctl can support dbtext

by Olle E. Johansson

Module: kamailio Branch: master Commit: 2b751e06682ddd7c0e14df1b3faa32812709ef28 URL: https://github.com/kamailio/kamailio/commit/2b751e06682ddd7c0e14df1b3faa328… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2016-11-13T12:15:08+01:00 auth_db dbtext Making email address optional so kamctl can support dbtext Reported by Alberto Sagredo --- Modified: utils/kamctl/dbtext/kamailio/subscriber --- Diff: https://github.com/kamailio/kamailio/commit/2b751e06682ddd7c0e14df1b3faa328… Patch: https://github.com/kamailio/kamailio/commit/2b751e06682ddd7c0e14df1b3faa328… --- diff --git a/utils/kamctl/dbtext/kamailio/subscriber b/utils/kamctl/dbtext/kamailio/subscriber index 9efcd01..b425ad0 100644 --- a/utils/kamctl/dbtext/kamailio/subscriber +++ b/utils/kamctl/dbtext/kamailio/subscriber @@ -1 +1 @@ -id(int,auto) username(string) domain(string) password(string) ha1(string) ha1b(string) email_address(string) rpid(string,null) +id(int,auto) username(string) domain(string) password(string) ha1(string) ha1b(string) email_address(string,null) rpid(string,null)

8 years

git:master:bf138f85: ss7ops: removed internal libs that are not needed from makefile

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: bf138f855bbb1b58e3970399e974b64efdd6ea39 URL: https://github.com/kamailio/kamailio/commit/bf138f855bbb1b58e3970399e974b64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T14:24:36+01:00 ss7ops: removed internal libs that are not needed from makefile --- Modified: modules/ss7ops/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bf138f855bbb1b58e3970399e974b64… Patch: https://github.com/kamailio/kamailio/commit/bf138f855bbb1b58e3970399e974b64… --- diff --git a/modules/ss7ops/Makefile b/modules/ss7ops/Makefile index a788aee..c8412b1 100644 --- a/modules/ss7ops/Makefile +++ b/modules/ss7ops/Makefile @@ -12,8 +12,6 @@ LIBS= DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib -SER_LIBS+=$(SERLIBPATH)/kmi/kmi -SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 -SER_LIBS+=$(SERLIBPATH)/kcore/kcore SER_LIBS+=$(SERLIBPATH)/srutils/srutils + include ../../Makefile.modules

8 years

git:master:685ed2d9: Makefile.groups: added ss7ops module to group extra

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 685ed2d968a803068728e9ecf4bf594174e019a2 URL: https://github.com/kamailio/kamailio/commit/685ed2d968a803068728e9ecf4bf594… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T12:03:59+01:00 Makefile.groups: added ss7ops module to group extra --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/685ed2d968a803068728e9ecf4bf594… Patch: https://github.com/kamailio/kamailio/commit/685ed2d968a803068728e9ecf4bf594… --- diff --git a/Makefile.groups b/Makefile.groups index e441f62..5bf2bf1 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -21,7 +21,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ mod_list_extra=avp auth_diameter call_control dmq domainpolicy msrp pdb \ qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpc-s nosip dmq_usrloc statsd rtjson \ - log_custom + log_custom ss7ops # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

8 years

git:master:730f0859: ss7ops: renamed the main file of the module to match recommended pattern

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 730f0859437741b7a66d7e6d381c78ce1a330a6e URL: https://github.com/kamailio/kamailio/commit/730f0859437741b7a66d7e6d381c78c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T12:02:11+01:00 ss7ops: renamed the main file of the module to match recommended pattern --- Added: modules/ss7ops/ss7ops_mod.c Removed: modules/ss7ops/ss7.c --- Diff: https://github.com/kamailio/kamailio/commit/730f0859437741b7a66d7e6d381c78c… Patch: https://github.com/kamailio/kamailio/commit/730f0859437741b7a66d7e6d381c78c…

8 years

git:master:5514b47e: ss7ops: fix compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5514b47eebd3fec3a26af8320fee7ca021f1a664 URL: https://github.com/kamailio/kamailio/commit/5514b47eebd3fec3a26af8320fee7ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T12:01:13+01:00 ss7ops: fix compile warnings --- Modified: modules/ss7ops/ss7.c --- Diff: https://github.com/kamailio/kamailio/commit/5514b47eebd3fec3a26af8320fee7ca… Patch: https://github.com/kamailio/kamailio/commit/5514b47eebd3fec3a26af8320fee7ca… --- diff --git a/modules/ss7ops/ss7.c b/modules/ss7ops/ss7.c index db647ed..26aaeb6 100644 --- a/modules/ss7ops/ss7.c +++ b/modules/ss7ops/ss7.c @@ -73,7 +73,8 @@ static cmd_export_t cmds[] = { }; static pv_export_t mod_pvs[] = { - { {"isup", sizeof("isup")-1}, PVT_OTHER, pv_get_isup, 0, pv_parse_isup_name, 0, 0, 0 }, + { {"isup", sizeof("isup")-1}, PVT_OTHER, pv_get_isup, + 0, pv_parse_isup_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; @@ -142,7 +143,7 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) memcpy(&data_len, &data[4], sizeof(data_len)); data_len = ntohl(data_len); if (*len < data_len) { - LM_ERR("M2UA data can't fit %zu vs. %zu\n", *len, data_len); + LM_ERR("M2UA data can't fit %zu vs. %zu\n", *len, (size_t)data_len); return NULL; } @@ -157,7 +158,7 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) ie_len = ntohs(ie_len); if (ie_len > data_len) { - LM_ERR("M2UA premature end %u vs. %zu\n", ie_len, data_len); + LM_ERR("M2UA premature end %u vs. %zu\n", ie_len, (size_t)data_len); return NULL; } @@ -174,7 +175,8 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) /* and now padding... */ padding = (4 - (ie_len % 4)) & 0x3; if (data_len < padding) { - LM_ERR("M2UA no place for padding %u vs. %u\n", padding, data_len); + LM_ERR("M2UA no place for padding %u vs. %zu\n", padding, + (size_t)data_len); return NULL; } data += padding; @@ -185,7 +187,8 @@ static const uint8_t *extract_from_m2ua(const uint8_t *data, size_t *len) return NULL; } -static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, int *opc, int *dpc, int *type) +static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, + int *opc, int *dpc, int *type) { struct mtp_level_3_hdr *hdr; @@ -195,7 +198,8 @@ static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, int *op if (!data) return NULL; if (*len < sizeof(*hdr)) { - LM_ERR("MTP not enough space for mtp hdr %zu vs. %zu", *len, sizeof(*hdr)); + LM_ERR("MTP not enough space for mtp hdr %zu vs. %zu", *len, + sizeof(*hdr)); return NULL; } @@ -208,11 +212,13 @@ static const uint8_t *extract_from_mtp(const uint8_t *data, size_t *len, int *op } -static const uint8_t *ss7_extract_payload(const uint8_t *data, size_t *len, int proto, int *opc, int *dpc, int *mtp_type) +static const uint8_t *ss7_extract_payload(const uint8_t *data, size_t *len, + int proto, int *opc, int *dpc, int *mtp_type) { switch (proto) { case HEP_M2UA: - return extract_from_mtp(extract_from_m2ua(data, len), len, opc, dpc, mtp_type); + return extract_from_mtp(extract_from_m2ua(data, len), len, opc, + dpc, mtp_type); break; default: LM_ERR("Unknown HEP type %d/0x%c\n", proto, proto);

8 years

git:master:e0d26f78: ss7ops: index 52 was initialized two times - expected to be 53 by the order

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e0d26f780ed551bd993ca36ac125e87a16db7709 URL: https://github.com/kamailio/kamailio/commit/e0d26f780ed551bd993ca36ac125e87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T11:57:32+01:00 ss7ops: index 52 was initialized two times - expected to be 53 by the order --- Modified: modules/ss7ops/isup_generated.c --- Diff: https://github.com/kamailio/kamailio/commit/e0d26f780ed551bd993ca36ac125e87… Patch: https://github.com/kamailio/kamailio/commit/e0d26f780ed551bd993ca36ac125e87… --- diff --git a/modules/ss7ops/isup_generated.c b/modules/ss7ops/isup_generated.c index 59d946f..164f3c5 100644 --- a/modules/ss7ops/isup_generated.c +++ b/modules/ss7ops/isup_generated.c @@ -432,7 +432,7 @@ const struct isup_msg isup_msgs[256] = { .name = "UPT", .has_optional = 1, }, - [52] = { + [53] = { .name = "UPA", .has_optional = 1, }, @@ -464,4 +464,4 @@ const struct isup_msg isup_msgs[256] = { .name = "SAN", .has_optional = 1, }, -}; \ No newline at end of file +};

8 years

git:master:70262d30: core: fix compilation on platforms without struct ip_mreqn

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 70262d3063376be34b784d0f6ffec4083779640c URL: https://github.com/kamailio/kamailio/commit/70262d3063376be34b784d0f6ffec40… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T11:54:58+01:00 core: fix compilation on platforms without struct ip_mreqn - collateral by new mcast feature (commit 8b39cb6a3aa37d26da1ccf8f55f25aaba8fc4613) --- Modified: udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/70262d3063376be34b784d0f6ffec40… Patch: https://github.com/kamailio/kamailio/commit/70262d3063376be34b784d0f6ffec40… --- diff --git a/udp_server.c b/udp_server.c index b809b60..60cb3c0 100644 --- a/udp_server.c +++ b/udp_server.c @@ -215,18 +215,26 @@ int probe_max_receive_buffer( int udp_sock ) */ static int setup_mcast_rcvr(int sock, union sockaddr_union* addr, char* interface) { +#ifdef HAVE_IP_MREQN struct ip_mreqn mreq; +#else + struct ip_mreq mreq; +#endif struct ipv6_mreq mreq6; if (addr->s.sa_family==AF_INET){ memcpy(&mreq.imr_multiaddr, &addr->sin.sin_addr, sizeof(struct in_addr)); +#ifdef HAVE_IP_MREQN if (interface!=0) { mreq.imr_ifindex = if_nametoindex(interface); } else { mreq.imr_ifindex = 0; } mreq.imr_address.s_addr = htonl(INADDR_ANY); +#else + mreq.imr_interface.s_addr = htonl(INADDR_ANY); +#endif if (setsockopt(sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,&mreq, sizeof(mreq))==-1){

8 years

git:master:d3cf503b: Makefile.defs: define HAVE_IP_MREQN on platforms with struct ip_mreqn

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d3cf503b3055c3e741b3f2e67359c20d6be210f1 URL: https://github.com/kamailio/kamailio/commit/d3cf503b3055c3e741b3f2e67359c20… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-12T11:54:58+01:00 Makefile.defs: define HAVE_IP_MREQN on platforms with struct ip_mreqn --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d3cf503b3055c3e741b3f2e67359c20… Patch: https://github.com/kamailio/kamailio/commit/d3cf503b3055c3e741b3f2e67359c20… --- diff --git a/Makefile.defs b/Makefile.defs index 70f5d40..0193230 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1722,7 +1722,7 @@ ifeq ($(OS), linux) use_futex= yes C_DEFS+=-DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ - -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER + -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif @@ -1856,7 +1856,7 @@ ifeq ($(OS), freebsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN \ -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DHAVE_NETINET_IN_SYSTM + -DHAVE_NETINET_IN_SYSTM -DHAVE_IP_MREQN ifneq ($(RAW_SOCKS), yes) C_DEFS+= -DUSE_RAW_SOCKS endif @@ -1955,7 +1955,7 @@ ifeq ($(OS), darwin) -DHAVE_SCHED_YIELD -DHAVE_MSGHDR_MSG_CONTROL \ -DUSE_ANON_MMAP \ -DNDEBUG -DHAVE_CONNECT_ECONNRESET_BUG -DHAVE_TIMEGM \ - -DUSE_SIGWAIT + -DUSE_SIGWAIT -DHAVE_IP_MREQN # -DNDEBUG used to turn off assert (assert wants to call # eprintf which doesn't seem to be defined in any shared lib ifneq ($(found_lock_method), yes)

8 years

[kamailio/kamailio] Introduce HAVE_IP_MREQN due to OpenBSD compile failing after mcast improvement (#856)

by Mikko Lehto

``` CC (gcc) [kamailio] udp_server.o udp_server.c: In function 'setup_mcast_rcvr': udp_server.c:218: error: storage size of 'mreq' isn't known udp_server.c:218: warning: unused variable 'mreq' gmake: *** [Makefile.rules:97: udp_server.o] Error 1 ``` Compile-only tested with OpenBSD 6.0, FreeBSD 10, FreeBSD 11 and Ubuntu Linux 14.04 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/856 -- Commit Summary -- * Makefile.defs: define HAVE_IP_MREQN on platforms with struct ip_mreqn * core: fix compilation on platforms without struct ip_mreqn -- File Changes -- M Makefile.defs (6) M udp_server.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/856.patch https://github.com/kamailio/kamailio/pull/856.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/856

8 years

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016