sr-dev

sr-dev@lists.kamailio.org

12 participants
44198 discussions

git:master:2a35ef29: seas: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 2a35ef2966bca64f759c435e248e3b9118a90fc4 URL: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:09:41+01:00 seas: reformat exported structures --- Modified: src/modules/seas/seas.c --- Diff: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… Patch: https://github.com/kamailio/kamailio/commit/2a35ef2966bca64f759c435e248e3b9… --- diff --git a/src/modules/seas/seas.c b/src/modules/seas/seas.c index 3c8e17c2673..63ad58b0335 100644 --- a/src/modules/seas/seas.c +++ b/src/modules/seas/seas.c @@ -85,29 +85,35 @@ int read_pipe = 0; struct seas_functions seas_f; -static cmd_export_t cmds[] = {{"as_relay_t", (cmd_function)w_as_relay_t, 1, - fixup_as_relay, 0, REQUEST_ROUTE}, - {"as_relay_sl", (cmd_function)w_as_relay_sl, 1, fixup_as_relay, 0, - REQUEST_ROUTE}, - {0, 0, 0, 0, 0, 0}}; +/* clang-format off */ +static cmd_export_t cmds[] = { + {"as_relay_t", (cmd_function)w_as_relay_t, 1, fixup_as_relay, 0, REQUEST_ROUTE}, + {"as_relay_sl", (cmd_function)w_as_relay_sl, 1, fixup_as_relay, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"listen_sockets", PARAM_STRING, &seas_listen_socket}, - {"stats_socket", PARAM_STRING, &seas_stats_socket}, - {"jain_ping", PARAM_STRING, &jain_ping_config}, - {"servlet_ping", PARAM_STRING, &servlet_ping_config}, - {"clusters", PARAM_STRING, &cluster_cfg}, {0, 0, 0}}; + {"listen_sockets", PARAM_STRING, &seas_listen_socket}, + {"stats_socket", PARAM_STRING, &seas_stats_socket}, + {"jain_ping", PARAM_STRING, &jain_ping_config}, + {"servlet_ping", PARAM_STRING, &servlet_ping_config}, + {"clusters", PARAM_STRING, &cluster_cfg}, + {0, 0, 0} +}; struct module_exports exports = { - "seas", DEFAULT_DLFLAGS, cmds, /* exported commands */ - params, /* exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported module-items (pseudo variables) */ - 0, /* response function */ - seas_init, /* module initialization function */ - seas_child_init, /* per-child init function */ - seas_exit /* module exit function */ + "seas", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + seas_init, /* module initialization function */ + seas_child_init, /* per-child init function */ + seas_exit /* module destroy function */ }; +/* clang-format on */ static int fixup_as_relay(void **param, int param_no) {

1 month, 2 weeks

git:master:e915258d: sipdump: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: e915258d8a76f811c8e9a7607248cf7149719541 URL: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:47:05+01:00 sipdump: add fixup_free* to exported functions --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… Patch: https://github.com/kamailio/kamailio/commit/e915258d8a76f811c8e9a7607248cf7… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 8201ab11e47..cdac1a32ccf 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -74,7 +74,7 @@ int pv_get_sipdump(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); /* clang-format off */ static cmd_export_t cmds[]={ {"sipdump_send", (cmd_function)w_sipdump_send, 1, fixup_spve_null, - 0, ANY_ROUTE}, + fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} };

1 month, 2 weeks

git:master:b0531ca5: sipcapture: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: b0531ca55d8d918f58057b393ba13a22e95813b6 URL: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:52:39+01:00 sipcapture: reformat exported structures --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2… Patch: https://github.com/kamailio/kamailio/commit/b0531ca55d8d918f58057b393ba13a2…

1 month, 2 weeks

git:master:612f5d10: sipcapture: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 612f5d10f0d191b0c66e8ef907c09a00239bfcf4 URL: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T10:01:43+01:00 sipcapture: add fixup_free* to exported functions --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… Patch: https://github.com/kamailio/kamailio/commit/612f5d10f0d191b0c66e8ef907c09a0… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 82c916dd3bc..9ae34fa9658 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -140,8 +140,11 @@ static int sipcapture_init_rpc(void); static int child_init(int rank); static void destroy(void); static int sipcapture_fixup(void **param, int param_no); +static int sipcapture_fixup_free(void **param, int param_no); static int reportcapture_fixup(void **param, int param_no); +static int reportcapture_fixup_free(void **param, int param_no); static int float2int_fixup(void **param, int param_no); +static int float2int_fixup_free(void **param, int param_no); static int pv_get_hep(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_hep_name(pv_spec_p sp, str *in); @@ -310,14 +313,22 @@ struct hep_timeinfo *heptime = NULL; * Exported functions */ static cmd_export_t cmds[] = { - {"sip_capture", (cmd_function)w_sip_capture0, 0, 0, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture1, 1, sipcapture_fixup, 0, ANY_ROUTE}, - {"sip_capture", (cmd_function)w_sip_capture2, 2, sipcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture1, 1, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture2, 2, reportcapture_fixup, 0, ANY_ROUTE}, - {"report_capture", (cmd_function)w_report_capture3, 3, reportcapture_fixup, 0, ANY_ROUTE}, - {"float2int", (cmd_function)w_float2int, 2, float2int_fixup, 0, ANY_ROUTE}, - {"sip_capture_forward", (cmd_function)w_sip_capture_forward, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture0, 0, + 0, 0, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture1, 1, + sipcapture_fixup, sipcapture_fixup_free, ANY_ROUTE}, + {"sip_capture", (cmd_function)w_sip_capture2, 2, + sipcapture_fixup, sipcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture1, 1, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture2, 2, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"report_capture", (cmd_function)w_report_capture3, 3, + reportcapture_fixup, reportcapture_fixup_free, ANY_ROUTE}, + {"float2int", (cmd_function)w_float2int, 2, + float2int_fixup, float2int_fixup_free, ANY_ROUTE}, + {"sip_capture_forward", (cmd_function)w_sip_capture_forward, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -1108,6 +1119,15 @@ static int sipcapture_fixup(void **param, int param_no) return 0; } +static int sipcapture_fixup_free(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} + static int reportcapture_fixup(void **param, int param_no) { @@ -1124,6 +1144,16 @@ static int reportcapture_fixup(void **param, int param_no) return 0; } +static int reportcapture_fixup_free(void **param, int param_no) +{ + + if(param_no >= 1 && param_no <= 3) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} + static int float2int_fixup(void **param, int param_no) { @@ -1137,6 +1167,14 @@ static int float2int_fixup(void **param, int param_no) return 0; } +static int float2int_fixup_free(void **param, int param_no) +{ + if(param_no == 1 || param_no == 2) { + return fixup_free_fparam_all(param, 1); + } + + return 0; +} static int w_float2int(sip_msg_t *_m, char *_val, char *_coof) {

1 month, 2 weeks

git:master:3cce2ac7: sipjson: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 3cce2ac7f9f8ef2ab10a9c228b9bbaddde3c7d03 URL: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 sipjson: reformat exported structures --- Modified: src/modules/sipjson/sipjson_mod.c Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… Patch: https://github.com/kamailio/kamailio/commit/3cce2ac7f9f8ef2ab10a9c228b9bbad… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 06e0d2eeb4c..83564225aa0 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -41,26 +41,30 @@ static int sj_serialize_data(sip_msg_t *msg, srjson_doc_t *jdoc, str *smode); static int w_sj_serialize(sip_msg_t *msg, char *mode, char *vout); +/* clang-format off */ static cmd_export_t cmds[] = { - {"sj_serialize", (cmd_function)w_sj_serialize, 2, fixup_spve_pvar, - fixup_free_spve_pvar, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0}}; - -static param_export_t params[] = {{0, 0, 0}}; + {"sj_serialize", (cmd_function)w_sj_serialize, 2, fixup_spve_pvar, + fixup_free_spve_pvar, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; +static param_export_t params[] = { + {0, 0, 0} +}; struct module_exports exports = { - "sipjson", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported rpc functions */ - 0, /* exported pseudo-variables */ - 0, /* module init function */ - 0, /* response function */ - 0, /* per child init function */ - 0 /* destroy function */ + "sipjson", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported rpc functions */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + 0, /* module init function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** * diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index e8cd28d10d7..0ce005774e2 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -75,7 +75,7 @@ static cmd_export_t cmds[]={ {"sr_msg_pull", (cmd_function)w_sr_msg_pull, 4, fixup_sssi, fixup_free_sssi, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_async_pull", (cmd_function)w_sr_msg_async_pull, 5, fixup_sr_msg_async_pull, - 0, ANY_ROUTE}, + fixup_free_sr_msg_async_pull, ANY_ROUTE}, {"sr_msg_rm", (cmd_function)w_sr_msg_rm, 2, fixup_spve_spve, fixup_free_spve_spve, REQUEST_ROUTE|CORE_ONREPLY_ROUTE}, {"sr_msg_check", (cmd_function)w_sr_msg_check, 0, 0,

1 month, 2 weeks

git:master:64290a1a: siptrace: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 64290a1aa41bba94387045c3d618ca3f7886f517 URL: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 siptrace: add fixup_free* to exported functions --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… Patch: https://github.com/kamailio/kamailio/commit/64290a1aa41bba94387045c3d618ca3… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index a6e276a54fb..43250e0e8c3 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -225,9 +225,9 @@ static cmd_export_t cmds[] = { ANY_ROUTE}, {"sip_trace_msg", (cmd_function)w_sip_trace_msg, 5, fixup_spve_all, fixup_free_spve_all, ANY_ROUTE}, - {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, 0, + {"hlog", (cmd_function)w_hlog1, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, - {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, 0, + {"hlog", (cmd_function)w_hlog2, 2, fixup_spve_spve, fixup_free_spve_null, ANY_ROUTE}, {"sip_trace_mode", (cmd_function)w_sip_trace_mode, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE},

1 month, 2 weeks

git:master:2d024cc2: sipt: reformat exported structures

by Victor Seva

Module: kamailio Branch: master Commit: 2d024cc28ba3284fca67c4748e1b85349edb15ae URL: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 sipt: reformat exported structures --- Modified: src/modules/sipt/sipt.c --- Diff: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853… Patch: https://github.com/kamailio/kamailio/commit/2d024cc28ba3284fca67c4748e1b853…

1 month, 2 weeks

git:master:1241c77c: siprepo: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: 1241c77c8ced81bfc2f1a8d72b99d4157d5a61b5 URL: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:05+01:00 siprepo: add fixup_free* to exported functions --- Modified: src/modules/siprepo/siprepo_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… Patch: https://github.com/kamailio/kamailio/commit/1241c77c8ced81bfc2f1a8d72b99d41… --- diff --git a/src/modules/siprepo/siprepo_mod.c b/src/modules/siprepo/siprepo_mod.c index e6acc23368e..e8cd28d10d7 100644 --- a/src/modules/siprepo/siprepo_mod.c +++ b/src/modules/siprepo/siprepo_mod.c @@ -59,6 +59,7 @@ static int w_sr_msg_check(sip_msg_t *msg, char *p1, char *p2); static void siprepo_timer_exec(unsigned int ticks, int worker, void *param); static int fixup_sr_msg_async_pull(void **param, int param_no); +static int fixup_free_sr_msg_async_pull(void **param, int param_no); /* clang-format off */ typedef struct sworker_task_param { @@ -293,6 +294,15 @@ static int fixup_sr_msg_async_pull(void **param, int param_no) return 0; } +static int fixup_free_sr_msg_async_pull(void **param, int param_no) +{ + if(param_no >= 1 && param_no <= 4) + return fixup_free_spve_null(param, 1); + if(param_no == 5) + return fixup_free_igp_null(param, 1); + return 0; +} + /** * */

1 month, 2 weeks

git:master:b074dc24: siputils: add fixup_free* to exported functions

by Victor Seva

Module: kamailio Branch: master Commit: b074dc24c5bbd60d8bf6306f152c1f8c35eb2fef URL: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-11-22T09:45:04+01:00 siputils: add fixup_free* to exported functions --- Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… Patch: https://github.com/kamailio/kamailio/commit/b074dc24c5bbd60d8bf6306f152c1f8… --- diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 7fa03902929..6a232d0f668 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -117,6 +117,7 @@ static int w_sip_parse_headers(sip_msg_t *msg, char *p1, char *p2); static int fixup_set_uri(void **param, int param_no); static int fixup_free_set_uri(void **param, int param_no); static int fixup_tel2sip(void **param, int param_no); +static int fixup_free_tel2sip(void **param, int param_no); static int fixup_get_uri_param(void **param, int param_no); static int free_fixup_get_uri_param(void **param, int param_no); static int fixup_option(void **param, int param_no); @@ -143,9 +144,9 @@ static cmd_export_t cmds[] = { free_fixup_get_uri_param, REQUEST_ROUTE | LOCAL_ROUTE}, {"uri_param_rm", (cmd_function)w_uri_param_rm, 1, fixup_spve_null, fixup_free_spve_null, REQUEST_ROUTE | BRANCH_ROUTE | FAILURE_ROUTE}, - {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, 0, + {"tel2sip", (cmd_function)tel2sip, 3, fixup_tel2sip, fixup_free_tel2sip, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, - {"tel2sip2", (cmd_function)tel2sip2, 3, fixup_tel2sip, 0, + {"tel2sip2", (cmd_function)tel2sip2, 3, fixup_tel2sip, fixup_free_tel2sip, REQUEST_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE | ONREPLY_ROUTE}, {"is_uri", (cmd_function)is_uri, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, @@ -364,6 +365,17 @@ static int fixup_tel2sip(void **param, int param_no) return -1; } +static int fixup_free_tel2sip(void **param, int param_no) +{ + if((param_no == 1) || (param_no == 2)) { + fixup_free_fparam_all(param, 1); + } + if(param_no == 3) { + fixup_free_pvar_null(param, 1); + } + return 0; +} + /* */ static int fixup_get_uri_param(void **param, int param_no) {

1 month, 2 weeks

git:master:9ec3770f: core: main - tls_threads_mode set to 2 by default

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 9ec3770f88339426c95514bc35a3afc2c2b0def8 URL: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-11-22T09:19:33+01:00 core: main - tls_threads_mode set to 2 by default - recommended value (KSR_TLS_THREADS_MFORK) for production with latest libssl --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… Patch: https://github.com/kamailio/kamailio/commit/9ec3770f88339426c95514bc35a3afc… --- diff --git a/src/main.c b/src/main.c index ab5943e609e..1b9e599fe5c 100644 --- a/src/main.c +++ b/src/main.c @@ -343,7 +343,7 @@ int tls_disable = 0; /* tls enabled by default */ int tls_disable = 1; /* tls disabled by default */ #endif /* CORE_TLS */ /* threads execution mode for tls with libssl */ -int ksr_tls_threads_mode = KSR_TLS_THREADS_MNONE; +int ksr_tls_threads_mode = KSR_TLS_THREADS_MFORK; #endif /* USE_TLS */ #ifdef USE_SCTP int sctp_children_no = 0;

1 month, 2 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev