sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:071556e9: log_custom: use buffer size for printing functions
by Daniel-Constantin Mierla 22 Jun '16

22 Jun '16

Module: kamailio Branch: master Commit: 071556e9b75557dad756951f2fad71504469ca32 URL: https://github.com/kamailio/kamailio/commit/071556e9b75557dad756951f2fad715… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-22T18:34:40+02:00 log_custom: use buffer size for printing functions --- Modified: modules/log_custom/log_custom_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/071556e9b75557dad756951f2fad715… Patch: https://github.com/kamailio/kamailio/commit/071556e9b75557dad756951f2fad715… --- diff --git a/modules/log_custom/log_custom_mod.c b/modules/log_custom/log_custom_mod.c index b66ec10..bc68b56 100644 --- a/modules/log_custom/log_custom_mod.c +++ b/modules/log_custom/log_custom_mod.c @@ -189,8 +189,8 @@ void _lc_core_log_udp(int lpriority, const char *format, ...) va_start(arglist, format); n = 0; - n += snprintf(obuf+n, 1024-n, "(%d) ", my_pid()); - n += vsnprintf(obuf+n, 1024-n, format, arglist); + n += snprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, "(%d) ", my_pid()); + n += vsnprintf(obuf + n, LC_LOG_MSG_MAX_SIZE - n, format, arglist); va_end(arglist); udp_send(&_lc_udp_dst, obuf, n); }

1 0

How to remove presentity users entry in kamailio server?
by João Resende 22 Jun '16

22 Jun '16

I found that in: kamctl db show presentity Is the presence information of the users, but how can I errase such entry? of a user? And how can I define only one entry in that database by user? I use this code, when I receive a publish but this adds a new entry every time. if(is_method("PUBLISH")) { if($hdr(Sender)!= NULL) handle_publish("$hdr(Sender)"); else handle_publish(); t_release(); }

1 0

git:master:b9d20066: sdpops: exported some of the config functions to kemi
by Daniel-Constantin Mierla 21 Jun '16

21 Jun '16

Module: kamailio Branch: master Commit: b9d20066af146d5db93b3a4ff08e9a71e11d8576 URL: https://github.com/kamailio/kamailio/commit/b9d20066af146d5db93b3a4ff08e9a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-21T09:17:10+02:00 sdpops: exported some of the config functions to kemi --- Modified: modules/sdpops/sdpops_data.c Modified: modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b9d20066af146d5db93b3a4ff08e9a7… Patch: https://github.com/kamailio/kamailio/commit/b9d20066af146d5db93b3a4ff08e9a7… --- diff --git a/modules/sdpops/sdpops_data.c b/modules/sdpops/sdpops_data.c index 040cfb1..6b176bf 100644 --- a/modules/sdpops/sdpops_data.c +++ b/modules/sdpops/sdpops_data.c @@ -195,11 +195,11 @@ int sdpops_sdp_get_ids_by_name(sdp_info_t *sdp, str *cname, str *cids, int n) */ int sdpops_build_ids_list(sdp_info_t *sdp, str *names, str *ids) { -#define SDPOPS_MAX_LIST_SIZE 64 +#define SDPOPS_MAX_LIST_SIZE 128 static char _local_idslist[SDPOPS_MAX_LIST_SIZE]; str tmp; str codec; -#define SDPOPS_CIDS_SIZE 8 +#define SDPOPS_CIDS_SIZE 16 str cids[SDPOPS_CIDS_SIZE]; char *p; int i; diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 6b800cd..80fb17a 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -34,6 +34,7 @@ #include "../../trim.h" #include "../../data_lump.h" #include "../../ut.h" +#include "../../kemi.h" #include "../../parser/parse_content.h" #include "api.h" @@ -621,7 +622,7 @@ int sdp_keep_codecs_by_id(sip_msg_t* msg, str* codecs, str *media) LM_DBG("stream %d of %d - payloads [%.*s]\n", sdp_stream_num, sdp_session_num, sdp_stream->payloads.len, sdp_stream->payloads.s); - if((media==NULL) + if((media==NULL) || (media->len==0) || (media->len==sdp_stream->media.len && strncasecmp(sdp_stream->media.s, media->s, media->len)==0)) @@ -1798,3 +1799,45 @@ static int pv_parse_sdp_name(pv_spec_p sp, str *in) LM_ERR("unknown PV sdp name %.*s\n", in->len, in->s); return -1; } + +/** + * + */ +static sr_kemi_t sr_kemi_sdpops_exports[] = { + { str_init("sdpops"), str_init("remove_codecs_by_name"), + SR_KEMIP_INT, sdp_remove_codecs_by_name, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("remove_codecs_by_id"), + SR_KEMIP_INT, sdp_remove_codecs_by_id, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("keep_codecs_by_name"), + SR_KEMIP_INT, sdp_keep_codecs_by_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("keep_codecs_by_id"), + SR_KEMIP_INT, sdp_keep_codecs_by_id, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sdpops"), str_init("remove_media"), + SR_KEMIP_INT, sdp_remove_media, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_sdpops_exports); + return 0; +}

1 0

git:master:82ee81aa: async: exported functions to kemi
by Daniel-Constantin Mierla 21 Jun '16

21 Jun '16

Module: kamailio Branch: master Commit: 82ee81aa695242eff9ad3558edc5163a89dea6f1 URL: https://github.com/kamailio/kamailio/commit/82ee81aa695242eff9ad3558edc5163… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-21T06:11:16+02:00 async: exported functions to kemi - async.route(rname, secs) - async.task_route(rname) --- Modified: modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/82ee81aa695242eff9ad3558edc5163… Patch: https://github.com/kamailio/kamailio/commit/82ee81aa695242eff9ad3558edc5163…

1 0

git:master:e36eebf3: tm: detect blind uac branch to avoid generating cancel for it
by Daniel-Constantin Mierla 20 Jun '16

20 Jun '16

Module: kamailio Branch: master Commit: e36eebf36b72819b1b23c39469d60206f5df2bcf URL: https://github.com/kamailio/kamailio/commit/e36eebf36b72819b1b23c39469d6020… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-20T22:39:08+02:00 tm: detect blind uac branch to avoid generating cancel for it --- Modified: modules/tm/h_table.h Modified: modules/tm/t_cancel.h Modified: modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/e36eebf36b72819b1b23c39469d6020… Patch: https://github.com/kamailio/kamailio/commit/e36eebf36b72819b1b23c39469d6020…

1 0

git:master:4e759906: tm: cleaned always enabled TM_UAC_FLAGS define
by Daniel-Constantin Mierla 20 Jun '16

20 Jun '16

Module: kamailio Branch: master Commit: 4e7599064a75b8e6d0e6fbf228690cd628bfd508 URL: https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-20T19:16:26+02:00 tm: cleaned always enabled TM_UAC_FLAGS define --- Modified: modules/tm/h_table.h Modified: modules/tm/t_fwd.c --- Diff: https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd… Patch: https://github.com/kamailio/kamailio/commit/4e7599064a75b8e6d0e6fbf228690cd… --- diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 0cbe24c..3cef444 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -182,13 +182,10 @@ typedef struct ua_server /* User Agent Client content */ -#define TM_UAC_FLAGS -#ifdef TM_UAC_FLAGS /* UAC internal flags */ #define TM_UAC_FLAG_RR 1 /* Record-Route applied */ #define TM_UAC_FLAG_R2 2 /* 2nd Record-Route applied */ #define TM_UAC_FLAG_FB 4 /* Mark first entry in new branch set */ -#endif typedef struct ua_client { @@ -216,10 +213,8 @@ typedef struct ua_client /* if we don't store, we at least want to know the status */ int last_received; -#ifdef TM_UAC_FLAGS /* internal flags per tm uac */ unsigned int flags; -#endif /* per branch flags */ flag_t branch_flags; /* internal processing code - (mapping over sip warning codes) diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index ba0b6d6..7f6faa0 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -550,13 +550,11 @@ static int prepare_new_uac( struct cell *t, struct sip_msg *i_req, memcpy( t->uac[branch].location_ua.s, i_req->location_ua.s, i_req->location_ua.len); } -#ifdef TM_UAC_FLAGS len = count_applied_lumps(i_req->add_rm, HDR_RECORDROUTE_T); if(len==1) t->uac[branch].flags = TM_UAC_FLAG_RR; else if(len==2) t->uac[branch].flags = TM_UAC_FLAG_RR|TM_UAC_FLAG_R2; -#endif ret=0; @@ -1728,10 +1726,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , return lowest_ret; } -#ifdef TM_UAC_FLAGS /* mark the fist branch in this fwd step */ t->uac[first_branch].flags |= TM_UAC_FLAG_FB; -#endif ser_error=0; /* clear branch adding errors */ /* send them out now */

1 0

[kamailio/kamailio] app_lua: add functions for handling script flags (#666)
by jgallartm 20 Jun '16

20 Jun '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/666 -- Commit Summary -- * app_lua: add functions for handling script flags -- File Changes -- M modules/app_lua/app_lua_sr.c (88) -- Patch Links -- https://github.com/kamailio/kamailio/pull/666.patch https://github.com/kamailio/kamailio/pull/666.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/666

2 5

git:master:46334c18: core: exported script flags functions to kemi
by Daniel-Constantin Mierla 20 Jun '16

20 Jun '16

Module: kamailio Branch: master Commit: 46334c18bd35ec9e45603d029953f3a5bb555f96 URL: https://github.com/kamailio/kamailio/commit/46334c18bd35ec9e45603d029953f3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-20T18:59:37+02:00 core: exported script flags functions to kemi - alternative related to GH #666 --- Modified: kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/46334c18bd35ec9e45603d029953f3a… Patch: https://github.com/kamailio/kamailio/commit/46334c18bd35ec9e45603d029953f3a… --- diff --git a/kemi.c b/kemi.c index 5052885..cbbcbb8 100644 --- a/kemi.c +++ b/kemi.c @@ -301,6 +301,52 @@ static int sr_kemi_core_isbflagset(sip_msg_t *msg, int flag) /** * */ +static int sr_kemi_core_setsflag(sip_msg_t *msg, int flag) +{ + if (!flag_in_range(flag)) { + LM_ERR("invalid flag parameter %d\n", flag); + return SR_KEMI_FALSE; + } + + setsflag(flag); + return SR_KEMI_TRUE; +} + +/** + * + */ +static int sr_kemi_core_resetsflag(sip_msg_t *msg, int flag) +{ + if (!flag_in_range(flag)) { + LM_ERR("invalid flag parameter %d\n", flag); + return SR_KEMI_FALSE; + } + + resetsflag(flag); + return SR_KEMI_TRUE; +} + +/** + * + */ +static int sr_kemi_core_issflagset(sip_msg_t *msg, int flag) +{ + int ret; + + if (!flag_in_range(flag)) { + LM_ERR("invalid flag parameter %d\n", flag); + return SR_KEMI_FALSE; + } + + ret = issflagset(flag); + if(ret>0) + return SR_KEMI_TRUE; + return SR_KEMI_FALSE; +} + +/** + * + */ static int sr_kemi_core_seturi(sip_msg_t *msg, str *uri) { if(uri==NULL || uri->s==NULL) { @@ -526,6 +572,21 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("setsflag"), + SR_KEMIP_BOOL, sr_kemi_core_setsflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("resetsflag"), + SR_KEMIP_BOOL, sr_kemi_core_resetsflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("issflagset"), + SR_KEMIP_BOOL, sr_kemi_core_issflagset, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("seturi"), SR_KEMIP_BOOL, sr_kemi_core_seturi, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:385e8d44: kex: coherent indentation and white spacing
by Daniel-Constantin Mierla 20 Jun '16

20 Jun '16

Module: kamailio Branch: master Commit: 385e8d446735edb568a22789740ef0f3dbed1353 URL: https://github.com/kamailio/kamailio/commit/385e8d446735edb568a22789740ef0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-20T18:55:01+02:00 kex: coherent indentation and white spacing --- Modified: modules/kex/core_stats.c Modified: modules/kex/core_stats.h Modified: modules/kex/flags.c Modified: modules/kex/flags.h Modified: modules/kex/kex_mod.c Modified: modules/kex/km_core.c Modified: modules/kex/km_core.h Modified: modules/kex/mi_core.c Modified: modules/kex/mi_core.h Modified: modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/385e8d446735edb568a22789740ef0f… Patch: https://github.com/kamailio/kamailio/commit/385e8d446735edb568a22789740ef0f…

1 0

[kamailio/kamailio] db_unixodbc: SQL_NO_DATA should not be considered as an error (#675)
by Giovanni 20 Jun '16

20 Jun '16

SQL_NO_DATA (100) should not be considered as an error when deletes or updates are done. currently, any return code different than 0 or 1 is considered as an error: a log is generated and the session closed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/675 -- Commit Summary -- * Merge pull request #1 from kamailio/master * Merge branch 'master' of https://github.com/giovannimele/kamailio * db_unixodbc: do not consider SQL_NO_DATA return code as an error -- File Changes -- M modules/db_unixodbc/dbase.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/675.patch https://github.com/kamailio/kamailio/pull/675.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/675

3 3

← Newer
1
...
13
14
15
16
17
18
19
...
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 June 2016