sr-dev October 2024

sr-dev@lists.kamailio.org

14 participants
112 discussions

git:master:9fb15e2e: siptrace: use advertise address if set for trace mode 1 callbacks
by Daniel-Constantin Mierla 09 Oct '24

09 Oct '24

Module: kamailio Branch: master Commit: 9fb15e2ef93a0d606fa4c6d695a2f13a4b0a8031 URL: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-10-09T19:51:27+02:00 siptrace: use advertise address if set for trace mode 1 callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… Patch: https://github.com/kamailio/kamailio/commit/9fb15e2ef93a0d606fa4c6d695a2f13… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 208718adf0d..31609821682 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -2308,15 +2308,26 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.fromip.s = sto.fromip_buff; } - sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", - siptrace_proto_name(nd->rcv->proto), ip_addr2strz(&nd->rcv->dst_ip), - (int)nd->rcv->dst_port); - if(sto.toip.len < 0 || sto.toip.len >= SIPTRACE_ADDR_MAX) { - LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); - sto.toip.s = SIPTRACE_ANYADDR; - sto.toip.len = SIPTRACE_ANYADDR_LEN; - } else { + if(nd->rcv->bind_address != NULL + && nd->rcv->bind_address->useinfo.sock_str.len > 0 + && (nd->rcv->bind_address->useinfo.sock_str.len + < SIPTRACE_ADDR_MAX - 1)) { + sto.toip.len = nd->rcv->bind_address->useinfo.sock_str.len; + memcpy(sto.toip_buff, nd->rcv->bind_address->useinfo.sock_str.s, + sto.toip.len); + sto.toip_buff[sto.toip.len] = '\0'; sto.toip.s = sto.toip_buff; + } else { + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(nd->rcv->proto), + ip_addr2strz(&nd->rcv->dst_ip), (int)nd->rcv->dst_port); + if(sto.toip.len < 0 || sto.toip.len >= SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "in"; @@ -2408,6 +2419,7 @@ int siptrace_net_data_sent(sr_event_param_t *evp) int proto; int evcb_ret; int ret = 0; + str vsock; if(evp->data == 0) return -1; @@ -2437,14 +2449,18 @@ int siptrace_net_data_sent(sr_event_param_t *evp) sto.fromip.len = SIPTRACE_ANYADDR_LEN; proto = PROTO_UDP; } else { - if(new_dst.send_sock->sock_str.len >= SIPTRACE_ADDR_MAX - 1) { - LM_ERR("socket string is too large: %d\n", - new_dst.send_sock->sock_str.len); + if(new_dst.send_sock->useinfo.sock_str.len > 0) { + vsock = new_dst.send_sock->useinfo.sock_str; + } else { + vsock = new_dst.send_sock->sock_str; + } + if(vsock.len >= SIPTRACE_ADDR_MAX - 1) { + LM_ERR("socket string is too large: %d\n", vsock.len); return -1; } - strncpy(sto.fromip_buff, new_dst.send_sock->sock_str.s, - new_dst.send_sock->sock_str.len); - sto.fromip.len = new_dst.send_sock->sock_str.len; + memcpy(sto.fromip_buff, vsock.s, vsock.len); + sto.fromip.len = vsock.len; + sto.fromip_buff[sto.fromip.len] = '\0'; proto = new_dst.send_sock->proto; } sto.fromip.s = sto.fromip_buff;

1 0

[kamailio/kamailio] goto error on cursor error (PR #3996)
by Adnan Elezovic 09 Oct '24

09 Oct '24

#### 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 If the query failed, the result set should not be parsed and used. This results in an empty result set which will most likely lead to unwanted behavior. Background: While troubleshooting, we detected that domain.reload actually replaces domains with an empty result set if mongodb connectivity fails. ``` DEBUG: db_mongodb [mongodb_dbase.c:849]: db_mongodb_store_result(): An error occurred: No suitable servers found (`serverSelectionTryOnce` set): [connection timeout calling ismaster on 'pdb-iop1-wrmg-2:27017'] [connection timeout calling ismaster on 'pdb-iop1-wrmg-1:27017'] DEBUG: domain [domain.c:365]: reload_tables(): number of rows in domain_attrs table: 0 DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 0 columns DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fb0c9811848 DEBUG: db_mongodb [mongodb_dbase.c:973]: db_mongodb_query(): query to collection [domains] DEBUG: db_mongodb [mongodb_dbase.c:1007]: db_mongodb_query(): query filter: { } DEBUG: db_mongodb [mongodb_dbase.c:1043]: db_mongodb_query(): columns filter: { "projection" : { "domain" : 1, "did" : 1 } } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3996 -- Commit Summary -- * mongodb: fix cursor error resulting empty result set -- File Changes -- M src/modules/db_mongodb/mongodb_dbase.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3996.patch https://github.com/kamailio/kamailio/pull/3996.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3996 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3996(a)github.com>

2 2

git:master:afebe6b2: mongodb: fix cursor error resulting empty result set
by Victor Seva 09 Oct '24

09 Oct '24

Module: kamailio Branch: master Commit: afebe6b2e597755ae37fd37bdf011fbb2fbbf8fe URL: https://github.com/kamailio/kamailio/commit/afebe6b2e597755ae37fd37bdf011fb… Author: aelezovic <adnan.elezovic(a)infobip.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-09T16:15:31+02:00 mongodb: fix cursor error resulting empty result set --- Modified: src/modules/db_mongodb/mongodb_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/afebe6b2e597755ae37fd37bdf011fb… Patch: https://github.com/kamailio/kamailio/commit/afebe6b2e597755ae37fd37bdf011fb… --- diff --git a/src/modules/db_mongodb/mongodb_dbase.c b/src/modules/db_mongodb/mongodb_dbase.c index 6b51962c8b8..a57324d4afa 100644 --- a/src/modules/db_mongodb/mongodb_dbase.c +++ b/src/modules/db_mongodb/mongodb_dbase.c @@ -838,6 +838,7 @@ static int db_mongodb_store_result(const db1_con_t *_h, db1_res_t **_r) || !mongoc_cursor_next(mgres->cursor, &itdoc) || !itdoc) { if(mongoc_cursor_error(mgres->cursor, &error)) { LM_DBG("An error occurred: %s\n", error.message); + goto error; } else { LM_DBG("no result from mongodb\n"); }

1 0

git:master:2737bb19: http_async_client: fix warning deprecated-non-prototype
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: 2737bb19a363be7c0d67749b75f11c7e9d2d09f3 URL: https://github.com/kamailio/kamailio/commit/2737bb19a363be7c0d67749b75f11c7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T15:03:55+02:00 http_async_client: fix warning deprecated-non-prototype > Warning: ./http_multi.h:64:5: warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C23, conflicting with a subsequent definition [-Wdeprecated-non-prototype] > 64 | int init_http_multi(); > | ^ > http_multi.c:403:5: note: conflicting prototype is here > 403 | int init_http_multi(struct event_base *evbase, struct http_m_global *wg) > | ^ > 1 warning generated. --- Modified: src/modules/http_async_client/http_multi.h --- Diff: https://github.com/kamailio/kamailio/commit/2737bb19a363be7c0d67749b75f11c7… Patch: https://github.com/kamailio/kamailio/commit/2737bb19a363be7c0d67749b75f11c7… --- diff --git a/src/modules/http_async_client/http_multi.h b/src/modules/http_async_client/http_multi.h index 0f35a722306..8e3676b3ed1 100644 --- a/src/modules/http_async_client/http_multi.h +++ b/src/modules/http_async_client/http_multi.h @@ -61,7 +61,7 @@ extern int curl_verbose; extern int curl_follow_redirect; void set_curl_mem_callbacks(void); -int init_http_multi(); +int init_http_multi(struct event_base *evbase, struct http_m_global *wg); int multi_timer_cb(CURLM *multi, long timeout_ms, struct http_m_global *g); void timer_cb(int fd, short kind, void *userp); int sock_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp);

1 0

git:master:ee052fd0: sms: fix warning and remove old logic
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: ee052fd0a7e7dc703a186a01926a8e64c635d636 URL: https://github.com/kamailio/kamailio/commit/ee052fd0a7e7dc703a186a01926a8e6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T14:58:40+02:00 sms: fix warning and remove old logic > Warning: libsms_getsms.c:107:25: warning: implicit conversion from 'int' to 'char' changes value from 183 to -73 [-Wconstant-conversion] > 107 | ascii[charcounter] = 183; > | ~ ^~~ > 1 warning generated. --- Modified: src/modules/sms/libsms_getsms.c --- Diff: https://github.com/kamailio/kamailio/commit/ee052fd0a7e7dc703a186a01926a8e6… Patch: https://github.com/kamailio/kamailio/commit/ee052fd0a7e7dc703a186a01926a8e6… --- diff --git a/src/modules/sms/libsms_getsms.c b/src/modules/sms/libsms_getsms.c index 4181560490e..1909c78bcc9 100644 --- a/src/modules/sms/libsms_getsms.c +++ b/src/modules/sms/libsms_getsms.c @@ -101,12 +101,7 @@ static int pdu2ascii(char *pdu, char *ascii) bitposition++; c = (c >> 1) & 127; /* The shift fills with 1, but I want 0 */ } - if(/*cs_convert*/ 1) - ascii[charcounter] = sms2ascii(c); - else if(c == 0) - ascii[charcounter] = 183; - else - ascii[charcounter] = c; + ascii[charcounter] = sms2ascii(c); } ascii[count] = 0; return count;

1 0

[kamailio/kamailio] kazoo: 'amqp_set_initialize_ssl_library' is deprecated (Issue #3466)
by sergey-safarov 08 Oct '24

08 Oct '24

From the build log ``` CC (gcc) [M kazoo.so] kazoo.o CC (gcc) [M kazoo.so] kz_amqp.o kz_amqp.c: In function 'kz_amqp_connection_open_ssl': kz_amqp.c:857:17: warning: 'amqp_set_initialize_ssl_library' is deprecated [-Wdeprecated-declarations] 857 | amqp_set_initialize_ssl_library(1); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from kz_amqp.c:37: /usr/include/rabbitmq-c/ssl_socket.h:233:16: note: declared here 233 | void AMQP_CALL amqp_set_initialize_ssl_library(amqp_boolean_t do_initialize); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [M kazoo.so] kz_fixup.o CC (gcc) [M kazoo.so] kz_hash.o ``` Functions description in the header file https://github.com/alanxz/rabbitmq-c/blob/v0.13.0/include/rabbitmq-c/ssl_so… ``` /** * Sets whether rabbitmq-c will initialize OpenSSL. * * \deprecated Since v0.13.0 this is a no-op. OpenSSL automatically manages * library initialization and uninitialization. * * OpenSSL requires a one-time initialization across a whole program, this sets * whether or not rabbitmq-c will initialize the SSL library when the first call * to amqp_ssl_socket_new() is made. You should call this function with * do_init = 0 if the underlying SSL library is initialized somewhere else * the program. * * Failing to initialize or double initialization of the SSL library will * result in undefined behavior * * By default rabbitmq-c will initialize the underlying SSL library. * * NOTE: calling this function after the first socket has been opened with * amqp_open_socket() will not have any effect. * * \param [in] do_initialize If 0 rabbitmq-c will not initialize the SSL * library, otherwise rabbitmq-c will initialize the * SSL library * * \since v0.4.0 */ ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3466 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3466(a)github.com>

3 4

git:master:eeb17678: kazoo: fix deprecation warning
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: eeb17678d77548073a59b54c0a08ebdb48b25fa2 URL: https://github.com/kamailio/kamailio/commit/eeb17678d77548073a59b54c0a08ebd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T14:31:29+02:00 kazoo: fix deprecation warning fixes #3466 From https://github.com/alanxz/rabbitmq-c/blob/c3e4176659aac7d0e497da90a46c08c63… > * \deprecated Since v0.13.0 this is a no-op. OpenSSL automatically manages > * library initialization and uninitialization. > Warning: kz_amqp.c:857:3: warning: 'amqp_set_initialize_ssl_library' is deprecated [-Wdeprecated-declarations] > amqp_set_initialize_ssl_library(1); > ^ > /usr/include/rabbitmq-c/ssl_socket.h:249:1: note: 'amqp_set_initialize_ssl_library' has been explicitly marked deprecated here > AMQP_DEPRECATED_EXPORT > ^ > /usr/include/rabbitmq-c/export.h:29:46: note: expanded from macro 'AMQP_DEPRECATED_EXPORT' > # define AMQP_DEPRECATED_EXPORT AMQP_EXPORT AMQP_DEPRECATED > ^ > /usr/include/rabbitmq-c/export.h:25:43: note: expanded from macro 'AMQP_DEPRECATED' > # define AMQP_DEPRECATED __attribute__ ((__deprecated__)) > ^ > 1 warning generated. --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/eeb17678d77548073a59b54c0a08ebd… Patch: https://github.com/kamailio/kamailio/commit/eeb17678d77548073a59b54c0a08ebd… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index ed696116514..d702990e8b8 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -846,17 +846,17 @@ void kz_amqp_channel_close(kz_amqp_conn_ptr rmq, amqp_channel_t channel) kz_amqp_error("closing channel", amqp_channel_close(rmq->conn, channel, AMQP_REPLY_SUCCESS)); } - +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 13 int kz_ssl_initialized = 0; - +#endif int kz_amqp_connection_open_ssl(kz_amqp_conn_ptr rmq) { - +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 13 if(!kz_ssl_initialized) { kz_ssl_initialized = 1; amqp_set_initialize_ssl_library(1); } - +#endif if(!(rmq->conn = amqp_new_connection())) { LM_ERR("Failed to create new AMQP connection\n"); goto error;

1 0

git:master:a2f7147d: rabbitmq: remove deprecation warning
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: a2f7147dded679d025a902aa12beb048ee714c32 URL: https://github.com/kamailio/kamailio/commit/a2f7147dded679d025a902aa12beb04… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T14:17:34+02:00 rabbitmq: remove deprecation warning From https://github.com/alanxz/rabbitmq-c/blob/c3e4176659aac7d0e497da90a46c08c63… > * \deprecated Since v0.13.0 this is a no-op. OpenSSL automatically manages > * library initialization and uninitialization. > Warning: rabbitmq.c:574:3: warning: 'amqp_set_initialize_ssl_library' is deprecated [-Wdeprecated-declarations] > amqp_set_initialize_ssl_library(1); > ^ > /usr/include/rabbitmq-c/ssl_socket.h:249:1: note: 'amqp_set_initialize_ssl_library' has been explicitly marked deprecated here > AMQP_DEPRECATED_EXPORT > ^ > /usr/include/rabbitmq-c/export.h:29:46: note: expanded from macro 'AMQP_DEPRECATED_EXPORT' > # define AMQP_DEPRECATED_EXPORT AMQP_EXPORT AMQP_DEPRECATED > ^ > /usr/include/rabbitmq-c/export.h:25:43: note: expanded from macro 'AMQP_DEPRECATED' > # define AMQP_DEPRECATED __attribute__ ((__deprecated__)) > ^ > 1 warning generated. --- Modified: src/modules/rabbitmq/rabbitmq.c --- Diff: https://github.com/kamailio/kamailio/commit/a2f7147dded679d025a902aa12beb04… Patch: https://github.com/kamailio/kamailio/commit/a2f7147dded679d025a902aa12beb04… --- diff --git a/src/modules/rabbitmq/rabbitmq.c b/src/modules/rabbitmq/rabbitmq.c index 9b57e7a834c..709055dc9ab 100644 --- a/src/modules/rabbitmq/rabbitmq.c +++ b/src/modules/rabbitmq/rabbitmq.c @@ -87,7 +87,9 @@ static int max_reconnect_attempts = 1; static int timeout_sec = 1; static int timeout_usec = 0; static int direct_reply_to = 0; +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 13 static int amqp_ssl_init_called = 0; +#endif /* module helper functions */ static int rabbitmq_connect(amqp_connection_state_t *conn); @@ -569,12 +571,14 @@ static int rabbitmq_connect(amqp_connection_state_t *conn) int log_ret; // amqp_rpc_reply_t reply; +#if AMQP_VERSION_MAJOR == 0 && AMQP_VERSION_MINOR < 13 // amqp_ssl_init_called should only be called once if(amqp_info.ssl && !amqp_ssl_init_called) { amqp_set_initialize_ssl_library(1); amqp_ssl_init_called = 1; LM_DBG("AMQP SSL library initialized\n"); } +#endif // establish a new connection to RabbitMQ server *conn = amqp_new_connection();

1 0

git:master:35a87c98: ims_usrloc_pcscf: fix warning deprecated-non-prototype
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: 35a87c98f4e84b65f82376dfb57050f43d0f355f URL: https://github.com/kamailio/kamailio/commit/35a87c98f4e84b65f82376dfb57050f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T13:26:32+02:00 ims_usrloc_pcscf: fix warning deprecated-non-prototype > In file included from usrloc_db.c:12: > Warning: ./usrloc_db.h:131:5: warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Wdeprecated-non-prototype] > int use_location_pcscf_table(); > ^ > usrloc_db.c:113:5: note: conflicting prototype is here > int use_location_pcscf_table(str *domain) > ^ > 1 warning generated. --- Modified: src/modules/ims_usrloc_pcscf/usrloc_db.h --- Diff: https://github.com/kamailio/kamailio/commit/35a87c98f4e84b65f82376dfb57050f… Patch: https://github.com/kamailio/kamailio/commit/35a87c98f4e84b65f82376dfb57050f… --- diff --git a/src/modules/ims_usrloc_pcscf/usrloc_db.h b/src/modules/ims_usrloc_pcscf/usrloc_db.h index 3c50c153b4e..688387b1b2d 100644 --- a/src/modules/ims_usrloc_pcscf/usrloc_db.h +++ b/src/modules/ims_usrloc_pcscf/usrloc_db.h @@ -128,7 +128,7 @@ typedef struct reusable_buffer int data_len; } t_reusable_buffer; -int use_location_pcscf_table(); +int use_location_pcscf_table(str *domain); void destroy_db(); int init_db(const str *db_url, int db_update_period, int fetch_num_rows); int connect_db(const str *db_url);

1 0

git:master:7dcc8405: ims_usrloc_pcscf: fix warnings deprecated-non-prototype
by Victor Seva 08 Oct '24

08 Oct '24

Module: kamailio Branch: master Commit: 7dcc8405ccec19132d27516426137e35e464d4ad URL: https://github.com/kamailio/kamailio/commit/7dcc8405ccec19132d27516426137e3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2024-10-08T13:23:08+02:00 ims_usrloc_pcscf: fix warnings deprecated-non-prototype > In file included from pcontact.c:46: > Warning: ./pcontact.h:63:5: warning: a function declaration without a prototype is deprecated in all versions of C and is treated as a zero-parameter prototype in C2x, conflicting with a subsequent definition [-Wdeprecated-non-prototype] > int new_pcontact( > ^ > pcontact.c:166:5: note: conflicting prototype is here > int new_pcontact(struct udomain *_d, str *_contact, struct pcontact_info *_ci, > ^ > 1 warning generated. > Warning: udomain.c:232:17: warning: passing arguments to 'new_pcontact' without a prototype is deprecated in all versions of C and is not supported in C2x [-Wdeprecated-non-prototype] > if(new_pcontact(_d->name, _contact, _ci, _c) < 0) { > ^ > 1 warning generated. --- Modified: src/modules/ims_usrloc_pcscf/pcontact.c Modified: src/modules/ims_usrloc_pcscf/pcontact.h Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/7dcc8405ccec19132d27516426137e3… Patch: https://github.com/kamailio/kamailio/commit/7dcc8405ccec19132d27516426137e3… --- diff --git a/src/modules/ims_usrloc_pcscf/pcontact.c b/src/modules/ims_usrloc_pcscf/pcontact.c index 76e061fe529..a885cd285e7 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.c +++ b/src/modules/ims_usrloc_pcscf/pcontact.c @@ -192,7 +192,7 @@ int new_pcontact(struct udomain *_d, str *_contact, struct pcontact_info *_ci, memcpy(p, _contact->s, _contact->len); p += _contact->len; (*_c)->aor.len = _contact->len; - (*_c)->domain = (str *)_d; + (*_c)->domain = _d->name; if(parse_uri((*_c)->aor.s, (*_c)->aor.len, &sip_uri) != 0) { LM_ERR("unable to determine contact host from uri [%.*s\n", diff --git a/src/modules/ims_usrloc_pcscf/pcontact.h b/src/modules/ims_usrloc_pcscf/pcontact.h index f1c130f4470..6f45d5aace2 100644 --- a/src/modules/ims_usrloc_pcscf/pcontact.h +++ b/src/modules/ims_usrloc_pcscf/pcontact.h @@ -60,8 +60,8 @@ void insert_ppublic(struct pcontact *_c, ppublic_t *_p); int new_ppublic(str *public_identity, int is_default, ppublic_t **_p); void free_ppublic(ppublic_t *_p); -int new_pcontact( - /*str* _dom, str* public_identity, int reg_state, int barring, ims_subscription** s, str* ccf1, str* ccf2, str* ecf1, str* ecf2, impurecord_t** _r*/); +int new_pcontact(struct udomain *_d, str *_contact, struct pcontact_info *_ci, + struct pcontact **_c); void free_pcontact(pcontact_t *_c); void print_pcontact(FILE *_f, pcontact_t *_r); ppublic_t *mem_insert_ppublic( diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 248684cb00b..27158128d13 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -229,7 +229,7 @@ int mem_insert_pcontact(struct udomain *_d, str *_contact, { int sl; - if(new_pcontact(_d->name, _contact, _ci, _c) < 0) { + if(new_pcontact(_d, _contact, _ci, _c) < 0) { LM_ERR("creating pcontact failed\n"); return -1; }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2024