December 2024 - sr-dev - kamailio.org

git:master:0ebc38a4: nat_traversal: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 0ebc38a4834d74dfee8ff7326e516c01d7273472 URL: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:22:53+01:00 nat_traversal: reformat exported structures --- Modified: src/modules/nat_traversal/nat_traversal.c --- Diff: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0… Patch: https://github.com/kamailio/kamailio/commit/0ebc38a4834d74dfee8ff7326e516c0…

1 0

git:master:9dc92332: nathelper: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 9dc9233289d2518419438d38ac7d7b0abf4862a1 URL: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:18:46+01:00 nathelper: add fixup_free* to exported functions --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… Patch: https://github.com/kamailio/kamailio/commit/9dc9233289d2518419438d38ac7d7b0… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 6673370a5a8..ec543079f31 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -125,7 +125,9 @@ static int alter_mediaip(struct sip_msg *, str *, str *, int, str *, int, int); static int fix_nated_register_f(struct sip_msg *, char *, char *); static int fixup_fix_nated_register(void **param, int param_no); static int fixup_fix_sdp(void **param, int param_no); +static int fixup_free_fix_sdp(void **param, int param_no); static int fixup_add_contact_alias(void **param, int param_no); +static int fixup_free_add_contact_alias(void **param, int param_no); static int add_rcv_param_f(struct sip_msg *, char *, char *); static int nh_sip_reply_received(sip_msg_t *msg); static int test_sdp_cline(struct sip_msg *msg); @@ -214,7 +216,7 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"add_contact_alias", (cmd_function)add_contact_alias_3_f, 3, - fixup_add_contact_alias, 0, + fixup_add_contact_alias, fixup_free_add_contact_alias, REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|FAILURE_ROUTE}, {"set_contact_alias", (cmd_function)set_contact_alias_f, 0, 0, 0, @@ -228,13 +230,13 @@ static cmd_export_t cmds[] = { fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_sdp", (cmd_function)fix_nated_sdp_f, 1, - fixup_fix_sdp, 0, + fixup_fix_sdp, fixup_free_fix_sdp, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_sdp", (cmd_function)fix_nated_sdp_f, 2, - fixup_fix_sdp, 0, + fixup_fix_sdp, fixup_free_fix_sdp, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"nat_uac_test", (cmd_function)nat_uac_test_f, 1, - fixup_igp_null, 0, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"fix_nated_register", (cmd_function)fix_nated_register_f, 0, fixup_fix_nated_register, 0, @@ -243,10 +245,10 @@ static cmd_export_t cmds[] = { 0, 0, REQUEST_ROUTE }, {"add_rcv_param", (cmd_function)add_rcv_param_f, 1, - fixup_igp_null, 0, + fixup_igp_null, fixup_free_igp_null, REQUEST_ROUTE }, {"is_rfc1918", (cmd_function)is_rfc1918_f, 1, - fixup_spve_null, 0, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE }, {"set_alias_to_pv", (cmd_function)w_set_alias_to_pv, 1, 0, 0, ANY_ROUTE }, @@ -333,6 +335,20 @@ static int fixup_fix_sdp(void **param, int param_no) return -1; } +static int fixup_free_fix_sdp(void **param, int param_no) +{ + if(param_no == 1) { + /* flags */ + return fixup_free_igp_null(param, param_no); + } + if(param_no == 2) { + /* new IP */ + return fixup_free_spve_all(param, param_no); + } + LM_ERR("unexpected param no: %d\n", param_no); + return -1; +} + static int fixup_fix_nated_register(void **param, int param_no) { if(rcv_avp_name.n == 0) { @@ -352,6 +368,15 @@ static int fixup_add_contact_alias(void **param, int param_no) return -1; } +static int fixup_free_add_contact_alias(void **param, int param_no) +{ + if((param_no >= 1) && (param_no <= 3)) + return fixup_free_spve_null(param, 1); + + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + static void nathelper_rpc_enable_ping(rpc_t *rpc, void *ctx) { int value = 0;

1 0

git:master:6ca7a392: ndb_cassandra: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 6ca7a392708a1ea6a38c791591272bdf5b299832 URL: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:14:30+01:00 ndb_cassandra: add fixup_free* to exported functions --- Modified: src/modules/ndb_cassandra/ndb_cassandra.c --- Diff: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… Patch: https://github.com/kamailio/kamailio/commit/6ca7a392708a1ea6a38c791591272bd… --- diff --git a/src/modules/ndb_cassandra/ndb_cassandra.c b/src/modules/ndb_cassandra/ndb_cassandra.c index 7de3d608fda..375e8bf3fd8 100644 --- a/src/modules/ndb_cassandra/ndb_cassandra.c +++ b/src/modules/ndb_cassandra/ndb_cassandra.c @@ -55,7 +55,7 @@ static void destroy(void); /* Fixups functions */ static int fixup_cass_insert(void **param, int param_no); - +static int fixup_free_cass_insert(void **param, int param_no); static int fixup_cass_retrieve(void **param, int param_no); static int free_fixup_cass_retrieve(void **param, int param_no); @@ -69,7 +69,7 @@ static int cass_retrieve_f(struct sip_msg *msg, char *keyspace, /* Exported functions */ static cmd_export_t cmds[] = { {"cass_insert", (cmd_function)cass_insert_f, 5, - fixup_cass_insert, 0, + fixup_cass_insert, fixup_free_cass_insert, REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, fixup_cass_retrieve, free_fixup_cass_retrieve, @@ -137,6 +137,28 @@ static int fixup_cass_insert(void **param, int param_no) LM_ERR("invalid parameter number <%d>\n", param_no); return -1; } + +static int fixup_free_cass_insert(void **param, int param_no) +{ + if(param_no == 1) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 2) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 3) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 4) { + return fixup_free_spve_null(param, 1); + } + if(param_no == 5) { + return fixup_free_spve_null(param, 1); + } + LM_ERR("invalid parameter number <%d>\n", param_no); + return -1; +} + /**/ static int fixup_cass_retrieve(void **param, int param_no) { @@ -171,20 +193,16 @@ static int fixup_cass_retrieve(void **param, int param_no) static int free_fixup_cass_retrieve(void **param, int param_no) { if(param_no == 1) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 2) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 3) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 4) { - LM_WARN("free function has not been defined for spve\n"); - return 0; + return fixup_free_spve_null(param, 1); } if(param_no == 5) { return fixup_free_pvar_null(param, 1);

1 0

git:master:8e2a41e5: ndb_cassandra: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 8e2a41e57ab428f64cc78a76ea4716186357b9d5 URL: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:14:11+01:00 ndb_cassandra: reformat exported structures --- Modified: src/modules/ndb_cassandra/ndb_cassandra.c --- Diff: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… Patch: https://github.com/kamailio/kamailio/commit/8e2a41e57ab428f64cc78a76ea47161… --- diff --git a/src/modules/ndb_cassandra/ndb_cassandra.c b/src/modules/ndb_cassandra/ndb_cassandra.c index eb748c914f9..7de3d608fda 100644 --- a/src/modules/ndb_cassandra/ndb_cassandra.c +++ b/src/modules/ndb_cassandra/ndb_cassandra.c @@ -65,31 +65,39 @@ static int cass_insert_f(struct sip_msg *msg, char *keyspace, static int cass_retrieve_f(struct sip_msg *msg, char *keyspace, char *column_family, char *key, char *column, char *value); +/* clang-format off */ /* Exported functions */ static cmd_export_t cmds[] = { - {"cass_insert", (cmd_function)cass_insert_f, 5, fixup_cass_insert, 0, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, fixup_cass_retrieve, - free_fixup_cass_retrieve, - REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, - {0, 0, 0, 0, 0, 0}}; + {"cass_insert", (cmd_function)cass_insert_f, 5, + fixup_cass_insert, 0, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {"cass_retrieve", (cmd_function)cass_retrieve_f, 5, + fixup_cass_retrieve, free_fixup_cass_retrieve, + REQUEST_ROUTE | ONREPLY_ROUTE | FAILURE_ROUTE | BRANCH_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; /* Exported parameters */ static param_export_t params[] = { - {"host", PARAM_STR, &host}, {"port", PARAM_INT, &port}, {0, 0, 0}}; + {"host", PARAM_STR, &host}, + {"port", PARAM_INT, &port}, + {0, 0, 0} +}; /* Module interface */ struct module_exports exports = { - "ndb_cassandra", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported RPC methods */ - 0, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - child_init, /* per-child init function */ - destroy /* destroy function */ + "ndb_cassandra", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* Exported functions */ + params, /* Exported parameters */ + 0, /* exported RPC methods */ + 0, /* exported pseudo-variables */ + 0, /* response function*/ + mod_init, /* module initialization function */ + child_init, /* per-child init function */ + destroy /* destroy function */ }; +/* clang-format on */ /* Module initialization function */ static int mod_init(void)

1 0

git:master:2e341d4d: ndb_mongodb: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 2e341d4d89f228e4f6910c564c16fde1d9a64b1a URL: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T15:01:30+01:00 ndb_mongodb: add fixup_free* to exported functions --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… Patch: https://github.com/kamailio/kamailio/commit/2e341d4d89f228e4f6910c564c16fde… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index 46cb8ec5045..6babeeaccd6 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -50,6 +50,7 @@ static int w_mongodb_cmd_simple(sip_msg_t *msg, char *ssrv, char *sdname, static int w_mongodb_cmd(sip_msg_t *msg, char *ssrv, char *sdname, char *scname, char *scmd, char *sres); static int fixup_mongodb_cmd(void **param, int param_no); +static int fixup_free_mongodb_cmd(void **param, int param_no); static int w_mongodb_free_reply(struct sip_msg *msg, char *res); static int w_mongodb_next_reply(struct sip_msg *msg, char *res); @@ -69,17 +70,17 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[] = { {"mongodb_find", (cmd_function)w_mongodb_find, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, + fixup_mongodb_cmd, fixup_free_mongodb_cmd, ANY_ROUTE}, {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, - fixup_spve_null, 0, ANY_ROUTE}, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -250,6 +251,11 @@ static int fixup_mongodb_cmd(void **param, int param_no) return fixup_spve_null(param, 1); } +static int fixup_free_mongodb_cmd(void **param, int param_no) +{ + return fixup_free_spve_null(param, 1); +} + /** * */

1 0

git:master:e5c7b4ea: ndb_mongodb: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: e5c7b4ea8246f11815ab49fa0219ce2a7be3dd65 URL: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:59:53+01:00 ndb_mongodb: reformat exported structures --- Modified: src/modules/ndb_mongodb/ndb_mongodb_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… Patch: https://github.com/kamailio/kamailio/commit/e5c7b4ea8246f11815ab49fa0219ce2… --- diff --git a/src/modules/ndb_mongodb/ndb_mongodb_mod.c b/src/modules/ndb_mongodb/ndb_mongodb_mod.c index a778a492f38..46cb8ec5045 100644 --- a/src/modules/ndb_mongodb/ndb_mongodb_mod.c +++ b/src/modules/ndb_mongodb/ndb_mongodb_mod.c @@ -60,44 +60,48 @@ static int pv_get_mongodb( struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int pv_parse_mongodb_name(pv_spec_p sp, str *in); +/* clang-format off */ static pv_export_t mod_pvs[] = { - {{"mongodb", sizeof("mongodb") - 1}, PVT_OTHER, pv_get_mongodb, 0, - pv_parse_mongodb_name, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; - - -static cmd_export_t cmds[] = {{"mongodb_find", (cmd_function)w_mongodb_find, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, - fixup_mongodb_cmd, 0, ANY_ROUTE}, - {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, fixup_mongodb_cmd, 0, - ANY_ROUTE}, - {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, fixup_spve_null, - 0, ANY_ROUTE}, - {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, fixup_spve_null, - 0, ANY_ROUTE}, - {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, - {0, 0, 0, 0, 0, 0}}; + {{"mongodb", sizeof("mongodb") - 1}, PVT_OTHER, pv_get_mongodb, 0, + pv_parse_mongodb_name, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; + +static cmd_export_t cmds[] = { + {"mongodb_find", (cmd_function)w_mongodb_find, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_find_one", (cmd_function)w_mongodb_find_one, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_cmd_simple", (cmd_function)w_mongodb_cmd_simple, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_cmd", (cmd_function)w_mongodb_cmd, 5, + fixup_mongodb_cmd, 0, ANY_ROUTE}, + {"mongodb_free", (cmd_function)w_mongodb_free_reply, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"mongodb_next", (cmd_function)w_mongodb_next_reply, 1, + fixup_spve_null, 0, ANY_ROUTE}, + {"bind_ndb_mongodb", (cmd_function)bind_ndb_mongodb, 0, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)mongodb_srv_param}, - {0, 0, 0}}; + {"server", PARAM_STRING | PARAM_USE_FUNC, (void *)mongodb_srv_param}, + {0, 0, 0} +}; struct module_exports exports = { - "ndb_mongodb", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /*��exported��functions��*/ - params, /*��exported��params��*/ - 0, /*��exported��RPC��methods��*/ - mod_pvs, /* exported pseudo-variables */ - 0, /* response function */ - 0, /* module��initialization��function */ - child_init, /* per child init function */ - mod_destroy /* destroy function */ + "ndb_mongodb", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /*��exported��functions��*/ + params, /*��exported��params��*/ + 0, /*��exported��RPC��methods��*/ + mod_pvs, /* exported pseudo-variables */ + 0, /* response function */ + 0, /* module��initialization��function */ + child_init, /* per child init function */ + mod_destroy /* destroy function */ }; - +/* clang-format on */ /* each child get a new connection to the database */ static int child_init(int rank)

1 0

git:master:a166327a: ndb_redis: add fixup_free* to exported functions
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a166327a4fbd77a71f88085474eba85fe7ebdf32 URL: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:56:22+01:00 ndb_redis: add fixup_free* to exported functions --- Modified: src/modules/ndb_redis/ndb_redis_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… Patch: https://github.com/kamailio/kamailio/commit/a166327a4fbd77a71f88085474eba85… --- diff --git a/src/modules/ndb_redis/ndb_redis_mod.c b/src/modules/ndb_redis/ndb_redis_mod.c index 13b188ee266..c3ac9eb3cfa 100644 --- a/src/modules/ndb_redis/ndb_redis_mod.c +++ b/src/modules/ndb_redis/ndb_redis_mod.c @@ -77,6 +77,7 @@ static int w_redis_pipe_cmd5(struct sip_msg *msg, char *ssrv, char *scmd, static int w_redis_pipe_cmd6(struct sip_msg *msg, char *ssrv, char *scmd, char *sargv1, char *sargv2, char *sargv3, char *sres); static int fixup_redis_cmd6(void **param, int param_no); +static int fixup_free_redis_cmd6(void **param, int param_no); static int w_redis_execute(struct sip_msg *msg, char *ssrv); static int w_redis_free_reply(struct sip_msg *msg, char *res); @@ -103,28 +104,27 @@ static pv_export_t mod_pvs[] = { {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; - static cmd_export_t cmds[] = { {"redis_cmd", (cmd_function)w_redis_cmd3, 3, - fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd4, 4, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd5, 5, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_cmd", (cmd_function)w_redis_cmd6, 6, fixup_redis_cmd6, 0, - ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, fixup_redis_cmd6, - 0, ANY_ROUTE}, - {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, fixup_redis_cmd6, - 0, ANY_ROUTE}, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_cmd", (cmd_function)w_redis_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd3, 3, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd4, 4, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd5, 5, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, + {"redis_pipe_cmd", (cmd_function)w_redis_pipe_cmd6, 6, + fixup_redis_cmd6, fixup_free_redis_cmd6, ANY_ROUTE}, {"redis_execute", (cmd_function)w_redis_execute, 1, fixup_redis_cmd6, 0, ANY_ROUTE}, - {"redis_free", (cmd_function)w_redis_free_reply, 1, fixup_spve_null, 0, - ANY_ROUTE}, + {"redis_free", (cmd_function)w_redis_free_reply, 1, + fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {"bind_ndb_redis", (cmd_function)bind_ndb_redis, 0, 0, 0, 0}, @@ -562,6 +562,10 @@ static int fixup_redis_cmd6(void **param, int param_no) return fixup_spve_null(param, 1); } +static int fixup_free_redis_cmd6(void **param, int param_no) +{ + return fixup_free_spve_null(param, 1); +} /** *

1 0

git:master:793a494f: outbound: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 793a494f5b23f2ef5e82664924c3bed3893105bb URL: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:42+01:00 outbound: reformat exported structures --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… Patch: https://github.com/kamailio/kamailio/commit/793a494f5b23f2ef5e82664924c3bed… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 3ca15b38bdd..f64e2dfbe28 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -61,25 +61,32 @@ static unsigned int ob_force_no_flag = (unsigned int)-1; static str ob_key = {0, 0}; static str flow_token_secret = {0, 0}; +/* clang-format off */ static cmd_export_t cmds[] = { - {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, {0, 0, 0, 0, 0, 0}}; + {"bind_ob", (cmd_function)bind_ob, 1, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"force_outbound_flag", PARAM_INT, &ob_force_flag}, - {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, - {"flow_token_secret", PARAM_STRING, &flow_token_secret}, {0, 0, 0}}; + {"force_outbound_flag", PARAM_INT, &ob_force_flag}, + {"force_no_outbound_flag", PARAM_INT, &ob_force_no_flag}, + {"flow_token_secret", PARAM_STRING, &flow_token_secret}, + {0, 0, 0} +}; struct module_exports exports = { - "outbound", DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* exported functions */ - params, /* exported parameters */ - 0, /* exported��RPC��methods */ - 0, /* exported pseudo-variables */ - 0, /* response��function */ - mod_init, /* module initialization function */ - 0, /* per-child initialization function */ - destroy /* destroy function */ + "outbound", + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + 0, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + destroy /* module destroy function */ }; +/* clang-format on */ static void mod_init_openssl(void) {

1 0

git:master:67d6825c: nsq: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 67d6825cfac11efbb94bcab67c137beb84188187 URL: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:42+01:00 nsq: reformat exported structures --- Modified: src/modules/nsq/nsq_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… Patch: https://github.com/kamailio/kamailio/commit/67d6825cfac11efbb94bcab67c137be… --- diff --git a/src/modules/nsq/nsq_mod.c b/src/modules/nsq/nsq_mod.c index 94127ef4cbc..63ffe78482a 100644 --- a/src/modules/nsq/nsq_mod.c +++ b/src/modules/nsq/nsq_mod.c @@ -30,25 +30,40 @@ #include "nsq_mod.h" MODULE_VERSION - +/* clang-format off */ static pv_export_t nsq_mod_pvs[] = { - {{"nsqE", (sizeof("nsqE") - 1)}, PVT_OTHER, nsq_pv_get_event_payload, 0, - 0, 0, 0, 0}, - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; + {{"nsqE", (sizeof("nsqE") - 1)}, PVT_OTHER, nsq_pv_get_event_payload, 0, + 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0} +}; static param_export_t params[] = { - {"consumer_workers", PARAM_INT, &nsq_consumer_workers}, - {"max_in_flight", PARAM_INT, &nsq_max_in_flight}, - {"lookupd_address", PARAM_STR, &nsq_lookupd_address}, - {"lookupd_port", PARAM_INT, &lookupd_port}, - {"consumer_use_nsqd", PARAM_INT, - &consumer_use_nsqd}, // consume messages from nsqd instead of lookupd - {"topic_channel", PARAM_STRING | PARAM_USE_FUNC, - (void *)nsq_add_topic_channel}, - {"nsqd_address", PARAM_STR, &nsqd_address}, - {"nsqd_port", PARAM_INT, &nsqd_port}, - {"consumer_event_key", PARAM_STR, &nsq_event_key}, - {"consumer_event_subkey", PARAM_STR, &nsq_event_sub_key}, {0, 0, 0}}; + {"consumer_workers", PARAM_INT, &nsq_consumer_workers}, + {"max_in_flight", PARAM_INT, &nsq_max_in_flight}, + {"lookupd_address", PARAM_STR, &nsq_lookupd_address}, + {"lookupd_port", PARAM_INT, &lookupd_port}, + {"consumer_use_nsqd", PARAM_INT, &consumer_use_nsqd}, + {"topic_channel", PARAM_STRING | PARAM_USE_FUNC, (void *)nsq_add_topic_channel}, + {"nsqd_address", PARAM_STR, &nsqd_address}, + {"nsqd_port", PARAM_INT, &nsqd_port}, + {"consumer_event_key", PARAM_STR, &nsq_event_key}, + {"consumer_event_subkey", PARAM_STR, &nsq_event_sub_key}, + {0, 0, 0} +}; + +struct module_exports exports = { + "nsq", + DEFAULT_DLFLAGS, /* dlopen flags */ + 0, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + nsq_mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + mod_child_init, /* per-child init function */ + mod_destroy /* module destroy function */ +}; +/* clang-format on */ static void free_tc_list(nsq_topic_channel_t *tcl) { @@ -100,18 +115,6 @@ static int nsq_add_topic_channel(modparam_t type, void *val) return 0; } -struct module_exports exports = { - "nsq", DEFAULT_DLFLAGS, /* dlopen flags */ - 0, /* Exported functions */ - params, /* Exported parameters */ - 0, /* exported MI functions */ - nsq_mod_pvs, /* exported pseudo-variables */ - 0, /* response function*/ - mod_init, /* module initialization function */ - mod_child_init, /* per-child init function */ - mod_destroy /* destroy function */ -}; - static int fire_init_event(int rank) { struct sip_msg *fmsg;

1 0

git:master:57711e24: nosip: reformat exported structures
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 57711e24c83afa8e46d9c17730c610d0c17dd141 URL: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T14:50:41+01:00 nosip: reformat exported structures --- Modified: src/modules/nosip/nosip_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… Patch: https://github.com/kamailio/kamailio/commit/57711e24c83afa8e46d9c17730c610d… --- diff --git a/src/modules/nosip/nosip_mod.c b/src/modules/nosip/nosip_mod.c index e3e2232c440..78417e29100 100644 --- a/src/modules/nosip/nosip_mod.c +++ b/src/modules/nosip/nosip_mod.c @@ -53,30 +53,36 @@ static regex_t nosip_msg_match_regexp; static char *nosip_msg_skip = NULL; static regex_t nosip_msg_skip_regexp; +/* clang-format off */ +static cmd_export_t cmds[] = { + {0, 0, 0, 0, 0} +}; -static cmd_export_t cmds[] = {{0, 0, 0, 0, 0}}; - -static pv_export_t mod_pvs[] = {{{"nosip", (sizeof("nosip") - 1)}, /* */ - PVT_OTHER, pv_get_nosip, 0, 0, 0, 0, 0}, - - {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; +static pv_export_t mod_pvs[] = { + {{"nosip", (sizeof("nosip") - 1)}, + PVT_OTHER, pv_get_nosip, 0, 0, 0, 0, 0}, + {{0, 0}, 0, 0, 0, 0, 0, 0, 0}}; -static param_export_t params[] = {{"msg_match", PARAM_STRING, &nosip_msg_match}, - {"msg_skip", PARAM_STRING, &nosip_msg_skip}, {0, 0, 0}}; +static param_export_t params[] = { + {"msg_match", PARAM_STRING, &nosip_msg_match}, + {"msg_skip", PARAM_STRING, &nosip_msg_skip}, + {0, 0, 0} +}; /** module exports */ struct module_exports exports = { - "nosip", /* module name */ - DEFAULT_DLFLAGS, /* dlopen flags */ - cmds, /* cmd (cfg function) exports */ - params, /* param exports */ - 0, /* RPC method exports */ - mod_pvs, /* pseudo-variables exports */ - 0, /* response handling function */ - mod_init, /* module init function */ - 0, /* per-child init function */ - 0 /* module destroy function */ + "nosip", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* RPC method exports */ + mod_pvs, /* exported pseudo-variables */ + 0, /* response handling function */ + mod_init, /* module initialization function */ + 0, /* per-child init function */ + 0 /* module destroy function */ }; +/* clang-format on */ /** *

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Ok, i' ll see how to integrate lynx then. Currently, the target `modname_doc` will produce all forms in the build directory iirc, and then it would copy it to the `src/modules/module_name/docs` directory. (even though I opted to comment the copy command to not pollute the source files. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282843(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

I see `output_dir` in the makefile for the docbooks, not for the code building: ``` doc/docbook/Makefile 39:output_dir ?= . ``` The variant with lynx has to be there, many doc generation scripts running on server rely on it, being also very common on linux distros and we know how the output is generated. We can experiment more with pandoc in the future. Are now different make targets (or some defines) to generate the text readme and the html readme? I could notice the `modname_doc` (e.g., `acc_doc`) -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282713(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Xenofon Karamanos 12 Dec '24

12 Dec '24

The `pandoc` was an alternative I found that could achieve what `lynx` did for the text generation, since `lynx` is technically a text web-browser. Pandoc offers more forms to transform if needed, but of course, we can fall back on' Lynx' if it doesn't fit our needs or it's too slow. The `outpit_dir` is specific for docs or for the whole build? I -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150282373(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

@xkaraman: can the use of `pandoc` be made optional? What is the benefit of using it? The old makefiles needed only `xsltproc` (and `lynx` for text readme generation) and it seemed enough. Also, the generation of the html readmes for modules on the website is done the same way. Important it would be to support the output directory, like: ``` make output_dir=/tmp/kamailio-docs exclude_modules="" modules-doc ``` The above command generates all html files for modules' readmes and place them in /tmp/kamailio-docs. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150281498(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Yeah, looking into it. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280974(a)github.com>

1 0

Re: [kamailio/kamailio] cmake: Add kamailio_docs target to all if BUILD_DOC is ON (f24eed8)
by Victor Seva 12 Dec '24

12 Dec '24

@xkaraman this change broke the build ``` cmake --build /home/runner/work/kamailio/kamailio/build -j8 [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc.c.o [ 0%] Building C object src/modules/acc/CMakeFiles/acc.dir/acc_cdr.c.o gmake[2]: *** No rule to make target 'src/modules/xprint_doc', needed by 'src/modules/CMakeFiles/kamailio_docs'. Stop. [ 0%] Generating cfg.tab.c and cfg.tab.h from cfg.y gmake[1]: *** [CMakeFiles/Makefile2:3444: src/modules/CMakeFiles/kamailio_docs.dir/all] Error 2 [ 0%] Building C object src/modules/alias_db/CMakeFiles/alias_db.dir/alias_db.c.o gmake[1]: *** Waiting for unfinished jobs.... ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/commit/f24eed8ba01870361d916844a073df71cbc9e609/150280924(a)github.com>

1 0

git:master:92f899f3: pua_dialoginfo: rename short global variable
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 92f899f3689f0f0b291590e82e61751b76b2539c URL: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T12:25:35+01:00 pua_dialoginfo: rename short global variable --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… Patch: https://github.com/kamailio/kamailio/commit/92f899f3689f0f0b291590e82e61751… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 86febe2d1bd..26883cc27ad 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -76,7 +76,7 @@ MODULE_VERSION */ /* #define PUA_DIALOGINFO_DEBUG 1 */ -pua_api_t pua; +pua_api_t _pua_api; struct dlg_binds dlg_api; @@ -1063,15 +1063,15 @@ static int mod_init(void) return -1; } - if(bind_pua(&pua) < 0) { + if(bind_pua(&_pua_api) < 0) { LM_ERR("Can't bind pua\n"); return -1; } - if(pua.send_publish == NULL) { + if(_pua_api.send_publish == NULL) { LM_ERR("Could not import send_publish\n"); return -1; } - pua_send_publish = pua.send_publish; + pua_send_publish = _pua_api.send_publish; /* bind to the dialog API */ if(load_dlg_api(&dlg_api) != 0) {

1 0

git:master:f24eed8b: cmake: Add kamailio_docs target to all if BUILD_DOC is ON
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: f24eed8ba01870361d916844a073df71cbc9e609 URL: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Add kamailio_docs target to all if BUILD_DOC is ON --- Modified: cmake/modules_docs.cmake Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7… Patch: https://github.com/kamailio/kamailio/commit/f24eed8ba01870361d916844a073df7…

1 0

git:master:21bdc234: cmake: Fix double $ typo. Fixes building with ninja
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 21bdc234e219db83e085b055d4f81cb3ff63193d URL: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:20:35Z cmake: Fix double $ typo. Fixes building with ninja --- Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… Patch: https://github.com/kamailio/kamailio/commit/21bdc234e219db83e085b055d4f81cb… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index a927c1ee627..e651bb88c8b 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -11,7 +11,7 @@ message(STATUS "Temporary kamctl.{db} files in : ${KAMCTL_TMP_DIR}") file(MAKE_DIRECTORY ${KAMCTL_TMP_DIR}) set(BIN_DIR "${CMAKE_INSTALL_FULL_SBINDIR}") -set(LIB_DIR "$${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") +set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/${MAIN_NAME}/kamctl") set(CFG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${MAIN_NAME}") set(SHARE_DIR "${CMAKE_INSTALL_FULL_DATADIR}/${MAIN_NAME}")

1 0

git:master:170ddcca: cmake: Add option to not use git to gather commit info
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 170ddcca96b3ee11f4daed1592f0cee9c753db2b URL: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:19:48Z cmake: Add option to not use git to gather commit info --- Modified: src/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… Patch: https://github.com/kamailio/kamailio/commit/170ddcca96b3ee11f4daed1592f0cee… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 30f80f0db32..2b02f33098f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -24,9 +24,13 @@ include(${CMAKE_SOURCE_DIR}/cmake/defs.cmake) # ----------------------- # The following produces core/autover.h Find Git +option(USE_GIT "Use git to get commit information" ON) find_package(Git QUIET) -if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git") +if(USE_GIT + AND GIT_FOUND + AND EXISTS "${PROJECT_SOURCE_DIR}/.git" +) execute_process( COMMAND ${GIT_EXECUTABLE} rev-parse --verify --short=6 HEAD WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

1 0

git:master:ac74fd01: cmake: Generete parser files in build folder
by Xenofon Karamanos 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: ac74fd01fade29b433eb45966a0ed5e222614318 URL: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2024-12-12T11:19:48Z cmake: Generete parser files in build folder --- Modified: src/CMakeLists.txt Modified: src/core/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… Patch: https://github.com/kamailio/kamailio/commit/ac74fd01fade29b433eb45966a0ed5e… --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 867f7508f26..30f80f0db32 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -70,8 +70,9 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.20) cmake_policy(SET CMP0118 NEW) else() set_source_files_properties( - ${CMAKE_SOURCE_DIR}/src/core/lex.yy.c ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.c - ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.h PROPERTIES GENERATED TRUE + ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.h PROPERTIES GENERATED TRUE ) endif() # ----------------------- @@ -98,9 +99,11 @@ add_subdirectory(modules) # from their own CMakeLists.txt # Module subdiretory does not contribute to the Kamailio executable. target_sources( - kamailio PRIVATE ${kamailio_SRC_FILES} ${CMAKE_SOURCE_DIR}/src/core/lex.yy.c - ${CMAKE_SOURCE_DIR}/src/core/cfg.tab.c + kamailio + PRIVATE ${kamailio_SRC_FILES} ${CMAKE_CURRENT_BINARY_DIR}/core/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/core/cfg.tab.c ) +target_include_directories(kamailio PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/core) # Debuggng the sources of kamailio executable. # get_property( diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index e72cca6fa61..cbda772884a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -20,19 +20,19 @@ find_package(BISON REQUIRED) # Generate lex.yy.c from cfg.lex add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c - COMMAND ${FLEX_EXECUTABLE} -o ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c + COMMAND ${FLEX_EXECUTABLE} -o ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c ${CMAKE_CURRENT_SOURCE_DIR}/cfg.lex DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cfg.lex - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h COMMENT "Generating lex.yy.c from cfg.lex" ) # Generate cfg.tab.c and cfg.tab.h from cfg.y add_custom_command( - OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h - COMMAND ${BISON_EXECUTABLE} -d -b cfg -o ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h + COMMAND ${BISON_EXECUTABLE} -d -b cfg -o ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c ${CMAKE_CURRENT_SOURCE_DIR}/cfg.y DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/cfg.y COMMENT "Generating cfg.tab.c and cfg.tab.h from cfg.y" @@ -41,9 +41,9 @@ add_custom_command( # Add custom target for generating the 3 source files mentioned above add_custom_target( GenerateParser ALL - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/lex.yy.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.c - ${CMAKE_CURRENT_SOURCE_DIR}/cfg.tab.h + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/lex.yy.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.c + ${CMAKE_CURRENT_BINARY_DIR}/cfg.tab.h COMMENT "Generating parser source files" )

1 0

git:master:a557b186: pre-commit: cmake-format and cmake-lint hooks [skip ci]
by Victor Seva 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: a557b186fed55d6a0fdba78f0e59a634df569ff9 URL: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-12-12T11:21:16+01:00 pre-commit: cmake-format and cmake-lint hooks [skip ci] --- Modified: .pre-commit-config.yaml --- Diff: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… Patch: https://github.com/kamailio/kamailio/commit/a557b186fed55d6a0fdba78f0e59a63… --- diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7e8b8a8860a..7892175df39 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -11,4 +11,9 @@ repos: - repo: https://github.com/pre-commit/mirrors-clang-format rev: v15.0.7 hooks: - - id: clang-format + - id: clang-format + - repo: https://github.com/cheshirekow/cmake-format-precommit + rev: v0.6.13 + hooks: + - id: cmake-format + - id: cmake-lint

1 0

git:master:f385148f: core: use one strlen for mod_path
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: f385148ff68e2125a2111d9c506022519f17d1c9 URL: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T10:22:27+01:00 core: use one strlen for mod_path --- Modified: src/core/sr_module.c --- Diff: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… Patch: https://github.com/kamailio/kamailio/commit/f385148ff68e2125a2111d9c5060225… --- diff --git a/src/core/sr_module.c b/src/core/sr_module.c index 6d50f294389..f19a2d3812b 100644 --- a/src/core/sr_module.c +++ b/src/core/sr_module.c @@ -410,12 +410,14 @@ int ksr_locate_module(char *mod_path, char **new_path) int mdir_len; int path_type; int len; + int mod_path_len; *new_path = NULL; + mod_path_len = strlen(mod_path); path = mod_path; path_type = 0; modfile.s = path; - modfile.len = strlen(mod_path); + modfile.len = mod_path_len; modname.s = modfile.s; if(modfile.len > 3 && strcmp(modfile.s + modfile.len - 3, ".so") == 0) { path_type = 1; @@ -502,7 +504,7 @@ int ksr_locate_module(char *mod_path, char **new_path) if(path == 0) { /* try path <MODS_DIR>/mod_path - K compat */ path = (char *)pkg_malloc( - mdir_len + 1 /* "/" */ + strlen(mod_path) + 1); + mdir_len + 1 /* "/" */ + mod_path_len + 1); if(path == 0) { PKG_MEM_ERROR; goto error; @@ -513,8 +515,8 @@ int ksr_locate_module(char *mod_path, char **new_path) path[len] = '/'; len++; } - path[len] = 0; - strcat(path, mod_path); + memcpy(path + len, mod_path, mod_path_len); + path[len + mod_path_len] = 0; if(stat(path, &stat_buf) == -1) { LM_DBG("module file not found <%s>\n", path);

1 0

[kamailio/kamailio] segfault on t_next_contacts after adding additional contacts to $xavp(tm_contacts) (Issue #4063)
by Benoît Panizzon 12 Dec '24

12 Dec '24

### Description Goal: Build a destination set from multiple contacts gathered from multiple registered AoR. Situation: assumptions, observations: * lookup() returns success there are registered contacts for each AoR. * All contacts have same q value. * lookup() can only be called for one AoR, there is no way to call it for multiple AoR. * If lookup() is called multiple times, only the destination set gathered by the last invocation is preserved, all other ones are overwritten. * t_load_contacts() transfers the destination set into the $xavp(tm_contacts) but like lookup() initializes that So I am trying to find a way to store/collate all destination sets into one and parallel fork a call to all contacts from multiple AoR. Idea: Stack all contacts in $xavp(contact_stack) with the same structure as $xavp(tm_contacts) and append it to tm_contacts. xavp_rm("contact_stack"); # Make sure this is not defined. We are in a loop setting $var(lookupuri) to (sip:315996608@3cx-pbx.imp.ch and sip:315996608-1@157.161.4.181) { lookup("location", "$var(lookupuri)"); t_load_contacts(0); # Now $xavp(tm_contacts) is populated $xavp(contact_stack) = $xavp(tm_contacts); # Store contact set } xavp_rm("tm_contacts"); # Re Initialize tm_contacts to empty $xavp(tm_contacts) = $xavp(contact_stack); # Restore tm_contacts from stacked set. xlog("L_INFO", "$cfg(route): COUNT: $cnt($xavp(tm_contacts))\n"); # Make sure, the count matches what we expect. xlog("L_INFO", "$cfg(route): Before t_next_contacts\n"); t_next_contacts(); # Load destination set => CRASH! xlog("L_INFO", "$cfg(route): After t_next_contacts\n"); Log (some more infos logged I omitted in the example above) ``` Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Auth_aor_user[0] = 315996608 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Sigprofile[0] = local Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Lookupuri[0] = sip:315996608@3cx-pbx.imp.ch Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: LOOKUP sip:315996608@3cx-pbx.imp.ch SUCCESS!!!! Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Auth_aor_user[1] = 315996608-1 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Sigprofile[1] = local Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Lookupuri[1] = sip:315996608-1@157.161.4.181 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: LOOKUP sip:315996608-1@157.161.4.181 SUCCESS!!!! Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: ADD to tm_contacts Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: COUNT: 4 Dec 10 16:18:05 dev-cpereg01 kamailio[3964710]: INFO: [1 0618269314 128182546-3942836285-478214563(a)prt-cbl-sbc1.imp.ch 2 INVITE]<script>: LOCATION: Before t_next_contacts Dec 10 16:18:05 dev-cpereg01 kernel: [13747450.274883] traps: kamailio[3964710] general protection fault ip:55bc00e61f2b sp:7ffce62d7520 error:0 in kamailio[55bc00ba5000+457000] ``` #### Reproduction Code above with: version: kamailio 5.7.6 (x86_64/linux) from official kamailio repository on ubuntu jammy. #### Debugging Data If required, I can try to enable coredumps. #### Log Messages Shown above #### SIP Traffic Probably not needed. ### Possible Solutions None yet. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4063 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/4063(a)github.com>

3 4

git:master:3eb9e1d3: tm: check the type of contacts xavp value
by Daniel-Constantin Mierla 12 Dec '24

12 Dec '24

Module: kamailio Branch: master Commit: 3eb9e1d34988ebeba9d4526da8f4d804846a7316 URL: https://github.com/kamailio/kamailio/commit/3eb9e1d34988ebeba9d4526da8f4d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-12-12T09:18:17+01:00 tm: check the type of contacts xavp value - GH #4063 --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/3eb9e1d34988ebeba9d4526da8f4d80… Patch: https://github.com/kamailio/kamailio/commit/3eb9e1d34988ebeba9d4526da8f4d80… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 4697455413b..7566f2b4ac6 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -643,6 +643,11 @@ int ki_t_next_contacts(struct sip_msg *msg) LM_DBG("no contacts in contacts_avp - we are done!\n"); return -2; } + if(xavp_list->val.type != SR_XTYPE_XAVP) { + LM_ERR("invalid value type (%d) for contacts xavp\n", + xavp_list->val.type); + return -3; + } xavp = xavp_list;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2024