sr-dev May 2020

sr-dev@lists.kamailio.org

24 participants
393 discussions

rtpproxy and NAT
by Pavithra M 05 May '20

05 May '20

Hi, kamailio version - 5.3.3 I have configured rtpproxy in pcscf . rtpproxy 17002 1 0 18:40 ? 00:00:00 /usr/bin/rtpproxy -s udp:10.40.10.3 7722 -u rtpproxy rtpproxy -p /var/run/rtpproxy/rtpproxy.pid -l 10.45.4.22 -d DBUG LOG_LOCAL0 I have configured rtpproxy in kamailio.cfg as well. modparam("rtpproxy", "rtpproxy_sock", "udp:10.40.10.3:7722") 10.40.10.3 - private IP 10.45.4.22 - public IP I have enabled NAT configuration also. When i make a call from zoiper client , rtp packets are going to some other public ip Could anyone please help me in this issue. Kindly help.

1 3

git:master:13622cf6: snmpstats: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 13622cf6e36e50c42ec882272b1c48107fa55677 URL: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:07:14+02:00 snmpstats: use file name specific include guard --- Modified: src/modules/snmpstats/snmp_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… Patch: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… --- diff --git a/src/modules/snmpstats/snmp_statistics.h b/src/modules/snmpstats/snmp_statistics.h index 3ab4c4a98d..8bca2afee4 100644 --- a/src/modules/snmpstats/snmp_statistics.h +++ b/src/modules/snmpstats/snmp_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _SNMP_KSTATISTICS_H_ +#define _SNMP_KSTATISTICS_H_ #include "../../core/counters.h" @@ -106,4 +106,4 @@ int get_socket_list_from_proto_and_family( */ int get_total_bytes_waiting(void); -#endif \ No newline at end of file +#endif

1 0

git:master:68b5b3ce: ratelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5 URL: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:56+02:00 ratelimit: use file name specific include guard --- Modified: src/modules/ratelimit/rl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… Patch: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… --- diff --git a/src/modules/ratelimit/rl_statistics.h b/src/modules/ratelimit/rl_statistics.h index dab7a4f375..de86d01f61 100644 --- a/src/modules/ratelimit/rl_statistics.h +++ b/src/modules/ratelimit/rl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _RL_KSTATISTICS_H_ +#define _RL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:master:e4356d56: pipelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: e4356d56d57599ff063e6849cab8cab5267d26e0 URL: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:31+02:00 pipelimit: use file name specific include guard --- Modified: src/modules/pipelimit/pl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… Patch: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… --- diff --git a/src/modules/pipelimit/pl_statistics.h b/src/modules/pipelimit/pl_statistics.h index dab7a4f375..69db473e22 100644 --- a/src/modules/pipelimit/pl_statistics.h +++ b/src/modules/pipelimit/pl_statistics.h @@ -27,8 +27,8 @@ */ -#ifndef _KSTATISTICS_H_ -#define _KSTATISTICS_H_ +#ifndef _PL_KSTATISTICS_H_ +#define _PL_KSTATISTICS_H_ #include "../../core/counters.h"

1 0

git:master:c67a0eab: rr: different function parameter name to be different than global variable
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: c67a0eabea5fd11693bb716782cd581094250f7f URL: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:05:07+02:00 rr: different function parameter name to be different than global variable --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… Patch: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… --- diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 236373a288..71f5fcc18e 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -303,16 +303,16 @@ static int ki_loose_route_preloaded(sip_msg_t *msg) } /** - * common wrapper for record_route(msg, params) + * common wrapper for record_route(msg, sparams) */ -static int ki_record_route_params(sip_msg_t *msg, str *params) +static int ki_record_route_params(sip_msg_t *msg, str *sparams) { if (msg->msg_flags & FL_RR_ADDED) { LM_ERR("Double attempt to record-route\n"); return -1; } - if ( record_route( msg, params )<0 ) + if ( record_route( msg, sparams )<0 ) return -1; if(get_route_type()!=BRANCH_ROUTE)

1 0

git:master:9a2fea75: app_sqlang: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef URL: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T07:59:32+02:00 app_sqlang: use file name specific include guard --- Modified: src/modules/app_sqlang/app_sqlang_api.h --- Diff: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… Patch: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.h b/src/modules/app_sqlang/app_sqlang_api.h index 31c824a99d..eae6de31cf 100644 --- a/src/modules/app_sqlang/app_sqlang_api.h +++ b/src/modules/app_sqlang/app_sqlang_api.h @@ -20,8 +20,8 @@ * */ -#ifndef _APP_JSDT_API_H_ -#define _APP_JSDT_API_H_ +#ifndef _APP_SQLANG_API_H_ +#define _APP_SQLANG_API_H_ #include <squirrel.h>

1 0

git:master:de77beff: rtpmanage: enable hadling of PRACK requests
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: de77beffb436e783031a6aa71c1887848cb2cc73 URL: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T20:05:26+02:00 rtpmanage: enable hadling of PRACK requests - they can have SDP - use more compact bitwise match for method types --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… Patch: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index d56e88e003..2d28895324 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3634,11 +3634,11 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) method = get_cseq(msg)->method_id; - if (!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL - || method==METHOD_BYE || method==METHOD_UPDATE)) + if (!(method & (METHOD_INVITE|METHOD_ACK|METHOD_CANCEL|METHOD_BYE + |METHOD_UPDATE|METHOD_PRACK))) return -1; - if (method==METHOD_CANCEL || method==METHOD_BYE) + if (method & (METHOD_CANCEL|METHOD_BYE)) return rtpengine_delete(msg, flags); if (msg->msg_flags & FL_SDP_BODY) @@ -3647,7 +3647,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) nosdp = parse_sdp(msg); if (msg->first_line.type == SIP_REQUEST) { - if(method==METHOD_ACK && nosdp==0) + if((method & (METHOD_ACK|METHOD_PRACK)) && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_ANSWER, 0); if(method==METHOD_UPDATE && nosdp==0) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); @@ -3715,7 +3715,8 @@ rtpengine_answer1_f(struct sip_msg *msg, char *str1, char *str2) { if (msg->first_line.type == SIP_REQUEST) - if (msg->first_line.u.request.method_value != METHOD_ACK) + if (!(msg->first_line.u.request.method_value + & (METHOD_ACK | METHOD_PRACK))) return -1; return rtpengine_rtpp_set_wrap_fparam(msg, rtpengine_answer_wrap, str1, 2, OP_ANSWER);

1 0

git:master:f4f66ad9: usrloc: use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f URL: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:38:07+02:00 usrloc: use file name specific include guard --- Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… Patch: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… --- diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 6c3f6e078f..8c24e1230b 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -26,8 +26,8 @@ * \ingroup usrloc */ -#ifndef UL_MOD_H -#define UL_MOD_H +#ifndef _USRLOC_MOD_H_ +#define _USRLOC_MOD_H_ #include "../../lib/srdb1/db.h" @@ -129,4 +129,4 @@ extern int ul_expires_type; #define UL_DB_EXPIRES_GET(r) ((ul_expires_type==1)?(time_t)VAL_BIGINT(r):VAL_TIME(r)) -#endif /* UL_MOD_H */ +#endif /* _USRLOC_MOD_H_ */

1 0

git:master:b3c981db: uid_domain: use module specific include guards
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b3c981db67845622fb8c85a20e18e1b98c29eb69 URL: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:01:21+02:00 uid_domain: use module specific include guards --- Modified: src/modules/uid_domain/domain.h Modified: src/modules/uid_domain/domain_api.h Modified: src/modules/uid_domain/domain_rpc.h Modified: src/modules/uid_domain/hash.h Modified: src/modules/uid_domain/uid_domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Patch: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… --- diff --git a/src/modules/uid_domain/domain.h b/src/modules/uid_domain/domain.h index 44ad7ee4db..c52417a601 100644 --- a/src/modules/uid_domain/domain.h +++ b/src/modules/uid_domain/domain.h @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_H -#define _DOMAIN_H +#ifndef _UID_DOMAIN_H_ +#define _UID_DOMAIN_H_ #include <time.h> #include <stdio.h> diff --git a/src/modules/uid_domain/domain_api.h b/src/modules/uid_domain/domain_api.h index acc957971f..4a64a469cb 100644 --- a/src/modules/uid_domain/domain_api.h +++ b/src/modules/uid_domain/domain_api.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_API_H -#define _DOMAIN_API_H +#ifndef _UID_DOMAIN_API_H_ +#define _UID_DOMAIN_API_H_ #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/uid_domain/domain_rpc.h b/src/modules/uid_domain/domain_rpc.h index 27641b6d47..996e7f01aa 100644 --- a/src/modules/uid_domain/domain_rpc.h +++ b/src/modules/uid_domain/domain_rpc.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_RPC_H -#define _DOMAIN_RPC_H +#ifndef _UID_DOMAIN_RPC_H_ +#define _UID_DOMAIN_RPC_H_ #include "../../core/rpc.h" diff --git a/src/modules/uid_domain/hash.h b/src/modules/uid_domain/hash.h index e72616f775..1c07a83321 100644 --- a/src/modules/uid_domain/hash.h +++ b/src/modules/uid_domain/hash.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _HASH_H -#define _HASH_H +#ifndef _UID_DOMAIN_HASH_H_ +#define _UID_DOMAIN_HASH_H_ #include <stdio.h> #include "uid_domain_mod.h" diff --git a/src/modules/uid_domain/uid_domain_mod.h b/src/modules/uid_domain/uid_domain_mod.h index 4f15b6d0ef..75c21c2175 100644 --- a/src/modules/uid_domain/uid_domain_mod.h +++ b/src/modules/uid_domain/uid_domain_mod.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UID_DOMAIN_MOD_H -#define _UID_DOMAIN_MOD_H +#ifndef _UID_DOMAIN_MOD_H_ +#define _UID_DOMAIN_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h"

1 0

git:master:9691f6e0: core: hash_func.h - use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 9691f6e0cab48114ef4067a22cc8f9c1efb8944c URL: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T18:35:00+02:00 core: hash_func.h - use file name specific include guard --- Modified: src/core/hash_func.h --- Diff: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… Patch: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… --- diff --git a/src/core/hash_func.h b/src/core/hash_func.h index 203e10b1c8..aeb9794bf2 100644 --- a/src/core/hash_func.h +++ b/src/core/hash_func.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ /*! @@ -26,14 +26,14 @@ -#ifndef _HASH_H -#define _HASH_H +#ifndef _HASH_FUNC_H_ +#define _HASH_FUNC_H_ #include "str.h" #include "hashes.h" /* always use a power of 2 for hash table size */ -#define T_TABLE_POWER 16 +#define T_TABLE_POWER 16 #define TABLE_ENTRIES (1 << (T_TABLE_POWER)) unsigned int new_hash( str call_id, str cseq_nr );

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
40
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 2020