sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
391 discussions

git:master:1194f597: core: timer_proc don't execute timers on shutdown phase
by Victor Seva 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 1194f59738e87fcbf0d61c95d1d481e5fbb46784 URL: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-28T13:03:38+01:00 core: timer_proc don't execute timers on shutdown phase --- Modified: src/core/timer_proc.c --- Diff: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… Patch: https://github.com/kamailio/kamailio/commit/1194f59738e87fcbf0d61c95d1d481e… --- diff --git a/src/core/timer_proc.c b/src/core/timer_proc.c index 0b04cf65131..55bd98dab9c 100644 --- a/src/core/timer_proc.c +++ b/src/core/timer_proc.c @@ -29,6 +29,7 @@ #include "pt.h" #include "ut.h" #include "mem/shm_mem.h" +#include "sr_module.h" #include <unistd.h> @@ -76,6 +77,9 @@ int fork_basic_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), param); /* ticks in s for compatibility with old @@ -99,6 +103,9 @@ int fork_basic_timer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep(interval); cfg_update(); f(get_ticks(), worker, @@ -141,6 +148,9 @@ int fork_basic_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -165,6 +175,9 @@ int fork_basic_utimer_w(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } sleep_us(uinterval); cfg_update(); ts = get_ticks_raw(); @@ -273,6 +286,9 @@ int fork_sync_timer(int child_id, char *desc, int make_sock, timer_function *f, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > interval) sleep_us(1000); /* 1 millisecond sleep to catch up */ else @@ -324,6 +340,9 @@ int fork_sync_utimer(int child_id, char *desc, int make_sock, if(cfg_child_init()) return -1; for(;;) { + if(unlikely(ksr_shutdown_phase() != 0)) { + return 0; + } if(ts2 > uinterval) sleep_us(1); else

1 0

git:master:9117e5dd: modules: readme files regenerated - jansson ... [skip ci]
by Kamailio Dev 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9117e5ddbffe2a202d24eb39a509835f14090486 URL: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-28T10:32:15+01:00 modules: readme files regenerated - jansson ... [skip ci] --- Modified: src/modules/jansson/README --- Diff: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835… Patch: https://github.com/kamailio/kamailio/commit/9117e5ddbffe2a202d24eb39a509835…

1 0

git:master:3b47b566: jansson: rename parameter for janssonmod_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 3b47b566477baedf687635b2b3f0e2525987e709 URL: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: rename parameter for janssonmod_get_field() - more suggestive relation with the meaning of the field name parameter --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h --- Diff: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… Patch: https://github.com/kamailio/kamailio/commit/3b47b566477baedf687635b2b3f0e25… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 58a698446ca..dab15d488f3 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -95,22 +95,22 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) } int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst) + struct sip_msg *msg, char *field_in, char *src_in, char *dst) { str src_s; - str path_s; + str field_s; - if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { - ERR("cannot get json string value\n"); + if(fixup_get_svalue(msg, (gparam_p)field_in, &field_s) != 0) { + ERR("cannot get field name string value\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { - ERR("cannot get path string value\n"); + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); return -1; } - return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &field_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index ab1c029821f..829aa144c19 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -28,7 +28,7 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_get_field( - struct sip_msg *msg, char *path_in, char *src_in, char *dst); + struct sip_msg *msg, char *field_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in,

1 0

git:master:9eeab439: jansson: docs updated for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 9eeab4396d8ec57781244ab80c4a96539d7338ec URL: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:41+01:00 jansson: docs updated for jansson_get_field() --- Modified: src/modules/jansson/doc/jansson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… Patch: https://github.com/kamailio/kamailio/commit/9eeab4396d8ec57781244ab80c4a965… --- diff --git a/src/modules/jansson/doc/jansson_admin.xml b/src/modules/jansson/doc/jansson_admin.xml index debc9cc5a19..daa5e9ea51e 100644 --- a/src/modules/jansson/doc/jansson_admin.xml +++ b/src/modules/jansson/doc/jansson_admin.xml @@ -56,10 +56,16 @@ <title>Functions</title> <section id="jansson.f.jansson_get"> <title> - <function moreinfo="none">jansson_get(key/path, src, dst)</function> + <function moreinfo="none">jansson_get(path, src, dst)</function> </title> <para> - Copy the value at the location 'path' from the json object 'src' and store it in pvar 'dst'. + Copy the value at the location 'path' from the json object 'src' + and store it in variable 'dst'. The path can also be a simple field name + (a key), if it does not include any path separator. To retrieve the + value of a field that includes path separators in the name, use + jansson_get_field(). + </para> + <para> The 'src' can be a static string or a dynamic string with variables. </para> <para> @@ -71,7 +77,7 @@ </para> <para> The function can put a string, integer, null, or new json string into destination. - If the key/path can't be found in the JSON data structure, the pvar is not changed. + If the path can't be found in the JSON data structure, the pvar is not changed. If it had a previous value, that value remains unchanged. </para> @@ -280,22 +286,27 @@ jansson_xencode("a", "$var(js)"); </section> <section id="jansson.f.jansson_get_field"> <title> - <function moreinfo="none">jansson_get_field(src, field_name, dst)</function> + <function moreinfo="none">jansson_get_field(field_name, src, dst)</function> </title> <para> - Copy field 'field_name' from json object 'src' and store it in pvar 'dst'. + Copy the value of the field 'field_name' from json object 'src' + and store it in pvar 'dst'. The field name is not evaluated as JSON + path, therefore it has a different behaviour than jansson_get() and + can be used when the field name contains path delimiters. </para> <para> - <emphasis>This function is deprecated</emphasis> but kept for backwards compatibility. - Right now it is just a wrapper around <function>jansson_get</function>, and its - functionality is the same. + Note that till version 5.7.x, this function was similar to jansson_get(), + after that its behaviour changed to work as described above. Also, + the order of parameters changed. </para> <example> <title><function>jansson_get_field</function> usage</title> <programlisting format="linespecific"> ... -jansson_get_field("{'foo':'bar'}", "foo", "$var(foo)"); +jansson_get_field("foo", "{'foo':'bar'}", "$var(foo)"); xlog("foo is $var(foo)"); +jansson_get_field("foo.foz", "{'foo.foz':'bar.buz'}", "$var(foofoz)"); +xlog("foo.foz is $var(foofoz)"); ... </programlisting> </example>

1 0

git:master:d7b76608: jansson: use key as field name for jansson_get_field()
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: d7b76608595046001cab3ced06d29c1e9a84cb99 URL: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: use key as field name for jansson_get_field() - do no try to evaluate it as json path --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… Patch: https://github.com/kamailio/kamailio/commit/d7b76608595046001cab3ced06d29c1… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 8e154e7bff4..58a698446ca 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -34,7 +34,7 @@ #include "jansson_utils.h" int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv) + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv) { char c; pv_value_t dst_val; @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path, 0); + json_t *v = json_path_get(json, path, pmode); if(!v) { goto fail; } @@ -91,7 +91,26 @@ int janssonmod_get(struct sip_msg *msg, char *path_in, char *src_in, char *dst) return -1; } - return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); + return janssonmod_get_helper(msg, &path_s, 0, &src_s, (pv_spec_t *)dst); +} + +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst) +{ + str src_s; + str path_s; + + if(fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + return janssonmod_get_helper(msg, &path_s, 1, &src_s, (pv_spec_t *)dst); } int janssonmod_pv_get( @@ -111,7 +130,7 @@ int janssonmod_pv_get( return -1; } - ret = janssonmod_get_helper(msg, &path_s, &val.rs, (pv_spec_t *)dst); + ret = janssonmod_get_helper(msg, &path_s, 0, &val.rs, (pv_spec_t *)dst); pv_value_destroy(&val); diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index f59074a210b..ab1c029821f 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -27,6 +27,8 @@ int janssonmod_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); +int janssonmod_get_field( + struct sip_msg *msg, char *path_in, char *src_in, char *dst); int janssonmod_pv_get( struct sip_msg *msg, char *path_in, char *json_in, char *result); int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, @@ -34,7 +36,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, int janssonmod_array_size( struct sip_msg *msg, char *json_in, char *path_in, char *dst); int janssonmod_get_helper( - sip_msg_t *msg, str *path_s, str *src_s, pv_spec_t *dst_pv); + sip_msg_t *msg, str *path_s, int pmode, str *src_s, pv_spec_t *dst_pv); int jansson_xdecode(struct sip_msg *msg, char *src_in, char *xavp_in); int jansson_xencode(struct sip_msg *msg, char *xavp, char *dst); diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 816cb130fa9..e7dd58ee3fc 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -55,11 +55,6 @@ int janssonmod_set_append(struct sip_msg *msg, char *type_in, char *path_in, { return janssonmod_set(1, msg, type_in, path_in, value_in, result); } -int janssonmod_get_field( - struct sip_msg *msg, char *jansson_in, char *path_in, char *result) -{ - return janssonmod_get(msg, path_in, jansson_in, result); -} /* clang-format off */ /* Exported functions */ @@ -246,7 +241,7 @@ static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) return -1; } - return janssonmod_get_helper(msg, spath, sdoc, pvs); + return janssonmod_get_helper(msg, spath, 0, sdoc, pvs); } /**

1 0

git:master:525dc452: jansson: reformat exported structures
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 525dc4523ac411e1154c3ae8af1ec6f8678d1dbc URL: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: reformat exported structures --- Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… Patch: https://github.com/kamailio/kamailio/commit/525dc4523ac411e1154c3ae8af1ec6f… --- diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index 820a5492574..816cb130fa9 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -61,42 +61,44 @@ int janssonmod_get_field( return janssonmod_get(msg, path_in, jansson_in, result); } +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, - fixup_get_params_free, ANY_ROUTE}, - {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, - fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, - {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - {"jansson_set", (cmd_function)janssonmod_set_replace, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_append", (cmd_function)janssonmod_set_append, 4, - fixup_set_params, fixup_set_params_free, ANY_ROUTE}, - {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, - fixup_free_spve_spve, ANY_ROUTE}, - {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, - fixup_xencode_free, ANY_ROUTE}, - /* for backwards compatibility */ - {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, - fixup_get_params, fixup_get_params_free, ANY_ROUTE}, - /* non-script functions */ - {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, - - {0, 0, 0, 0, 0, 0}}; + {"jansson_get", (cmd_function)janssonmod_get, 3, fixup_get_params, + fixup_get_params_free, ANY_ROUTE}, + {"jansson_pv_get", (cmd_function)janssonmod_pv_get, 3, + fixup_pv_get_params, fixup_pv_get_params_free, ANY_ROUTE}, + {"jansson_array_size", (cmd_function)janssonmod_array_size, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + {"jansson_set", (cmd_function)janssonmod_set_replace, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_append", (cmd_function)janssonmod_set_append, 4, + fixup_set_params, fixup_set_params_free, ANY_ROUTE}, + {"jansson_xdecode", (cmd_function)jansson_xdecode, 2, fixup_spve_spve, + fixup_free_spve_spve, ANY_ROUTE}, + {"jansson_xencode", (cmd_function)jansson_xencode, 2, fixup_xencode, + fixup_xencode_free, ANY_ROUTE}, + {"jansson_get_field", (cmd_function)janssonmod_get_field, 3, + fixup_get_params, fixup_get_params_free, ANY_ROUTE}, + /* non-script functions */ + {"jansson_to_val", (cmd_function)jansson_to_val, 0, 0, 0, 0}, + + {0, 0, 0, 0, 0, 0} +}; struct module_exports exports = { - "jansson", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - 0, /* param exports */ - 0, /* RPC method exports */ - 0, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "jansson", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* cmd (cfg function) exports */ + 0, /* param exports */ + 0, /* RPC method exports */ + 0, /* pseudo-variables exports */ + 0, /* response handling function */ + mod_init, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format off */ static int fixup_get_params(void **param, int param_no)

1 0

git:master:48034ab6: jansson: added path evaluatian mode for helper functions
by Daniel-Constantin Mierla 28 Nov '23

28 Nov '23

Module: kamailio Branch: master Commit: 48034ab61482f6b3d9e77ccfc9e0743c44ff4458 URL: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-28T10:20:40+01:00 jansson: added path evaluatian mode for helper functions --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_path.c Modified: src/modules/jansson/jansson_path.h --- Diff: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… Patch: https://github.com/kamailio/kamailio/commit/48034ab61482f6b3d9e77ccfc9e0743… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 926ed34c266..8e154e7bff4 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -52,7 +52,7 @@ int janssonmod_get_helper( char *path = path_s->s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { goto fail; } @@ -252,7 +252,7 @@ int janssonmod_set(unsigned int append, struct sip_msg *msg, char *type_in, goto fail; } - if(json_path_set(result_json, path, value, append) < 0) { + if(json_path_set(result_json, path, 0, value, append) < 0) { goto fail; } @@ -307,7 +307,7 @@ int janssonmod_array_size( char *path = path_s.s; - json_t *v = json_path_get(json, path); + json_t *v = json_path_get(json, path, 0); if(!v) { ERR("failed to find %s in json\n", path); goto fail; diff --git a/src/modules/jansson/jansson_path.c b/src/modules/jansson/jansson_path.c index cc38c380260..d4148591aac 100644 --- a/src/modules/jansson/jansson_path.c +++ b/src/modules/jansson/jansson_path.c @@ -25,7 +25,7 @@ static char *jsonp_strdup(const char *str); static json_malloc_t do_malloc = malloc; static json_free_t do_free = free; -json_t *json_path_get(const json_t *json, const char *path) +json_t *json_path_get(const json_t *json, const char *path, const int pmode) { static const char array_open = '['; static const char *path_delims = ".[", *array_close = "]"; @@ -50,7 +50,11 @@ json_t *json_path_get(const json_t *json, const char *path) while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(peek, expect); + if(pmode == 0) { + peek = strpbrk(peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) goto fail; @@ -85,8 +89,8 @@ json_t *json_path_get(const json_t *json, const char *path) return NULL; } -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append) +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append) { static const char array_open = '['; static const char object_delim = '.'; @@ -117,8 +121,11 @@ int json_path_set( while(peek && *peek && cursor) { char *last_peek = peek; - peek = strpbrk(last_peek, expect); - + if(pmode == 0) { + peek = strpbrk(last_peek, expect); + } else { + peek = NULL; + } if(peek) { if(!token && peek != last_peek) { ERR("unexpected trailing chars in JSON path at pos %zu\n", diff --git a/src/modules/jansson/jansson_path.h b/src/modules/jansson/jansson_path.h index 79e1614c6fd..22fc562fee7 100644 --- a/src/modules/jansson/jansson_path.h +++ b/src/modules/jansson/jansson_path.h @@ -10,8 +10,8 @@ #define _JANSSON_PATH_H_ #include <jansson.h> -json_t *json_path_get(const json_t *json, const char *path); -int json_path_set( - json_t *json, const char *path, json_t *value, unsigned int append); +json_t *json_path_get(const json_t *json, const char *path, const int pmode); +int json_path_set(json_t *json, const char *path, const int pmode, + json_t *value, unsigned int append); #endif

1 0

git:master:870e4dc8: pkg: RPM packaging add kamailio-tls_wolfssl subpackage
by S-P Chan 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 870e4dc86dec7bf51a513bb1a716ad2417a12fa9 URL: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2023-11-28T06:25:41+08:00 pkg: RPM packaging add kamailio-tls_wolfssl subpackage --- Modified: pkg/kamailio/obs/kamailio-9-x86_64.cfg Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2… Patch: https://github.com/kamailio/kamailio/commit/870e4dc86dec7bf51a513bb1a716ad2…

1 0

Info: Issue and PR automatic management
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Hello, during the Kamailio Development Meeting that took place in Dusseldorf earlier this month, one topic was related to administrative tasks related to project development and management, how to simplify/automatize such tasks. To reduce the work load on volunteering contributors, GitHub Actions were already used for various tasks related to project development and management (e.g., automatic builds on commits and pull requests to detect compile errors or code formatting mistakes). In Dusseldorf another task was configured to be managed with GitHub Actions, respectively the check of open issues and pull requests to evaluate the interest of submitters, developers and community users to pursue them. If there is no activity on an issue (potential bug or feature request) or a pull request, after 6 weeks it is marked with the label `stale`. After two more weeks of no activity, the issue or the pull request is marked with the label `expired` and closed. Note that any comment postpones the expire timeline, being considered that there is interest in pursuing the issue or the pull request. Requests for features were already treated in this way: if nobody commits to implement it, it can be closed after one month, but it needed manual work and many were still kept open. Potential bug reports that become very old are hard to tackle if the source code changes or new major releases are out, they might even not be valid anymore. Anyhow, this automatic operations can be reverted if there is still interest in pursuing the specific issues or pull requests. A registered developer can remove labels and reopen a closed issue or pull request. The non-registered-developer contributors have to make a comment that includes the token `/notstale` to remove the label `stale` or includes the token `/notexpired` to reopen a closed item. This new kind of automatic task management might add a little inconvenience because one has to restate the interest from time to time for those items that could not be addressed. However, considering that Kamailio is an open source collaborative project, in order to be fair for those that volunteer to spend time and resources for development of Kamailio, also the users/submitters have to stay engaged, not just report and forget about. The process to automatize tasks related to Kamailio development and administration is work in progress. Everything can be adjusted based on feedback (e.g., time lines), feel free to suggest improvements or new solutions to make things easier for everyone within the project ecosystem. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy and Development Services Kamailio Advanced Training -- asipto.com

1 0

git:master:4840ea75: .github/CONTRIBUTING.md: section for issue and pr automatic management
by Daniel-Constantin Mierla 27 Nov '23

27 Nov '23

Module: kamailio Branch: master Commit: 4840ea7536610d07ad6fda76da60ded04dfeabc7 URL: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-27T19:23:36+01:00 .github/CONTRIBUTING.md: section for issue and pr automatic management --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… Patch: https://github.com/kamailio/kamailio/commit/4840ea7536610d07ad6fda76da60ded… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2c5d46842b8..e01dd82c3ce 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -20,6 +20,7 @@ changes to this document in a pull request. * [Commit Message Examples](#commit-message-examples) * [See Also](#see-also) * [Reporting Issues](#reporting-issues) + * [Issue And PR Automatic Management](#issue-and-pr-automatic-management) * [License](#license) * [License Of New Code Contributions](#license-of-new-code-contributions) * [Further Assistance](#further-assistance) @@ -251,6 +252,32 @@ Note: replace any sensitive information in the content you add to the issue (e.g., passwords in modparams can be replaced with xyz, each IP address can be replaced with tokens like a.b.c.d, f.g.h.j). +## Issue And PR Automatic Management ## + +This section presents details about the automatic management of potential bug +reports and requests for new features using github actions. + +Kamailio is an open source collaborative project, in order to be fair for those +that volunteer to spend time and resources for development of Kamailio, the users +have to stay engaged, not just report and forget about. + +To reduce the work load on volunteering contributors, GitHub Actions are used +for various tasks related to project development and management (e.g., automatic +builds on commits and pull requests to detect compile errors or code formatting +mistakes). + +One task managed with GitHub Actions is related to the check of open +issues and pull requests to evaluate the interest of submitter, developers and +community users. If there is no activity on an issue (potential bug or feature +request) or a pull request, after 6 weeks it is marked with the label `stale`. +After two more weeks of no activity, the issue or the pull request is marked +with the label `expired` and closed. + +A registered developer can remove labels and reopen a closed issue or pull +request. The other contributors have to make a comment that includes the token +`/notstale` to remove the label `stale` or includes the token `/notexpired` to +reopen a closed item. + ## License ## Kamailio Main License: *GPLv2*.

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
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 November 2023