sr-dev November 2023

sr-dev@lists.kamailio.org

15 participants
390 discussions

git:5.6:3a7afccf: rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error

by Victor Seva

Module: kamailio Branch: 5.6 Commit: 3a7afccf8db3936d46bcc1b190ea23c3b5d27447 URL: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2023-11-21T14:37:33+01:00 rabbitmq: backport of RABBITMQ_ERR_CREATE needed for handling allocation error (cherry picked from commit f764cef139d55adb5d38ffc6a1a65fd14bda5f4c) --- Modified: src/modules/rabbitmq/rabbitmq.h --- Diff: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… Patch: https://github.com/kamailio/kamailio/commit/3a7afccf8db3936d46bcc1b190ea23c… --- diff --git a/src/modules/rabbitmq/rabbitmq.h b/src/modules/rabbitmq/rabbitmq.h index 30f39ca7fd5..4eb31958643 100644 --- a/src/modules/rabbitmq/rabbitmq.h +++ b/src/modules/rabbitmq/rabbitmq.h @@ -49,6 +49,7 @@ typedef enum RABBITMQ_ERR_CHANNEL, RABBITMQ_ERR_QUEUE, RABBITMQ_ERR_PUBLISH, + RABBITMQ_ERR_CREATE, RABBITMQ_ERR_SOCK, RABBITMQ_ERR_CONSUME, RABBITMQ_ERR_NULL,

1 year, 2 months

git:master:1ded1730: mediaproxy: print to buffer with size limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1ded1730c7fe81596d874fdc314dab64a7dab25b URL: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T12:04:01+01:00 mediaproxy: print to buffer with size limit --- Modified: src/modules/mediaproxy/mediaproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… Patch: https://github.com/kamailio/kamailio/commit/1ded1730c7fe81596d874fdc314dab6… --- diff --git a/src/modules/mediaproxy/mediaproxy.c b/src/modules/mediaproxy/mediaproxy.c index 8b8d87616ad..782bc202893 100644 --- a/src/modules/mediaproxy/mediaproxy.c +++ b/src/modules/mediaproxy/mediaproxy.c @@ -1614,7 +1614,7 @@ static int use_media_proxy( if(session.supported_count == 0) return 1; // there are no supported media streams. we have nothing to do. - len = sprintf(media_str, "%s", "media: "); + len = snprintf(media_str, sizeof(media_str), "%s", "media: "); for(i = 0, str_buf.len = sizeof(media_str) - len - 2, str_buf.s = media_str + len; i < session.stream_count; i++) { @@ -1628,15 +1628,15 @@ static int use_media_proxy( (unsigned long)sizeof(media_str)); return -1; } - len = sprintf(str_buf.s, "%.*s:%.*s:%.*s:%.*s:%s,", stream.type.len, - stream.type.s, stream.ip.len, stream.ip.s, stream.port.len, - stream.port.s, stream.direction.len, stream.direction.s, - stream.has_ice ? "ice=yes" : "ice=no"); + len = snprintf(str_buf.s, str_buf.len, "%.*s:%.*s:%.*s:%.*s:%s,", + stream.type.len, stream.type.s, stream.ip.len, stream.ip.s, + stream.port.len, stream.port.s, stream.direction.len, + stream.direction.s, stream.has_ice ? "ice=yes" : "ice=no"); str_buf.s += len; str_buf.len -= len; } *(str_buf.s - 1) = 0; // remove the last comma - sprintf(str_buf.s - 1, "%s", "\r\n"); + snprintf(str_buf.s - 1, str_buf.len + 1, "%s", "\r\n"); } else { media_str[0] = 0; } @@ -1819,7 +1819,7 @@ static int use_media_proxy( : ice_data->priority; port = strtoint(&tokens[j]); candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 1 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority, tokens[0].len, tokens[0].s, port, session.separator.len, session.separator.s); @@ -1833,7 +1833,7 @@ static int use_media_proxy( if(stream.has_rtcp_ice) { candidate.s = buf; - candidate.len = sprintf(candidate.s, + candidate.len = snprintf(candidate.s, sizeof(buf), "a=candidate:R%x 2 UDP %u %.*s %i typ relay%.*s", hexip.s_addr, priority - 1, tokens[0].len, tokens[0].s, port + 1, session.separator.len, session.separator.s); @@ -2199,4 +2199,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_mediaproxy_exports); return 0; -} \ No newline at end of file +}

1 year, 2 months

git:master:7a2ad119: sms: print to buffer with size limit

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7a2ad1190553911770e3a78246ef037c6de49e5c URL: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:49:12+01:00 sms: print to buffer with size limit --- Modified: src/modules/sms/libsms_putsms.c --- Diff: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… Patch: https://github.com/kamailio/kamailio/commit/7a2ad1190553911770e3a78246ef037… --- diff --git a/src/modules/sms/libsms_putsms.c b/src/modules/sms/libsms_putsms.c index 1622a1bb0f5..a130d4acf6c 100644 --- a/src/modules/sms/libsms_putsms.c +++ b/src/modules/sms/libsms_putsms.c @@ -101,7 +101,8 @@ int binary2pdu(char *binary, int length, char *pdu) /* make the PDU string. The destination variable pdu has to be big enough. */ -int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) +int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu, + unsigned int pdu_size) { int coding; int flags; @@ -127,11 +128,11 @@ int make_pdu(struct sms_msg *msg, struct modem *mdm, char *pdu) flags += 16; // Validity field /* concatenate the first part of the PDU string */ if(mdm->mode == MODE_OLD) - pdu_len += sprintf(pdu, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, - tmp, coding, msg->text.len); - else - pdu_len += sprintf(pdu, "00%02X00%02X91%s00%02XA7%02X", flags, + pdu_len += snprintf(pdu, pdu_size, "%02X00%02X91%s00%02X%02X", flags, msg->to.len, tmp, coding, msg->text.len); + else + pdu_len += snprintf(pdu, pdu_size, "00%02X00%02X91%s00%02XA7%02X", + flags, msg->to.len, tmp, coding, msg->text.len); /* Create the PDU string of the message */ /* pdu_len += binary2pdu(msg->text.s,msg->text.len,pdu+pdu_len); */ pdu_len += @@ -180,20 +181,20 @@ int putsms(struct sms_msg *sms_messg, struct modem *mdm) int pdu_len; int sms_id; - pdu_len = make_pdu(sms_messg, mdm, pdu); + pdu_len = make_pdu(sms_messg, mdm, pdu, 500); if(mdm->mode == MODE_OLD) - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2); else if(mdm->mode == MODE_ASCII) - clen = sprintf(command, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, + clen = snprintf(command, 500, "AT+CMGS=\"+%.*s\"\r", sms_messg->to.len, sms_messg->to.s); else - clen = sprintf(command, "AT+CMGS=%i\r", pdu_len / 2 - 1); + clen = snprintf(command, 500, "AT+CMGS=%i\r", pdu_len / 2 - 1); if(mdm->mode == MODE_ASCII) - clen2 = sprintf( - command2, "%.*s\x1A", sms_messg->text.len, sms_messg->text.s); + clen2 = snprintf(command2, 500, "%.*s\x1A", sms_messg->text.len, + sms_messg->text.s); else - clen2 = sprintf(command2, "%.*s\x1A", pdu_len, pdu); + clen2 = snprintf(command2, 500, "%.*s\x1A", pdu_len, pdu); sms_id = 0; for(err_code = 0, retries = 0; err_code < 2 && retries < mdm->retry;

1 year, 2 months

git:master:20b690a3: topos: open db connection in mod init only when checking table version

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 20b690a31ee0d3fbaa86fdf87790d842a982bcf5 URL: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:36:10+01:00 topos: open db connection in mod init only when checking table version --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… Patch: https://github.com/kamailio/kamailio/commit/20b690a31ee0d3fbaa86fdf87790d84… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 40133099bf4..440936f294c 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -79,6 +79,9 @@ db_func_t _tpsdbf; /* sruid to get internal uid */ sruid_t _tps_sruid; +extern str tt_table_name; +extern str td_table_name; + /** module parameters */ static str _tps_db_url = str_init(DEFAULT_DB_URL); int _tps_param_mask_callid = 0; @@ -259,26 +262,24 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } - topos_db_con = _tpsdbf.init(&_tps_db_url); - if(topos_db_con == NULL) { - LM_ERR("failed to open database connection\n"); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &td_table_name, TD_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(td_table_name); - goto dberror; - } - if(_tps_version_table_check != 0 - && db_check_table_version(&_tpsdbf, topos_db_con, - &tt_table_name, TT_TABLE_VERSION) - < 0) { - DB_TABLE_VERSION_ERROR(tt_table_name); - goto dberror; - } - if(topos_db_con) { + if(_tps_version_table_check != 0) { + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } _tpsdbf.close(topos_db_con); topos_db_con = NULL; } diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 65d2c5d8be9..4c2585a1ff6 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,8 +85,6 @@ typedef struct tps_data int32_t expires; } tps_data_t; -extern str tt_table_name; -extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 year, 2 months

git:master:650117eb: modules: readme files regenerated - topos ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 650117ebc0a3e0369dd47015f7e96358515fedc9 URL: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-11-21T11:32:12+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… Patch: https://github.com/kamailio/kamailio/commit/650117ebc0a3e0369dd47015f7e9635… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index ad13698a204..70af19ae47e 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -52,6 +52,7 @@ Frederic Gaisnon 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -87,11 +88,12 @@ Frederic Gaisnon 1.19. Set methods_nocontact parameter 1.20. Set header_mode parameter 1.21. Set methods_noinitial parameter - 1.22. tps_set_context usage - 1.23. Usage of event_route[topos:msg-outgoing] - 1.24. Usage of event_route[topos:msg-sending] - 1.25. Usage of event_route[topos:msg-incoming] - 1.26. Usage of event_route[topos:msg-receiving] + 1.22. version_table parameter usage + 1.23. tps_set_context usage + 1.24. Usage of event_route[topos:msg-outgoing] + 1.25. Usage of event_route[topos:msg-sending] + 1.26. Usage of event_route[topos:msg-incoming] + 1.27. Usage of event_route[topos:msg-receiving] Chapter 1. Admin Guide @@ -126,6 +128,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 4. Functions @@ -202,6 +205,7 @@ Chapter 1. Admin Guide 3.19. methods_nocontact (str) 3.20. header_mode (int) 3.21. methods_noinitial (str) + 3.22. version_table (integer) 3.1. storage (str) @@ -526,6 +530,17 @@ modparam("topos", "header_mode", 1) modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") ... +3.22. version_table (integer) + + If set to 0, the module will skip checking the version of the tables. + + Default value is ��1 (check for table version)��. + + Example 1.22. version_table parameter usage +... +modparam("topos", "version_table", 0) +... + 4. Functions 4.1. tps_set_context(ctx) @@ -537,7 +552,7 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") This function can be used from ANY_ROUTE. - Example 1.22. tps_set_context usage + Example 1.23. tps_set_context usage ... request_route { ... @@ -565,7 +580,7 @@ request_route { reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.23. Usage of event_route[topos:msg-outgoing] + Example 1.24. Usage of event_route[topos:msg-outgoing] ... event_route[topos:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -584,7 +599,7 @@ event_route[topos:msg-outgoing] { $sndto(proto) point to the destination. The SIP message is the one to be sent out. - Example 1.24. Usage of event_route[topos:msg-sending] + Example 1.25. Usage of event_route[topos:msg-sending] ... event_route[topos:msg-sending] { if(is_request() and $fU=="alice") { @@ -604,7 +619,7 @@ event_route[topos:msg-sending] { internally generated one at startup, to avoid reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.25. Usage of event_route[topos:msg-incoming] + Example 1.26. Usage of event_route[topos:msg-incoming] ... event_route[topos:msg-incoming] { if($si=="10.1.1.10") { @@ -622,7 +637,7 @@ event_route[topos:msg-incoming] { Inside the event route the variables $si, $sp and $proto point to the source address. The SIP message is the one to be sent out. - Example 1.26. Usage of event_route[topos:msg-receiving] + Example 1.27. Usage of event_route[topos:msg-receiving] ... event_route[topos:msg-receiving] { if(is_request() and $fU=="alice") {

1 year, 2 months

[kamailio/kamailio] topos: Add db version check (PR #3639)

by Xenofon Karamanos

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add a database version check and fail gracefully if it does not match. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3639 -- Commit Summary -- * topos: Add db version check -- File Changes -- M src/modules/topos/topos_mod.c (26) M src/modules/topos/tps_storage.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3639.patch https://github.com/kamailio/kamailio/pull/3639.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3639 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3639(a)github.com>

1 year, 2 months

git:master:dab123bf: topos: Add version_table documentation

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dab123bf9c19bbd67eab05cbadf9efea5682c0dc URL: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table documentation --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… Patch: https://github.com/kamailio/kamailio/commit/dab123bf9c19bbd67eab05cbadf9efe… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 441c099d8ec..4ccc4b7790f 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -600,6 +600,23 @@ modparam("topos", "methods_noinitial", "OPTIONS,NOTIFY") </programlisting> </example> </section> + <section id="topos.p.version_table"> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version of the tables. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("topos", "version_table", 0) +... + </programlisting> + </example> + </section> </section> <section>

1 year, 2 months

git:master:356f4f9e: topos: Add version_table parameter

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 356f4f9e1319ecfdede4b46f636de3143b85ca5e URL: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add version_table parameter --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… Patch: https://github.com/kamailio/kamailio/commit/356f4f9e1319ecfdede4b46f636de31… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index d7efd055535..40133099bf4 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -104,6 +104,9 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_RECEIVING 8 #define TT_TABLE_VERSION 2 #define TD_TABLE_VERSION 2 + +static int _tps_version_table_check = 1; + static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -177,6 +180,7 @@ static param_export_t params[] = {{"storage", PARAM_STR, &_tps_storage}, {"context", PARAM_STR, &_tps_context_param}, {"methods_nocontact", PARAM_STR, &_tps_methods_nocontact_list}, {"methods_noinitial", PARAM_STR, &_tps_methods_noinitial_list}, + {"version_table", INT_PARAM, &_tps_version_table_check}, {0, 0, 0}}; @@ -260,15 +264,17 @@ static int mod_init(void) LM_ERR("failed to open database connection\n"); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &td_table_name, TD_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(td_table_name); goto dberror; } - if(db_check_table_version( - &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) - < 0) { + if(_tps_version_table_check != 0 + && db_check_table_version(&_tpsdbf, topos_db_con, + &tt_table_name, TT_TABLE_VERSION) + < 0) { DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; }

1 year, 2 months

git:master:132a0024: topos: Close db connection

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 132a0024394494da8766c31c94f42822c79a0a51 URL: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Close db connection --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… Patch: https://github.com/kamailio/kamailio/commit/132a0024394494da8766c31c94f4282… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 3d570953cff..d7efd055535 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -272,6 +272,10 @@ static int mod_init(void) DB_TABLE_VERSION_ERROR(tt_table_name); goto dberror; } + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len,

1 year, 2 months

git:master:c0639031: topos: Add db version check

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c06390319a7afcca498a4a72cdcd0c11b7bb2ff2 URL: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-11-21T11:22:14+01:00 topos: Add db version check --- Modified: src/modules/topos/topos_mod.c Modified: src/modules/topos/tps_storage.h --- Diff: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… Patch: https://github.com/kamailio/kamailio/commit/c06390319a7afcca498a4a72cdcd0c1… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 4540382b725..3d570953cff 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -102,6 +102,8 @@ int _tps_clean_interval = 60; #define TPS_EVENTRT_SENDING 2 #define TPS_EVENTRT_INCOMING 4 #define TPS_EVENTRT_RECEIVING 8 +#define TT_TABLE_VERSION 2 +#define TD_TABLE_VERSION 2 static int _tps_eventrt_mode = TPS_EVENTRT_OUTGOING | TPS_EVENTRT_SENDING | TPS_EVENTRT_INCOMING | TPS_EVENTRT_RECEIVING; static int _tps_eventrt_outgoing = -1; @@ -198,6 +200,7 @@ struct module_exports exports = { */ static int mod_init(void) { + db1_con_t *topos_db_con = NULL; _tps_eventrt_outgoing = route_lookup(&event_rt, _tps_eventrt_outgoing_name.s); if(_tps_eventrt_outgoing < 0 @@ -252,6 +255,23 @@ static int mod_init(void) "provide all functions needed\n"); return -1; } + topos_db_con = _tpsdbf.init(&_tps_db_url); + if(topos_db_con == NULL) { + LM_ERR("failed to open database connection\n"); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &td_table_name, TD_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(td_table_name); + goto dberror; + } + if(db_check_table_version( + &_tpsdbf, topos_db_con, &tt_table_name, TT_TABLE_VERSION) + < 0) { + DB_TABLE_VERSION_ERROR(tt_table_name); + goto dberror; + } } else { if(_tps_storage.len != 7 && strncmp(_tps_storage.s, "redis", 5) != 0) { LM_ERR("unknown storage type: %.*s\n", _tps_storage.len, @@ -303,6 +323,12 @@ static int mod_init(void) return 0; error: return -1; +dberror: + if(topos_db_con) { + _tpsdbf.close(topos_db_con); + topos_db_con = NULL; + } + return -1; } /** diff --git a/src/modules/topos/tps_storage.h b/src/modules/topos/tps_storage.h index 4c2585a1ff6..65d2c5d8be9 100644 --- a/src/modules/topos/tps_storage.h +++ b/src/modules/topos/tps_storage.h @@ -85,6 +85,8 @@ typedef struct tps_data int32_t expires; } tps_data_t; +extern str tt_table_name; +extern str td_table_name; int tps_storage_dialog_find(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_save(sip_msg_t *msg, tps_data_t *td); int tps_storage_dialog_rm(sip_msg_t *msg, tps_data_t *td);

1 year, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
39
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