sr-dev February 2025

sr-dev@lists.kamailio.org

9 participants
163 discussions

git:master:b70ade3e: cmake: Generate version-create.mongo file and install it
by Xenofon Karamanos 03 Feb '25

03 Feb '25

Module: kamailio Branch: master Commit: b70ade3e636cec8c38f40c92ec6bab5e7486feee URL: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-02-03T08:56:59Z cmake: Generate version-create.mongo file and install it --- Added: utils/kamctl/generate_version_create_mongo.sh Modified: utils/kamctl/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… Patch: https://github.com/kamailio/kamailio/commit/b70ade3e636cec8c38f40c92ec6bab5… --- diff --git a/utils/kamctl/CMakeLists.txt b/utils/kamctl/CMakeLists.txt index ca8a4f20660..ad7ef141090 100644 --- a/utils/kamctl/CMakeLists.txt +++ b/utils/kamctl/CMakeLists.txt @@ -306,11 +306,11 @@ else() COMMENT "Cleaning ${db_name} schema files") endfunction() - # Add targets for each database type Pi framework targets should combined into - # one + # Add targets for each database type add_custom_target(dbschema COMMENT "Generating schemas for all dbs...") add_custom_target(dbschema_clean COMMENT "Cleaning schemas for all dbs...") + # Pi framework targets should combined into one if("xhttp_pi" IN_LIST FINAL_MODULES_LIST) add_db_target(pi_framework_table "${STYLESHEETS}/pi_framework_table.xsl") add_db_target(pi_framework_mod "${STYLESHEETS}/pi_framework_mod.xsl") @@ -361,6 +361,24 @@ else() add_db_target(mongodb "${STYLESHEETS}/mongodb.xsl") add_dependencies(dbschema dbschema_mongodb) add_dependencies(dbschema_clean dbschema_mongodb_clean) + # Create the version-create.mongo script + # After processing the JSON files, create the version-create.mongo script + # Usage of generate_version_create_mongo.sh: + # 1. The first argument is the path to create the version-create.mongo script + # 2. The second argument is the path to the directory containing the JSON files + add_custom_command( + TARGET dbschema_mongodb + POST_BUILD + COMMAND + bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_version_create_mongo.sh + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo" + "${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio" + COMMENT "Creating version-create.mongo from JSON files") + + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/mongodb/kamailio/version-create.mongo + DESTINATION ${CMAKE_INSTALL_DATADIR}/${MAIN_NAME}/mongodb/${MAIN_NAME} + COMPONENT KMONGODB) endif() if("db_redis" IN_LIST FINAL_MODULES_LIST) add_db_target(db_redis "${STYLESHEETS}/db_redis.xsl") diff --git a/utils/kamctl/generate_version_create_mongo.sh b/utils/kamctl/generate_version_create_mongo.sh new file mode 100644 index 00000000000..47048cc0962 --- /dev/null +++ b/utils/kamctl/generate_version_create_mongo.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +OUTPUT_FILE="$1" +JSON_DIR="$2" + +# Create the version-create.mongo file +echo "use kamailio;" > "$OUTPUT_FILE" +echo "db.createCollection(\"version\");" >> "$OUTPUT_FILE" + +for FILE in "$JSON_DIR"/*.json; do + if [ -f "$FILE" ]; then + if [ "$FILE" != "$JSON_DIR/version.json" ]; then + VN=$(grep '"version":' "$FILE" | grep -o -E '[0-9]+') + FN=$(basename "$FILE" .json) + echo "db.getCollection(\"version\").insert({ table_name: \"$FN\", table_version: NumberInt($VN) });" >> "$OUTPUT_FILE" + fi + fi +done \ No newline at end of file

1 0

git:master:e5f90cfc: dialog: use ksr_time_uint() for getting unsigned int time values
by Daniel-Constantin Mierla 02 Feb '25

02 Feb '25

Module: kamailio Branch: master Commit: e5f90cfce9d3ce13eada38cd1e058824d56b99df URL: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-02T17:10:37+01:00 dialog: use ksr_time_uint() for getting unsigned int time values --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/dlg_dmq.c Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… Patch: https://github.com/kamailio/kamailio/commit/e5f90cfce9d3ce13eada38cd1e05882… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 6e6bd93aabf..6871cc960e3 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -3323,8 +3323,8 @@ static void rpc_dlg_set_state(rpc_t *rpc, void *c) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && sval == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 18ecdcaa6c9..0f18be6e81d 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -437,13 +437,13 @@ int load_dialog_info_from_db( dlg->tl.timeout = (unsigned int)(VAL_INT(values + 9)); LM_DBG("db dialog timeout is %u (%u/%u)\n", dlg->tl.timeout, - get_ticks(), (unsigned int)time(0)); - if(dlg->tl.timeout <= (unsigned int)time(0)) { + get_ticks(), ksr_time_uint(NULL, NULL)); + if(dlg->tl.timeout <= ksr_time_uint(NULL, NULL)) { dlg->tl.timeout = 0; dlg->lifetime = 0; } else { dlg->lifetime = dlg->tl.timeout - dlg->start_ts; - dlg->tl.timeout -= (unsigned int)time(0); + dlg->tl.timeout -= ksr_time_uint(NULL, NULL); } GET_STR_VALUE(cseq1, values, 10, 1, 1); @@ -492,7 +492,7 @@ int load_dialog_info_from_db( if(dlg->state == DLG_STATE_DELETED) { /* end_ts used for force clean up not stored - set it to now */ - dlg->end_ts = (unsigned int)time(0); + dlg->end_ts = ksr_time_uint(NULL, NULL); } /*restore the timer values */ if(0 != insert_dlg_timer(&(dlg->tl), (int)dlg->tl.timeout)) { @@ -898,7 +898,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 9) = cell->start_ts; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 2, cell->callid); @@ -980,7 +980,7 @@ int update_dialog_dbinfo_unsafe(struct dlg_cell *cell) VAL_INT(values) = cell->h_entry; VAL_INT(values + 1) = cell->h_id; VAL_INT(values + 10) = cell->state; - VAL_INT(values + 11) = (unsigned int)((unsigned int)time(0) + VAL_INT(values + 11) = (unsigned int)(ksr_time_uint(NULL, NULL) + cell->tl.timeout - get_ticks()); SET_STR_VALUE(values + 12, cell->cseq[DLG_CALLER_LEG]); diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index bb8a69cffd6..6cd8d898762 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -349,7 +349,7 @@ int dlg_dmq_handle_msg( dlg->dflags |= DLG_FLAG_NEW; /* keep dialog around for a bit, to prevent out-of-order * syncs to reestablish the dlg */ - dlg->init_ts = time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); break; default: LM_ERR("unhandled state update to state %u\n", state); diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index a37adee49d2..58b0311bece 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -225,7 +225,7 @@ int dlg_clean_run(ticks_t ti) dlg_cell_t *dlg; dlg_cell_t *tdlg; - tm = (unsigned int)time(NULL); + tm = ksr_time_uint(NULL, NULL); for(i = 0; i < d_table->size; i++) { dlg_lock(d_table, &d_table->entries[i]); dlg = d_table->entries[i].first; @@ -474,7 +474,7 @@ struct dlg_cell *build_new_dlg( memset(dlg, 0, len); dlg->state = DLG_STATE_UNCONFIRMED; - dlg->init_ts = (unsigned int)time(NULL); + dlg->init_ts = ksr_time_uint(NULL, NULL); dlg->h_entry = core_hash(callid, 0, d_table->size); LM_DBG("new dialog on hash %u\n", dlg->h_entry);

1 0

git:master:7a73e08b: msrp: variable for extra headers used in local replies
by Daniel-Constantin Mierla 01 Feb '25

01 Feb '25

Module: kamailio Branch: master Commit: 7a73e08b0e5b4c3fbeb4f097c1f891d06c74651d URL: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-02-01T07:40:11+01:00 msrp: variable for extra headers used in local replies --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… Patch: https://github.com/kamailio/kamailio/commit/7a73e08b0e5b4c3fbeb4f097c1f891d… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index a1e79e84447..e1a378ee7ac 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -156,6 +156,7 @@ int msrp_cmap_save(msrp_frame_t *mf) char sbuf[MSRP_SBUF_SIZE]; str srcaddr; str srcsock; + str xhdrs; int msize; int expires; msrp_citem_t *it; @@ -172,16 +173,18 @@ int msrp_cmap_save(msrp_frame_t *mf) expires = msrp_auth_max_expires; if(expires < msrp_auth_min_expires) { LM_DBG("expires is lower than min value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", + xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Min-Expires: %d\r\n", msrp_auth_min_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr); + xhdrs.s = sbuf; + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); return -3; } if(expires > msrp_auth_max_expires) { LM_DBG("expires is greater than max value\n"); - srcaddr.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", + xhdrs.len = snprintf(sbuf, MSRP_SBUF_SIZE, "Max-Expires: %d\r\n", msrp_auth_max_expires); - msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &srcaddr); + msrp_reply(mf, &msrp_reply_423_code, &msrp_reply_423_text, &xhdrs); + xhdrs.s = sbuf; return -4; } if(msrp_frame_get_first_from_path(mf, &fpeer) < 0) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2025