sr-dev December 2016

sr-dev@lists.kamailio.org

25 participants
332 discussions

git:master:8b57b889: async: formatted code with clang-formant

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b57b889bb521e405ec70e7a9cabf564d361b4b5 URL: https://github.com/kamailio/kamailio/commit/8b57b889bb521e405ec70e7a9cabf56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T10:45:48+01:00 async: formatted code with clang-formant --- Modified: src/modules/async/async_mod.c Modified: src/modules/async/async_sleep.c Modified: src/modules/async/async_sleep.h --- Diff: https://github.com/kamailio/kamailio/commit/8b57b889bb521e405ec70e7a9cabf56… Patch: https://github.com/kamailio/kamailio/commit/8b57b889bb521e405ec70e7a9cabf56…

7 years, 11 months

git:master:8990a162: root: added .clang-format file

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8990a162449b256a2e7719c3688daad55548ba0e URL: https://github.com/kamailio/kamailio/commit/8990a162449b256a2e7719c3688daad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-16T10:41:52+01:00 root: added .clang-format file - useful if one want to format the code using clang-format tool from LLVM --- Added: .clang-format --- Diff: https://github.com/kamailio/kamailio/commit/8990a162449b256a2e7719c3688daad… Patch: https://github.com/kamailio/kamailio/commit/8990a162449b256a2e7719c3688daad… --- diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..b44f1c4 --- /dev/null +++ b/.clang-format @@ -0,0 +1,95 @@ +--- +Language: Cpp +# BasedOnStyle: LLVM +AccessModifierOffset: -4 +AlignAfterOpenBracket: DontAlign +AlignConsecutiveAssignments: false +AlignConsecutiveDeclarations: false +AlignEscapedNewlinesLeft: true +AlignOperands: true +AlignTrailingComments: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortBlocksOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: None +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: false +BinPackArguments: true +BinPackParameters: true +BraceWrapping: + AfterClass: false + AfterControlStatement: false + AfterEnum: false + AfterFunction: true + AfterNamespace: false + AfterObjCDeclaration: false + AfterStruct: false + AfterUnion: false + BeforeCatch: false + BeforeElse: false + IndentBraces: false +BreakBeforeBinaryOperators: NonAssignment +BreakBeforeBraces: Mozilla +BreakBeforeTernaryOperators: true +BreakConstructorInitializersBeforeComma: false +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: true +ColumnLimit: 80 +CommentPragmas: '^ IWYU pragma:' +ConstructorInitializerAllOnOneLineOrOnePerLine: false +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 8 +Cpp11BracedListStyle: true +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] +IncludeCategories: + - Regex: '^"(llvm|llvm-c|clang|clang-c)/' + Priority: 2 + - Regex: '^(<|"(gtest|isl|json)/)' + Priority: 3 + - Regex: '.*' + Priority: 1 +IncludeIsMainRegex: '$' +IndentCaseLabels: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 2 +NamespaceIndentation: None +ObjCBlockIndentWidth: 4 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 60 +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +SpaceAfterCStyleCast: false +SpaceBeforeAssignmentOperators: true +SpaceBeforeParens: Never +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: true +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Cpp11 +TabWidth: 4 +UseTab: Always +... +

7 years, 11 months

kamcli - transferring the github repository to kamailio organization

by Daniel-Constantin Mierla

Hello, kamcli (kamailio command line interface tool written in python) got a consistent set of features trying to become in pair with kamctl. It is currently hosted by asipto organization on github, but I am considering to transfer (move) it to kamailio organization in order to manage easier the access for kamailio devs as well as increase its exposure to community. It interacts with kamailio using rpc commands via jsonrpcs module. You can read more about what it can do at: - https://github.com/asipto/kamcli The commands are implemented in a plugin-like fashion -- see the ones done so far: - https://github.com/asipto/kamcli/tree/master/kamcli/commands Given that it can handle better the jsonrpc responses, provides more options to format the output and the help is embedded in each command, I think it is a good candidate to replace the old shell(bash)-based kamctl. Probably we can adjust kamctl for rpc when mi code will be removed, but the options to build and extend in long term a good cli for kamailio are quite limited in shell. For the sake of an example, here is the implementation of 'ps' command, handling the json rpc to display a very compact list of kamailio processes: - https://github.com/asipto/kamcli/blob/master/kamcli/commands/cmd_ps.py Dealing with database records is also rather trivial: - https://github.com/asipto/kamcli/blob/master/kamcli/commands/cmd_group.py Anyone with comments/suggestions/alternatives? Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

7 years, 11 months

git:master:db79d3e2: modules: readme files regenerated - dialog ...

by Kamailio Dev

Module: kamailio Branch: master Commit: db79d3e2fdcad193ed3cae2b4706e6a4104fc23d URL: https://github.com/kamailio/kamailio/commit/db79d3e2fdcad193ed3cae2b4706e6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-12-15T16:31:15+01:00 modules: readme files regenerated - dialog ... --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/db79d3e2fdcad193ed3cae2b4706e6a… Patch: https://github.com/kamailio/kamailio/commit/db79d3e2fdcad193ed3cae2b4706e6a… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 2792aff..7530fc5 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -1864,7 +1864,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); 10.3. dlg.dlg_list Lists the description of one dialog. The dialog identifiers are to be - passed as parameter (callid and fromtag). + passed as parameter (callid and optionally fromtag). Name: dlg.dlg_list @@ -1875,6 +1875,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); RPC Command Format: kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 + serctl dlg.list abcdrssfrs122444(a)192.168.1.1 10.4. dlg.dlg_list_ctx @@ -1888,6 +1889,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); RPC Command Format: kamcmd dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 + serctl dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 10.5. dlg.terminate_dlg

7 years, 11 months

git:master:0a2f5e76: dialog: [RPC] from-tag optional on dlg.dlg_list[_ctx]

by Victor Seva

Module: kamailio Branch: master Commit: 0a2f5e768813e448730ae8767ecb48cc4aadd074 URL: https://github.com/kamailio/kamailio/commit/0a2f5e768813e448730ae8767ecb48c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-15T16:17:59+01:00 dialog: [RPC] from-tag optional on dlg.dlg_list[_ctx] --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0a2f5e768813e448730ae8767ecb48c… Patch: https://github.com/kamailio/kamailio/commit/0a2f5e768813e448730ae8767ecb48c… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index eecee86..eb5bfa5 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1604,18 +1604,24 @@ static void internal_rpc_print_dlgs(rpc_t *rpc, void *c, int with_context) * \param with_context if 1 then the dialog context will be also printed */ static void internal_rpc_print_single_dlg(rpc_t *rpc, void *c, int with_context) { - str callid, from_tag; + str callid, ft; + str *from_tag = NULL; dlg_entry_t *d_entry; dlg_cell_t *dlg; unsigned int h_entry; - if (rpc->scan(c, ".S.S", &callid, &from_tag) < 2) return; + if (rpc->scan(c, ".S", &callid) < 1) return; h_entry = core_hash( &callid, 0, d_table->size); d_entry = &(d_table->entries[h_entry]); + + if (rpc->scan(c, "*.S", &ft) == 1) { + from_tag = &ft; + } + dlg_lock( d_table, d_entry); for( dlg = d_entry->first ; dlg ; dlg = dlg->next ) { - if (match_downstream_dialog( dlg, &callid, &from_tag)==1) { + if (match_downstream_dialog( dlg, &callid, from_tag)==1) { internal_rpc_print_dlg(rpc, c, dlg, with_context); } } @@ -1706,10 +1712,10 @@ static const char *rpc_print_dlgs_ctx_doc[2] = { "Print all dialogs with associated context", 0 }; static const char *rpc_print_dlg_doc[2] = { - "Print dialog based on callid and fromtag", 0 + "Print dialog based on callid and optionally fromtag", 0 }; static const char *rpc_print_dlg_ctx_doc[2] = { - "Print dialog with associated context based on callid and fromtag", 0 + "Print dialog with associated context based on callid and optionally fromtag", 0 }; static const char *rpc_end_dlg_entry_id_doc[2] = { "End a given dialog based on [h_entry] [h_id]", 0 diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 528ce93..9eabd44 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2394,7 +2394,7 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); <title><varname>dlg.dlg_list</varname></title> <para> Lists the description of one dialog. The dialog identifiers are to be passed - as parameter (callid and fromtag). + as parameter (callid and optionally fromtag). </para> <para>Name: <emphasis>dlg.dlg_list</emphasis></para> <para>Parameters:</para> @@ -2411,6 +2411,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); <programlisting format="linespecific"> kamcmd dlg.list abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 </programlisting> + <programlisting format="linespecific"> + serctl dlg.list abcdrssfrs122444(a)192.168.1.1 + </programlisting> </section> <section> <title><varname>dlg.dlg_list_ctx</varname></title> @@ -2426,6 +2429,9 @@ dlg_remote_profile("add", "caller", "test", "$sruid", "$var(exp)"); <programlisting format="linespecific"> kamcmd dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 AAdfeEFF33 </programlisting> + <programlisting format="linespecific"> + serctl dlg.list_ctx abcdrssfrs122444(a)192.168.1.1 + </programlisting> </section> <section> <title><varname>dlg.terminate_dlg</varname></title>

7 years, 11 months

[kamailio/kamailio] dialog: [RPC] from-tag optional on dlg.dlg_list[_ctx] (#889)

by Victor Seva

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/889 -- Commit Summary -- * dialog: [RPC] from-tag optional on dlg.dlg_list[_ctx] -- File Changes -- M src/modules/dialog/dialog.c (16) M src/modules/dialog/doc/dialog_admin.xml (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/889.patch https://github.com/kamailio/kamailio/pull/889.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/889

7 years, 11 months

git:master:880627e5: pkg/kamailio/deb: version set to 5.0.0-dev9

by Victor Seva

Module: kamailio Branch: master Commit: 880627e5afa47880b69d7d63168465ce5e783ee8 URL: https://github.com/kamailio/kamailio/commit/880627e5afa47880b69d7d63168465c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-15T13:04:05+01:00 pkg/kamailio/deb: version set to 5.0.0-dev9 --- Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/squeeze/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/880627e5afa47880b69d7d63168465c… Patch: https://github.com/kamailio/kamailio/commit/880627e5afa47880b69d7d63168465c… --- diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index dabbb4b..f150ede 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.0.0~dev9) unstable; urgency=medium + + * version set to 5.0.0-dev9 + + -- Victor Seva <vseva(a)debian.org> Thu, 15 Dec 2016 13:03:24 +0100 + kamailio (5.0.0~dev8) unstable; urgency=medium * version set to 5.0.0-dev8

7 years, 11 months

git:master:3b8c4218: Makefile.defs: version set to 5.0.0-dev9

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3b8c42180336567a1d9b55fefd05ffcde4ba1f4b URL: https://github.com/kamailio/kamailio/commit/3b8c42180336567a1d9b55fefd05ffc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-12-15T09:55:39+01:00 Makefile.defs: version set to 5.0.0-dev9 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3b8c42180336567a1d9b55fefd05ffc… Patch: https://github.com/kamailio/kamailio/commit/3b8c42180336567a1d9b55fefd05ffc… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 4a8bb47..a0728a7 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -dev8 +EXTRAVERSION = -dev9 # memory manager switcher # 0 - f_malloc (fast malloc)

7 years, 11 months

git:4.3:a311e9cc: dialplan: fix avp values when using PV_IDX_ITR

by Victor Seva

Module: kamailio Branch: 4.3 Commit: a311e9cc9af08d29926db2307b0e8bfd87f3e1a4 URL: https://github.com/kamailio/kamailio/commit/a311e9cc9af08d29926db2307b0e8bf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-15T09:35:25+01:00 dialplan: fix avp values when using PV_IDX_ITR manual backport from cc2c3de5e859861b59265cc5a0d41ae968a08149 (cherry picked from commit 30f53f1484144d2069f5d3724a65e160bbb6adb5) --- Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/a311e9cc9af08d29926db2307b0e8bf… Patch: https://github.com/kamailio/kamailio/commit/a311e9cc9af08d29926db2307b0e8bf… --- diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index bfeda07..959c4bc 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -67,9 +67,10 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, pv_elem_p e = NULL; pv_elem_p t = NULL; str s = STR_NULL; + str v = STR_NULL; int ret = -1; - if(elem==NULL||avp_elem==NULL||elem_prev==NULL) return -1; + if(elem==NULL||avp_elem==NULL||elem_prev==NULL||vexpr==NULL) return -1; if(str_append(&(avp_elem->text), val, &s)<0) return -1; if(pv_parse_format(&s, &e)<0) { @@ -86,10 +87,18 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, } if(*elem_prev) (*elem_prev)->next = e; e->next = avp_elem->next; - if(pv_printf_s(msg, e, vexpr)<0){ + if(pv_printf_s(msg, e, &v)<0){ LM_ERR("cannot get avp pcre dynamic expression value\n"); goto clean; } + /* pv_printf_s uses pv_get_buffer() we do need to copy */ + vexpr->len = v.len; + vexpr->s = pkg_malloc(sizeof(char)*(v.len+1)); + if(vexpr->s==NULL) { + PKG_MEM_ERROR; + goto clean; + } + strcpy(vexpr->s, v.s); ret = 0; clean: if(s.s) pkg_free(s.s); @@ -282,7 +291,12 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) } clean: if(elem) pv_elem_free_all(elem); - while(l) { t = l->next; pkg_free(l); l = t;} + while(l) { + t = l->next; + if(l->s.s) pkg_free(l->s.s); + pkg_free(l); + l = t; + } return re_list; }

7 years, 11 months

git:4.4:30f53f14: dialplan: fix avp values when using PV_IDX_ITR

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 30f53f1484144d2069f5d3724a65e160bbb6adb5 URL: https://github.com/kamailio/kamailio/commit/30f53f1484144d2069f5d3724a65e16… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-12-15T09:33:45+01:00 dialplan: fix avp values when using PV_IDX_ITR manual backport from cc2c3de5e859861b59265cc5a0d41ae968a08149 --- Modified: modules/dialplan/dp_repl.c --- Diff: https://github.com/kamailio/kamailio/commit/30f53f1484144d2069f5d3724a65e16… Patch: https://github.com/kamailio/kamailio/commit/30f53f1484144d2069f5d3724a65e16… --- diff --git a/modules/dialplan/dp_repl.c b/modules/dialplan/dp_repl.c index bfeda07..959c4bc 100644 --- a/modules/dialplan/dp_repl.c +++ b/modules/dialplan/dp_repl.c @@ -67,9 +67,10 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, pv_elem_p e = NULL; pv_elem_p t = NULL; str s = STR_NULL; + str v = STR_NULL; int ret = -1; - if(elem==NULL||avp_elem==NULL||elem_prev==NULL) return -1; + if(elem==NULL||avp_elem==NULL||elem_prev==NULL||vexpr==NULL) return -1; if(str_append(&(avp_elem->text), val, &s)<0) return -1; if(pv_parse_format(&s, &e)<0) { @@ -86,10 +87,18 @@ int dpl_dyn_printf_s(sip_msg_t *msg, const pv_elem_p elem, } if(*elem_prev) (*elem_prev)->next = e; e->next = avp_elem->next; - if(pv_printf_s(msg, e, vexpr)<0){ + if(pv_printf_s(msg, e, &v)<0){ LM_ERR("cannot get avp pcre dynamic expression value\n"); goto clean; } + /* pv_printf_s uses pv_get_buffer() we do need to copy */ + vexpr->len = v.len; + vexpr->s = pkg_malloc(sizeof(char)*(v.len+1)); + if(vexpr->s==NULL) { + PKG_MEM_ERROR; + goto clean; + } + strcpy(vexpr->s, v.s); ret = 0; clean: if(s.s) pkg_free(s.s); @@ -282,7 +291,12 @@ dpl_dyn_pcre_p dpl_dynamic_pcre_list(sip_msg_t *msg, str *expr) } clean: if(elem) pv_elem_free_all(elem); - while(l) { t = l->next; pkg_free(l); l = t;} + while(l) { + t = l->next; + if(l->s.s) pkg_free(l->s.s); + pkg_free(l); + l = t; + } return re_list; }

7 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2016