- sr-dev - kamailio.org

git:master:c28b3a0a: ipops: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c28b3a0ae61c9fd1fc8e8b2972686a0f8424c44a URL: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ipops: typos --- Modified: src/modules/ipops/ipops_mod.c Modified: src/modules/ipops/ipops_pv.c --- Diff: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… Patch: https://github.com/kamailio/kamailio/commit/c28b3a0ae61c9fd1fc8e8b2972686a0… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index d9f01317e5..a9f3962f61 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -695,7 +695,7 @@ static int ki_is_ip6_reference(sip_msg_t *msg, str *sval) } /*! \brief Return the IP type of the given argument (string or pv): - * 1 = IPv4, 2 = IPv6, 3 = IPv6 refenrece, -1 = invalid IP. */ + * 1 = IPv4, 2 = IPv6, 3 = IPv6 reference, -1 = invalid IP. */ static int w_ip_type(sip_msg_t* _msg, char* _s, char *_p2) { str string; @@ -728,7 +728,7 @@ static int w_ip_type(sip_msg_t* _msg, char* _s, char *_p2) } /*! \brief Return the IP type of the given argument (string or pv): - * 1 = IPv4, 2 = IPv6, 3 = IPv6 refenrece, -1 = invalid IP. */ + * 1 = IPv4, 2 = IPv6, 3 = IPv6 reference, -1 = invalid IP. */ static int ki_ip_type(sip_msg_t *msg, str *sval) { switch (ip_parser_execute(sval->s, sval->len)) { @@ -990,7 +990,7 @@ static int w_compare_pure_ips(sip_msg_t* _msg, char* _s1, char* _s2) } /*! \brief Return true if the first IP (string or pv) is within the subnet - * defined by the second commma-separated IP list in CIDR notation. + * defined by the second comma-separated IP list in CIDR notation. * IPv6 references not allowed. */ static int ki_ip_is_in_subnet(sip_msg_t* _msg, str* _sval1, str* _sval2) { @@ -1042,7 +1042,7 @@ static int ki_ip_is_in_subnet(sip_msg_t* _msg, str* _sval1, str* _sval2) /*! \brief Return true if the first IP (string or pv) is within the subnet - * defined by the second commma-separated IP list in CIDR notation. + * defined by the second comma-separated IP list in CIDR notation. * IPv6 references not allowed. */ static int w_ip_is_in_subnet(sip_msg_t* _msg, char* _s1, char* _s2) { diff --git a/src/modules/ipops/ipops_pv.c b/src/modules/ipops/ipops_pv.c index 9ee6f5879a..4eabbcac86 100644 --- a/src/modules/ipops/ipops_pv.c +++ b/src/modules/ipops/ipops_pv.c @@ -109,7 +109,7 @@ sr_dns_item_t *sr_dns_add_item(str *name) n++; } if(n > 20) { - LM_WARN("too many dns containers - adding nunmber %d - can fill memory\n", + LM_WARN("too many dns containers - adding number %d - can fill memory\n", n); }

1 0

git:master:b89353cd: ims_registrar_pcscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: b89353cd766769552655f16a44d44ea0e55a8fea URL: https://github.com/kamailio/kamailio/commit/b89353cd766769552655f16a44d44ea… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_registrar_pcscf: typos --- Modified: src/modules/ims_registrar_pcscf/async_reginfo.c Modified: src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml Modified: src/modules/ims_registrar_pcscf/save.h Modified: src/modules/ims_registrar_pcscf/service_routes.c --- Diff: https://github.com/kamailio/kamailio/commit/b89353cd766769552655f16a44d44ea… Patch: https://github.com/kamailio/kamailio/commit/b89353cd766769552655f16a44d44ea… --- diff --git a/src/modules/ims_registrar_pcscf/async_reginfo.c b/src/modules/ims_registrar_pcscf/async_reginfo.c index c037f74215..52c861df3b 100644 --- a/src/modules/ims_registrar_pcscf/async_reginfo.c +++ b/src/modules/ims_registrar_pcscf/async_reginfo.c @@ -261,7 +261,7 @@ reginfo_event_t* pop_reginfo_event() if (ev == reginfo_event_list->tail) { //list now empty reginfo_event_list->tail = 0; } - ev->next = 0; //make sure whoever gets this cant access our list + ev->next = 0; //make sure whoever gets this can't access our list reginfo_event_list->size--; diff --git a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml index b3d6b118fa..421f9ff09f 100644 --- a/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml +++ b/src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml @@ -38,7 +38,7 @@ <section> <title>External Libraries or Applications</title> - <para>This modules requires the internal IMS library.</para> + <para>This module requires the internal IMS library.</para> </section> </section> @@ -98,7 +98,7 @@ modparam("ims_registrar_pcscf", "received_avp", "$avp(i:42)") <section> <title><varname>is_registered_fallback2ip</varname> (int)</title> - <para>Defines, whether a contact should be searched by it's contact only + <para>Defines, whether a contact should be searched by its Contact: only or alternatively by the received IP-Address.</para> <para>The option may have the following values:</para> diff --git a/src/modules/ims_registrar_pcscf/save.h b/src/modules/ims_registrar_pcscf/save.h index 0a077120c8..84e15cf3a6 100644 --- a/src/modules/ims_registrar_pcscf/save.h +++ b/src/modules/ims_registrar_pcscf/save.h @@ -51,7 +51,7 @@ #include "../../lib/ims/ims_getters.h" /*! \brief - * Process REGISTER request and save it's contacts + * Process REGISTER request and save its contacts */ int save(struct sip_msg* _m, udomain_t* _d, int _cflags); int save_pending(struct sip_msg* _m, udomain_t* _d); diff --git a/src/modules/ims_registrar_pcscf/service_routes.c b/src/modules/ims_registrar_pcscf/service_routes.c index 566ade5a56..b9b5654ad5 100644 --- a/src/modules/ims_registrar_pcscf/service_routes.c +++ b/src/modules/ims_registrar_pcscf/service_routes.c @@ -426,7 +426,7 @@ int check_service_routes(struct sip_msg* _m, udomain_t* _d) { goto error; } - LM_DBG("we have a contact which satisifes the routes...\n"); + LM_DBG("we have a contact which satisfies the routes...\n"); ul.unlock_udomain(_d, &vb->host, port, proto); return 1; }

1 0

git:master:94c1fa31: ims_usrloc_pcscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 94c1fa3123042e1f262750e2b23fad640717c5e1 URL: https://github.com/kamailio/kamailio/commit/94c1fa3123042e1f262750e2b23fad6… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_usrloc_pcscf: typos --- Modified: src/modules/ims_usrloc_pcscf/reginfo.h Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/94c1fa3123042e1f262750e2b23fad6… Patch: https://github.com/kamailio/kamailio/commit/94c1fa3123042e1f262750e2b23fad6… --- diff --git a/src/modules/ims_usrloc_pcscf/reginfo.h b/src/modules/ims_usrloc_pcscf/reginfo.h index 9bc8873c4e..f0a3f84742 100644 --- a/src/modules/ims_usrloc_pcscf/reginfo.h +++ b/src/modules/ims_usrloc_pcscf/reginfo.h @@ -61,7 +61,7 @@ typedef struct _reginfo_subscription { /** Subscription list */ typedef struct { - gen_lock_t *lock; /**< lock fo subscription list operations */ + gen_lock_t *lock; /**< lock for subscription list operations */ reginfo_subscription *head; /**< first subscription in the list */ reginfo_subscription *tail; /**< last subscription in the list */ } reginfo_subscription_hash_slot; diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index efb19e6291..97fc3fbe97 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -444,7 +444,7 @@ int insert_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci * search for P-CSCF contact in usrloc * @udomain_t* _d - domain to search in * @str* _contact - contact to search for - should be a SIP URI - * @struct pontact** _c - contact to return to if found (null if not found) + * @struct pcontact** _c - contact to return to if found (null if not found) * @int reverse_search - reverse search for a contact in the memory * @return 0 if found <>0 if not */

1 0

git:master:911739c0: ims_ocs: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 911739c041a0c0717edbadd2296e65e0d388df72 URL: https://github.com/kamailio/kamailio/commit/911739c041a0c0717edbadd2296e65e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_ocs: typos --- Modified: src/modules/ims_ocs/examples/full/kamailio.cfg Modified: src/modules/ims_ocs/examples/full/ocs.cfg.sample Modified: src/modules/ims_ocs/examples/simple/kamailio.cfg Modified: src/modules/ims_ocs/examples/simple/ocs.cfg.sample --- Diff: https://github.com/kamailio/kamailio/commit/911739c041a0c0717edbadd2296e65e… Patch: https://github.com/kamailio/kamailio/commit/911739c041a0c0717edbadd2296e65e… --- diff --git a/src/modules/ims_ocs/examples/full/kamailio.cfg b/src/modules/ims_ocs/examples/full/kamailio.cfg index 9d053eddbb..45f35210d2 100644 --- a/src/modules/ims_ocs/examples/full/kamailio.cfg +++ b/src/modules/ims_ocs/examples/full/kamailio.cfg @@ -1,10 +1,10 @@ #!KAMAILIO # # This config file implements an Online-Charging-Server -# - web: http://www.kamailio.org +# - web: https://www.kamailio.org # - git: http://sip-router.org # -# Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php +# Refer to the Core CookBook at https://www.kamailio.org/w/documentation/ # for an explanation of possible statements, functions and parameters. # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org>. diff --git a/src/modules/ims_ocs/examples/full/ocs.cfg.sample b/src/modules/ims_ocs/examples/full/ocs.cfg.sample index a5eeafa5f4..6e4dced75d 100644 --- a/src/modules/ims_ocs/examples/full/ocs.cfg.sample +++ b/src/modules/ims_ocs/examples/full/ocs.cfg.sample @@ -1,4 +1,4 @@ -# IP-Adress for incoming SIP-Traffic, in the following format: +# IP-Address for incoming SIP-Traffic, in the following format: # SIP / UDP listen=udp:11.22.33.44:5080 diff --git a/src/modules/ims_ocs/examples/simple/kamailio.cfg b/src/modules/ims_ocs/examples/simple/kamailio.cfg index 9453539ded..9f7a5a5f6a 100644 --- a/src/modules/ims_ocs/examples/simple/kamailio.cfg +++ b/src/modules/ims_ocs/examples/simple/kamailio.cfg @@ -1,10 +1,10 @@ #!KAMAILIO # # This config file implements an Online-Charging-Server -# - web: http://www.kamailio.org +# - web: https://www.kamailio.org # - git: http://github.com/kamailio/kamailio # -# Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php +# Refer to the Core CookBook at https://www.kamailio.org/w/documentation/ # for an explanation of possible statements, functions and parameters. # # Direct your questions about this file to: <sr-users(a)lists.kamailio.org>. diff --git a/src/modules/ims_ocs/examples/simple/ocs.cfg.sample b/src/modules/ims_ocs/examples/simple/ocs.cfg.sample index 2360028a2e..30fef70f84 100644 --- a/src/modules/ims_ocs/examples/simple/ocs.cfg.sample +++ b/src/modules/ims_ocs/examples/simple/ocs.cfg.sample @@ -1,4 +1,4 @@ -# IP-Adress for incoming SIP-Traffic, in the following format: +# IP-Address for incoming SIP-Traffic, in the following format: # SIP / UDP listen=udp:11.22.33.44:5080

1 0

git:master:b14a4208: ims_qos: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: b14a420834744b8bef871b10fd2fdeb6a5e7cd89 URL: https://github.com/kamailio/kamailio/commit/b14a420834744b8bef871b10fd2fdeb… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_qos: typos --- Modified: src/modules/ims_qos/cdpeventprocessor.c Modified: src/modules/ims_qos/doc/ims_qos_admin.xml Modified: src/modules/ims_qos/ims_qos_mod.c Modified: src/modules/ims_qos/rx_aar.c Modified: src/modules/ims_qos/rx_asr.c --- Diff: https://github.com/kamailio/kamailio/commit/b14a420834744b8bef871b10fd2fdeb… Patch: https://github.com/kamailio/kamailio/commit/b14a420834744b8bef871b10fd2fdeb…

1 0

git:master:4f3faaa4: ims_registrar_scscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 4f3faaa42006ce4b2a0ae2b684975fd385deea43 URL: https://github.com/kamailio/kamailio/commit/4f3faaa42006ce4b2a0ae2b684975fd… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_registrar_scscf: typos --- Modified: src/modules/ims_registrar_scscf/cxdx_avp.c Modified: src/modules/ims_registrar_scscf/cxdx_avp.h Modified: src/modules/ims_registrar_scscf/cxdx_sar.c Modified: src/modules/ims_registrar_scscf/cxdx_sar.h Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/save.h Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/4f3faaa42006ce4b2a0ae2b684975fd… Patch: https://github.com/kamailio/kamailio/commit/4f3faaa42006ce4b2a0ae2b684975fd…

1 0

git:master:6dbb0d6e: ims_ipsec_pcscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 6dbb0d6ec6c9676e2191e06ca73fb712d8f4e4bd URL: https://github.com/kamailio/kamailio/commit/6dbb0d6ec6c9676e2191e06ca73fb71… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_ipsec_pcscf: typos --- Modified: src/modules/ims_ipsec_pcscf/cmd.c Modified: src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml Modified: src/modules/ims_ipsec_pcscf/ipsec.c Modified: src/modules/ims_ipsec_pcscf/spi_list.c --- Diff: https://github.com/kamailio/kamailio/commit/6dbb0d6ec6c9676e2191e06ca73fb71… Patch: https://github.com/kamailio/kamailio/commit/6dbb0d6ec6c9676e2191e06ca73fb71… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index 6f6c15e21b..963e378604 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -600,7 +600,7 @@ int add_supported_secagree_header(struct sip_msg *m) } if((supported->s = pkg_malloc(supported_sec_agree_len)) == NULL) { - LM_ERR("Error allcationg pkg memory for supported header str\n"); + LM_ERR("Error allocating pkg memory for supported header str\n"); pkg_free(supported); return -1; } @@ -631,7 +631,7 @@ int add_require_secagree_header(struct sip_msg *m) } if((require->s = pkg_malloc(require_sec_agree_len)) == NULL) { - LM_ERR("Error allcationg pkg memory for require header str\n"); + LM_ERR("Error allocating pkg memory for require header str\n"); pkg_free(require); return -1; } diff --git a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml index ea1fc34ca9..982df9bbb1 100644 --- a/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml +++ b/src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml @@ -38,7 +38,7 @@ <section> <title>External Libraries or Applications</title> - <para>This modules requires the internal IMS library and libmnl for operating with netlink sockets.</para> + <para>This module requires the internal IMS library and libmnl for operating with netlink sockets.</para> </section> </section> @@ -118,7 +118,7 @@ modparam("ims_ipsec_pcscf", "ipsec_server_port", 5063) <section> <title><varname>ipsec_max_connections</varname> (int)</title> - <para>Maximum simultanious IPSec connections</para> + <para>Maximum simultaneous IPSec connections</para> <para><emphasis>Default value is 2.</emphasis></para> diff --git a/src/modules/ims_ipsec_pcscf/ipsec.c b/src/modules/ims_ipsec_pcscf/ipsec.c index 8eb392ab30..fbfa41d75d 100644 --- a/src/modules/ims_ipsec_pcscf/ipsec.c +++ b/src/modules/ims_ipsec_pcscf/ipsec.c @@ -207,7 +207,7 @@ int add_sa(struct mnl_socket *nl_sock, const struct ip_addr *src_addr_param, string_to_key(l_auth_algo->alg_key, ik1); pkg_free(ik1.s); } else { - LM_DBG("Creating security associations: UNKNOW Auth Algorithm\n"); + LM_DBG("Creating security associations: UNKNOWN Auth Algorithm\n"); return -1; } @@ -239,7 +239,7 @@ int add_sa(struct mnl_socket *nl_sock, const struct ip_addr *src_addr_param, strcpy(l_enc_algo->alg_name, "cipher_null"); l_enc_algo->alg_key_len = 0; } else { - LM_DBG("Creating security associations: UNKNOW Enc Algorithm\n"); + LM_DBG("Creating security associations: UNKNOWN Enc Algorithm\n"); return -1; } diff --git a/src/modules/ims_ipsec_pcscf/spi_list.c b/src/modules/ims_ipsec_pcscf/spi_list.c index f7edccd8c5..37a76cba79 100644 --- a/src/modules/ims_ipsec_pcscf/spi_list.c +++ b/src/modules/ims_ipsec_pcscf/spi_list.c @@ -135,7 +135,7 @@ int spi_remove(spi_list_t *list, uint32_t spi_cid, uint32_t spi_sid) //detach node prev->next = curr->next; - //is it the last elemet + //is it the last element if(t == list->tail) { list->tail = prev; }

1 0

git:master:46df335c: ims_isc: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 46df335ccfacb159a1f8ad1bc6e549967da30a91 URL: https://github.com/kamailio/kamailio/commit/46df335ccfacb159a1f8ad1bc6e5499… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_isc: typos --- Modified: src/modules/ims_isc/checker.c Modified: src/modules/ims_isc/doc/ims_isc_admin.xml Modified: src/modules/ims_isc/mark.c --- Diff: https://github.com/kamailio/kamailio/commit/46df335ccfacb159a1f8ad1bc6e5499… Patch: https://github.com/kamailio/kamailio/commit/46df335ccfacb159a1f8ad1bc6e5499… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index 3e17333dbd..b24946503b 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -468,7 +468,7 @@ isc_match* isc_checker_find(str uri, char direction, int skip, LM_DBG("About to try p->s->service_profiles_cnt!! #profiles is %d\n", p->s->service_profiles_cnt); while (si < p->s->service_profiles_cnt) { - LM_DBG("About to try p->s->service_profiles[a].filter_criterai_cnt\n"); + LM_DBG("About to try p->s->service_profiles[a].filter_criteria_cnt\n"); next = cnt + p->s->service_profiles[si].filter_criteria_cnt; if (cnt <= skip && skip < next) { sj = skip - cnt; diff --git a/src/modules/ims_isc/doc/ims_isc_admin.xml b/src/modules/ims_isc/doc/ims_isc_admin.xml index 1c19ab2e97..612266a574 100644 --- a/src/modules/ims_isc/doc/ims_isc_admin.xml +++ b/src/modules/ims_isc/doc/ims_isc_admin.xml @@ -40,7 +40,7 @@ <section> <title>External Libraries or Applications</title> - <para>This modules requires the Kamailio internal IMS library.</para> + <para>This module requires the Kamailio internal IMS library.</para> </section> </section> diff --git a/src/modules/ims_isc/mark.c b/src/modules/ims_isc/mark.c index 8d22ffff87..eb6cdb3ec4 100644 --- a/src/modules/ims_isc/mark.c +++ b/src/modules/ims_isc/mark.c @@ -79,7 +79,7 @@ int bin_to_base16(char *from, int len, char *to) { /** * Retrieves the mark from message. * - the marking should be in a header like described before - * @param msg - SIP mesage to mark + * @param msg - SIP message to mark * @param mark - mark to load into * @returns 1 if found, 0 if not */ @@ -194,7 +194,7 @@ int base16_to_bin(char *from, int len, char *to) { /** * Deletes the previous marking attempts (lumps). * - * @param msg - SIP mesage to mark + * @param msg - SIP message to mark * @returns 1 on success */ int isc_mark_drop_route(struct sip_msg *msg) { @@ -227,7 +227,7 @@ int isc_mark_drop_route(struct sip_msg *msg) { * Mark the message with the given mark. * - old marking attempts are deleted * - marking is performed by inserting the following header - * @param msg - SIP mesage to mark + * @param msg - SIP message to mark * @param match - the current IFC match * @param mark - pointer to the mark * @returns 1 on success or 0 on failure @@ -268,8 +268,8 @@ int isc_mark_set(struct sip_msg *msg, isc_match *match, isc_mark *mark) { * - else: \code Route: <sip:as@asdomain.net;lr>, <[iscmark]> \endcode * * - * @param msg - SIP mesage to mark - * @param as - SIP addres of the application server to forward to + * @param msg - SIP message to mark + * @param as - SIP address of the application server to forward to * @param iscmark - the mark to write * @returns 1 on success, else 0 */

1 0

git:master:c2f1da1b: ims_dialog: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c2f1da1bf804690766cdd9199b59e7261f0dcbaa URL: https://github.com/kamailio/kamailio/commit/c2f1da1bf804690766cdd9199b59e72… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_dialog: typos --- Modified: src/modules/ims_dialog/dlg_cb.c Modified: src/modules/ims_dialog/dlg_handlers.c Modified: src/modules/ims_dialog/dlg_handlers.h Modified: src/modules/ims_dialog/dlg_hash.c Modified: src/modules/ims_dialog/dlg_req_within.c Modified: src/modules/ims_dialog/doc/ims_dialog_admin.xml Modified: src/modules/ims_dialog/doc/ims_dialog_devel.xml Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/c2f1da1bf804690766cdd9199b59e72… Patch: https://github.com/kamailio/kamailio/commit/c2f1da1bf804690766cdd9199b59e72…

1 0

git:master:db62e037: ims_diameter_server: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: db62e0372eedce8708af23f806cce59d531817e6 URL: https://github.com/kamailio/kamailio/commit/db62e0372eedce8708af23f806cce59… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_diameter_server: typos --- Modified: src/modules/ims_diameter_server/avp_helper.c Modified: src/modules/ims_diameter_server/cJSON.c Modified: src/modules/ims_diameter_server/doc/ims_diameter_server.xml Modified: src/modules/ims_diameter_server/examples/kamailio.cfg Modified: src/modules/ims_diameter_server/ims_diameter_server.c --- Diff: https://github.com/kamailio/kamailio/commit/db62e0372eedce8708af23f806cce59… Patch: https://github.com/kamailio/kamailio/commit/db62e0372eedce8708af23f806cce59…

1 0

git:master:8fefea2e: ims_icscf: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 8fefea2ef7f75b2e792601cee0f8de2652c8b598 URL: https://github.com/kamailio/kamailio/commit/8fefea2ef7f75b2e792601cee0f8de2… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_icscf: typos --- Modified: src/modules/ims_icscf/cxdx_avp.c Modified: src/modules/ims_icscf/cxdx_avp.h Modified: src/modules/ims_icscf/cxdx_lir.c Modified: src/modules/ims_icscf/cxdx_uar.c Modified: src/modules/ims_icscf/doc/ims_icscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8fefea2ef7f75b2e792601cee0f8de2… Patch: https://github.com/kamailio/kamailio/commit/8fefea2ef7f75b2e792601cee0f8de2… --- diff --git a/src/modules/ims_icscf/cxdx_avp.c b/src/modules/ims_icscf/cxdx_avp.c index a716117318..6d40896b49 100644 --- a/src/modules/ims_icscf/cxdx_avp.c +++ b/src/modules/ims_icscf/cxdx_avp.c @@ -778,7 +778,7 @@ int cxdx_get_auth_data_item_answer(AAAMessage *msg, AAA_AVP **auth_data, * @param nonce - Nonce * @param URI - URI * @param response - Response - * @param algoritm - Algorithm + * @param algorithm - Algorithm * @param method - Method * @param hash - Enitity-Body-Hash * @returns grouped str on success diff --git a/src/modules/ims_icscf/cxdx_avp.h b/src/modules/ims_icscf/cxdx_avp.h index 2348dcb0a3..5206bf7d3c 100644 --- a/src/modules/ims_icscf/cxdx_avp.h +++ b/src/modules/ims_icscf/cxdx_avp.h @@ -209,7 +209,7 @@ int cxdx_get_auth_data_item_answer(AAAMessage *msg, AAA_AVP **auth_data, * @param nonce - Nonce * @param URI - URI * @param response - Response - * @param algoritm - Algorithm + * @param algorithm - Algorithm * @param method - Method * @param hash - Enitity-Body-Hash * @returns grouped str on success diff --git a/src/modules/ims_icscf/cxdx_lir.c b/src/modules/ims_icscf/cxdx_lir.c index 473d3aa139..0e442dfc88 100644 --- a/src/modules/ims_icscf/cxdx_lir.c +++ b/src/modules/ims_icscf/cxdx_lir.c @@ -51,7 +51,7 @@ #include "ims_icscf_mod.h" #include "location.h" -//we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable +//We use pseudo variables to communicate back to config file. This takes the result, converts it to a return code and publishes it as a pseudo variable. int create_lia_return_code(int result) { int rc; int_str avp_val, avp_name; diff --git a/src/modules/ims_icscf/cxdx_uar.c b/src/modules/ims_icscf/cxdx_uar.c index 0e7bcc8e50..eba64ac32c 100644 --- a/src/modules/ims_icscf/cxdx_uar.c +++ b/src/modules/ims_icscf/cxdx_uar.c @@ -52,8 +52,7 @@ #include "registration.h" #include "ims_icscf_mod.h" - -//we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable +//We use pseudo variables to communicate back to config file. This takes the result, converts it to a return code and publishes it a as pseudo variable. int create_uaa_return_code(int result) { int rc; int_str avp_val, avp_name; diff --git a/src/modules/ims_icscf/doc/ims_icscf_admin.xml b/src/modules/ims_icscf/doc/ims_icscf_admin.xml index b73f67ab67..1af579623f 100644 --- a/src/modules/ims_icscf/doc/ims_icscf_admin.xml +++ b/src/modules/ims_icscf/doc/ims_icscf_admin.xml @@ -45,7 +45,7 @@ <section> <title>External Libraries or Applications</title> - <para>This modules requires the Kamailio internal IMS library.</para> + <para>This module requires the Kamailio internal IMS library.</para> </section> </section> @@ -135,7 +135,7 @@ modparam("ims_icscf", "cxdx_forced_peer", "hss.ims.smilecoms.com") <section> <title><varname>cxdx_dest_realm</varname> (string)</title> - <para>Destination realm to be used in Diameter messags to HSS</para> + <para>Destination realm to be used in Diameter messages to HSS</para> <para><emphasis> Default value is "ims.smilecoms.com".</emphasis></para>

1 0

git:master:6dded07a: ims_auth: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 6dded07a538d1a68ff766c80e971b6e59535bb52 URL: https://github.com/kamailio/kamailio/commit/6dded07a538d1a68ff766c80e971b6e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_auth: typos --- Modified: src/modules/ims_auth/authorize.c Modified: src/modules/ims_auth/cxdx_avp.c Modified: src/modules/ims_auth/cxdx_avp.h Modified: src/modules/ims_auth/cxdx_mar.c Modified: src/modules/ims_auth/cxdx_mar.h Modified: src/modules/ims_auth/doc/ims_auth_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6dded07a538d1a68ff766c80e971b6e… Patch: https://github.com/kamailio/kamailio/commit/6dded07a538d1a68ff766c80e971b6e…

1 0

git:master:aa2cace5: ims_charging: typos
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: aa2cace532cdf0891d48698e8a9386a5d8a96f07 URL: https://github.com/kamailio/kamailio/commit/aa2cace532cdf0891d48698e8a9386a… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 ims_charging: typos --- Modified: src/modules/ims_charging/ccr.c Modified: src/modules/ims_charging/doc/ims_charging_admin.xml Modified: src/modules/ims_charging/ims_charging_mod.c Modified: src/modules/ims_charging/ro_session_hash.h Modified: src/modules/ims_charging/ro_timer.c Modified: src/modules/ims_charging/ro_timer.h --- Diff: https://github.com/kamailio/kamailio/commit/aa2cace532cdf0891d48698e8a9386a… Patch: https://github.com/kamailio/kamailio/commit/aa2cace532cdf0891d48698e8a9386a…

1 0

git:master:53f3bcd0: imc: typo
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 53f3bcd0eca4934b00eb4db05080a7ee33b11c92 URL: https://github.com/kamailio/kamailio/commit/53f3bcd0eca4934b00eb4db05080a7e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T12:14:59+01:00 imc: typo --- Modified: src/modules/imc/doc/imc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/53f3bcd0eca4934b00eb4db05080a7e… Patch: https://github.com/kamailio/kamailio/commit/53f3bcd0eca4934b00eb4db05080a7e… --- diff --git a/src/modules/imc/doc/imc_admin.xml b/src/modules/imc/doc/imc_admin.xml index a2fd541ea7..853176eaa6 100644 --- a/src/modules/imc/doc/imc_admin.xml +++ b/src/modules/imc/doc/imc_admin.xml @@ -158,7 +158,7 @@ modparam("imc", "members_table", "members") </para> <para> <emphasis> - The default value is 4 (resultimg in hash size 16). + The default value is 4 (resulting in hash size 16). </emphasis> </para> <example>

1 0

[kamailio/kamailio] Typos (PR #3363)
by Дилян Палаузов 13 Feb '23

13 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3363 -- Commit Summary -- * imc: typo * ims_auth: typos * ims_charging: typos * ims_dialog: typos * ims_diameter_server: typos * ims_icscf: typos * ims_ipsec_pcscf: typos * ims_isc: typos * ims_ocs: typos * ims_qos: typos * ims_registrar_scscf: typos * ims_registrar_pcscf: typos * ims_usrloc_pcscf: typos * ims_usrloc_scscf: typos * ipops: typos -- File Changes -- M src/modules/imc/doc/imc_admin.xml (2) M src/modules/ims_auth/authorize.c (4) M src/modules/ims_auth/cxdx_avp.c (2) M src/modules/ims_auth/cxdx_avp.h (2) M src/modules/ims_auth/cxdx_mar.c (6) M src/modules/ims_auth/cxdx_mar.h (2) M src/modules/ims_auth/doc/ims_auth_admin.xml (2) M src/modules/ims_charging/ccr.c (8) M src/modules/ims_charging/doc/ims_charging_admin.xml (2) M src/modules/ims_charging/ims_charging_mod.c (4) M src/modules/ims_charging/ro_session_hash.h (2) M src/modules/ims_charging/ro_timer.c (2) M src/modules/ims_charging/ro_timer.h (2) M src/modules/ims_dialog/dlg_cb.c (6) M src/modules/ims_dialog/dlg_handlers.c (4) M src/modules/ims_dialog/dlg_handlers.h (2) M src/modules/ims_dialog/dlg_hash.c (6) M src/modules/ims_dialog/dlg_req_within.c (4) M src/modules/ims_dialog/doc/ims_dialog_admin.xml (4) M src/modules/ims_dialog/doc/ims_dialog_devel.xml (6) M src/modules/ims_dialog/ims_dialog.c (2) M src/modules/ims_diameter_server/avp_helper.c (2) M src/modules/ims_diameter_server/cJSON.c (2) M src/modules/ims_diameter_server/doc/ims_diameter_server.xml (4) M src/modules/ims_diameter_server/examples/kamailio.cfg (8) M src/modules/ims_diameter_server/ims_diameter_server.c (4) M src/modules/ims_icscf/cxdx_avp.c (2) M src/modules/ims_icscf/cxdx_avp.h (2) M src/modules/ims_icscf/cxdx_lir.c (2) M src/modules/ims_icscf/cxdx_uar.c (3) M src/modules/ims_icscf/doc/ims_icscf_admin.xml (4) M src/modules/ims_ipsec_pcscf/cmd.c (4) M src/modules/ims_ipsec_pcscf/doc/ims_ipsec_pcscf_admin.xml (4) M src/modules/ims_ipsec_pcscf/ipsec.c (4) M src/modules/ims_ipsec_pcscf/spi_list.c (2) M src/modules/ims_isc/checker.c (2) M src/modules/ims_isc/doc/ims_isc_admin.xml (2) M src/modules/ims_isc/mark.c (10) M src/modules/ims_ocs/examples/full/kamailio.cfg (4) M src/modules/ims_ocs/examples/full/ocs.cfg.sample (2) M src/modules/ims_ocs/examples/simple/kamailio.cfg (4) M src/modules/ims_ocs/examples/simple/ocs.cfg.sample (2) M src/modules/ims_qos/cdpeventprocessor.c (2) M src/modules/ims_qos/doc/ims_qos_admin.xml (2) M src/modules/ims_qos/ims_qos_mod.c (14) M src/modules/ims_qos/rx_aar.c (4) M src/modules/ims_qos/rx_asr.c (2) M src/modules/ims_registrar_pcscf/async_reginfo.c (2) M src/modules/ims_registrar_pcscf/doc/ims_registrar_pcscf_admin.xml (4) M src/modules/ims_registrar_pcscf/save.h (2) M src/modules/ims_registrar_pcscf/service_routes.c (2) M src/modules/ims_registrar_scscf/cxdx_avp.c (2) M src/modules/ims_registrar_scscf/cxdx_avp.h (2) M src/modules/ims_registrar_scscf/cxdx_sar.c (2) M src/modules/ims_registrar_scscf/cxdx_sar.h (2) M src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml (4) M src/modules/ims_registrar_scscf/registrar_notify.c (18) M src/modules/ims_registrar_scscf/save.c (6) M src/modules/ims_registrar_scscf/save.h (2) M src/modules/ims_registrar_scscf/userdata_parser.c (2) M src/modules/ims_usrloc_pcscf/reginfo.h (2) M src/modules/ims_usrloc_pcscf/udomain.c (2) M src/modules/ims_usrloc_scscf/bin_utils.c (18) M src/modules/ims_usrloc_scscf/impurecord.c (2) M src/modules/ims_usrloc_scscf/subscribe.c (2) M src/modules/ims_usrloc_scscf/udomain.c (6) M src/modules/ims_usrloc_scscf/ul_callback.h (2) M src/modules/ims_usrloc_scscf/usrloc.h (2) M src/modules/ipops/ipops_mod.c (8) M src/modules/ipops/ipops_pv.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3363.patch https://github.com/kamailio/kamailio/pull/3363.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3363 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3363(a)github.com>

2 1

[kamailio/kamailio] tos as text does not works (Issue #3368)
by sergey-safarov 13 Feb '23

13 Feb '23

### Description According to [RFC4594](https://datatracker.ietf.org/doc/html/rfc4594#page-19) ``` ------------------------------------------------------------------ | Service | DSCP | DSCP | Application | | Class Name | Name | Value | Examples | |===============+=========+=============+==========================| |Network Control| CS6 | 110000 | Network routing | |---------------+---------+-------------+--------------------------| | Telephony | EF | 101110 | IP Telephony bearer | |---------------+---------+-------------+--------------------------| | Signaling | CS5 | 101000 | IP Telephony signaling | |---------------+---------+-------------+--------------------------| ``` Kamailio should relay SIP messages with DCSP value `CS5` To set this value I can use in config file ``` tos=0xA0 ``` This works as expected But when I use text form this does not work ``` tos=IPTOS_PREC_CRITIC_ECP ``` `IPTOS_PREC_CRITIC_ECP` defined in the `/usr/include/linux/ip.h` as ``` #define IPTOS_PREC_CRITIC_ECP 0xa0 ``` I expect both forms `0xA0` and `IPTOS_PREC_CRITIC_ECP` should works. Tested on 5.6.2 version -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3368 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3368(a)github.com>

3 3

git:master:0259eaed: xmlrpc: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 0259eaedd507c314161c59b72eaa4564effac555 URL: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 xmlrpc: cast to uint64_t when using time_t value --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… Patch: https://github.com/kamailio/kamailio/commit/0259eaedd507c314161c59b72eaa456… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 7cfb856774..bddf864206 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -43,6 +43,7 @@ #include <string.h> #include <stdlib.h> #include <stdio.h> +#include <stdint.h> #include <stdarg.h> #include <sys/types.h> #include <signal.h> @@ -1335,7 +1336,7 @@ static int get_int(int* val, struct xmlrpc_reply* reply, ret=-1; break; case XML_T_DATE: - *val = xmlrpc2time(val_str); + *val = (int)(uint64_t)xmlrpc2time(val_str); break; case XML_T_DOUBLE: *val = (int)strtod(val_str, &end_ptr);

1 0

git:master:34ce0de7: presence: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 34ce0de749c20e1b5a2e58fdaaca841d75622d2c URL: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 presence: cast to uint64_t when using time_t value - startup time stored as unsigned int insted of signed int --- Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… Patch: https://github.com/kamailio/kamailio/commit/34ce0de749c20e1b5a2e58fdaaca841… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index d6e287c40e..599e048e4d 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -142,7 +142,7 @@ static int fixup_has_subscribers(void **param, int param_no); int pres_counter = 0; int pres_pid = 0; char pres_prefix = 'a'; -int pres_startup_time = 0; +unsigned int pres_startup_time = 0; str pres_db_url = {0, 0}; int pres_expires_offset = 0; int pres_cseq_offset = 0; @@ -447,7 +447,7 @@ static int mod_init(void) } - pres_startup_time = (int)time(NULL); + pres_startup_time = (unsigned int)(uint64_t)time(NULL); if(pres_clean_period > 0) { if(pres_timer_mode==0) { register_timer(ps_presentity_db_timer_clean, 0, pres_clean_period); diff --git a/src/modules/presence/presence.h b/src/modules/presence/presence.h index 381029184a..390aee49f8 100644 --- a/src/modules/presence/presence.h +++ b/src/modules/presence/presence.h @@ -73,7 +73,7 @@ extern str watchers_table; extern int pres_counter; extern int pres_pid; -extern int pres_startup_time; +extern unsigned int pres_startup_time; extern int pres_expires_offset; extern int pres_cseq_offset; extern str pres_server_address; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 2ac5190495..f9131e9a4e 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -69,7 +69,7 @@ char *generate_ETag(int publ_count) ERR_MEM(PKG_MEM_STR); } memset(etag, 0, ETAG_LEN * sizeof(char)); - size = snprintf(etag, ETAG_LEN, "%c.%d.%d.%d.%d", pres_prefix, + size = snprintf(etag, ETAG_LEN, "%c.%u.%d.%d.%d", pres_prefix, pres_startup_time, pres_pid, pres_counter, publ_count); if(size < 0) { LM_ERR("unsuccessful snprintf\n ");

1 0

git:master:33b31935: core: sruid - cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 33b319353a097ba8fd80e45dc4f008c2e9dfe813 URL: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 core: sruid - cast to uint64_t when using time_t value --- Modified: src/core/utils/sruid.c --- Diff: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… Patch: https://github.com/kamailio/kamailio/commit/33b319353a097ba8fd80e45dc4f008c… --- diff --git a/src/core/utils/sruid.c b/src/core/utils/sruid.c index e7a49f2a62..5888ffbdcb 100644 --- a/src/core/utils/sruid.c +++ b/src/core/utils/sruid.c @@ -30,6 +30,7 @@ #include <stdio.h> #include <unistd.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include <time.h> @@ -66,7 +67,7 @@ static int sruid_shift_lfsr(unsigned int *lfsr, unsigned int mask) static void sruid_init_lfsr(void) { - sruid_lfsr32 = (unsigned int)time(NULL); + sruid_lfsr32 = (unsigned int)(uint64_t)time(NULL); sruid_lfsr31 = (unsigned int)getpid(); } @@ -101,11 +102,11 @@ int sruid_init(sruid_t *sid, char sep, char *cid, int mode) if(server_id!=0) i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c%x%c", (unsigned int)server_id, sep, - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); else i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c", - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); if(i<=0 || i>SRUID_SIZE-13) { LM_ERR("could not initialize sruid struct - output len: %d\n", i); @@ -141,11 +142,11 @@ int sruid_reinit(sruid_t *sid, int mode) if(server_id!=0) { i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c%x%c", (unsigned int)server_id, sep, - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); } else { i = snprintf(sid->buf+5, SRUID_SIZE - 5 /*so far*/ - 8 /* extra int */, "%x%c%x%c", - (unsigned int)time(NULL), sep, (unsigned int)my_pid(), sep); + (unsigned int)(uint64_t)time(NULL), sep, (unsigned int)my_pid(), sep); } if(i<=0 || i>SRUID_SIZE-13) {

1 0

git:master:c464add1: xprint: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c464add1531aea5fda3f7c5a6670bd90e7ac594b URL: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 xprint: cast to uint64_t when using time_t value --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… Patch: https://github.com/kamailio/kamailio/commit/c464add1531aea5fda3f7c5a6670bd9… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 06b744fe92..3b1c59e57c 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -28,6 +28,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <time.h> #include <unistd.h> @@ -144,7 +145,7 @@ static int xl_get_times(struct sip_msg *msg, str *res, str *hp, int hi, int hf) msg_tm = time(NULL); msg_id = msg->id; } - ch = int2str_base_0pad(msg_tm, &l, hi, hi==10?0:8); + ch = int2str_base_0pad((unsigned int)(uint64_t)msg_tm, &l, hi, hi==10?0:8); res->s = ch; res->len = l;

1 0

git:master:cc3ec58c: kmeix: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: cc3ec58c1e3c203c76c59b17ccc14e24ffc6f8cf URL: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 kmeix: cast to uint64_t when using time_t value --- Modified: src/modules/kemix/kemix_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… Patch: https://github.com/kamailio/kamailio/commit/cc3ec58c1e3c203c76c59b17ccc14e2… --- diff --git a/src/modules/kemix/kemix_mod.c b/src/modules/kemix/kemix_mod.c index 80d7807740..e6bff3841c 100644 --- a/src/modules/kemix/kemix_mod.c +++ b/src/modules/kemix/kemix_mod.c @@ -23,6 +23,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <time.h> #include "../../core/sr_module.h" @@ -952,7 +953,7 @@ static sr_kemi_xval_t* ki_kx_get_nhuri(sip_msg_t *msg) */ static int ki_kx_get_timestamp(sip_msg_t *msg) { - return (int)time(NULL); + return (int)(uint64_t)time(NULL); } /**

1 0

git:master:ae3e52da: core: select - cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: ae3e52daec9be45c4663708cb216b13864521a35 URL: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 core: select - cast to uint64_t when using time_t value --- Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… Patch: https://github.com/kamailio/kamailio/commit/ae3e52daec9be45c4663708cb216b13… --- diff --git a/src/core/select_core.c b/src/core/select_core.c index ff5d6ef6b3..333f7a4513 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ @@ -26,7 +26,8 @@ * Module: \ref core */ -#include <stdlib.h> +#include <stdlib.h> +#include <stdint.h> #include "select.h" #include "select_core.h" #include "select_buf.h" @@ -60,7 +61,7 @@ #include "rand/kam_rand.h" #define RETURN0_res(x) {*res=(x);return 0;} -#define TRIM_RET0_res(x) {*res=(x);trim(res);return 0;} +#define TRIM_RET0_res(x) {*res=(x);trim(res);return 0;} #define TEST_RET_res_body(x) if (x){*res=(x)->body;return 0;}else return 1; #define TEST_RET_res_value(x) if (x){*res=(x)->value;return 0;}else return 1; @@ -1485,7 +1486,7 @@ int select_sys_unique(str* res, select_t* s, struct sip_msg* msg) { c = int2str_base_0pad(getpid(), &l, 16, UNIQUE_ID_PID_LEN); memcpy(uniq_id, c, UNIQUE_ID_PID_LEN); uniq_id[UNIQUE_ID_PID_LEN] = '-'; - c = int2str_base_0pad(time(NULL), &l, 16, UNIQUE_ID_TIME_LEN); + c = int2str_base_0pad((unsigned int)(uint64_t)time(NULL), &l, 16, UNIQUE_ID_TIME_LEN); memcpy(uniq_id+UNIQUE_ID_PID_LEN+1, c, UNIQUE_ID_TIME_LEN); uniq_id[UNIQUE_ID_PID_LEN+1+UNIQUE_ID_TIME_LEN] = '-'; @@ -1525,7 +1526,7 @@ int select_sys_unique(str* res, select_t* s, struct sip_msg* msg) { int select_sys_now(str* res, select_t* s, struct sip_msg* msg) { - return uint_to_static_buffer(res, time(NULL)); + return uint_to_static_buffer(res, (unsigned int)(uint64_t)time(NULL)); } int select_sys_now_fmt(str* res, select_t* s, struct sip_msg* msg)

1 0

git:master:7e29c28e: drouting: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 7e29c28e4da5c7286a75422d6f538b932961a168 URL: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 drouting: cast to uint64_t when using time_t value --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… Patch: https://github.com/kamailio/kamailio/commit/7e29c28e4da5c7286a75422d6f538b9… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 55d09a57ca..dd601c3c4a 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <string.h> #include <time.h> +#include <stdint.h> #include "../../core/mem/shm_mem.h" #include "dr_time.h" @@ -911,7 +912,7 @@ int dr_check_tmrec(dr_tmrec_p _trp, dr_ac_tm_p _atp, dr_tr_res_p _tsw) int dr_check_freq_interval(dr_tmrec_p _trp, dr_ac_tm_p _atp) { - int _t0, _t1; + uint64_t _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -929,12 +930,12 @@ int dr_check_freq_interval(dr_tmrec_p _trp, dr_ac_tm_p _atp) _tm.tm_year = _trp->ts.tm_year; _tm.tm_mon = _trp->ts.tm_mon; _tm.tm_mday = _trp->ts.tm_mday; - _t0 = (int)mktime(&_tm); + _t0 = (uint64_t)mktime(&_tm); memset(&_tm, 0, sizeof(struct tm)); _tm.tm_year = _atp->t.tm_year; _tm.tm_mon = _atp->t.tm_mon; _tm.tm_mday = _atp->t.tm_mday; - _t1 = (int)mktime(&_tm); + _t1 = (uint64_t)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1 - _t0) / (24 * 3600)) % _trp->interval == 0) ? REC_MATCH

1 0

git:master:c7217d14: mtree: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: c7217d147b615da6ebf3841a3915055aa529dd70 URL: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-13T09:51:51+01:00 mtree: cast to uint64_t when using time_t value --- Modified: src/modules/mtree/mtree.c Modified: src/modules/mtree/mtree.h Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… Patch: https://github.com/kamailio/kamailio/commit/c7217d147b615da6ebf3841a3915055… --- diff --git a/src/modules/mtree/mtree.c b/src/modules/mtree/mtree.c index 7ee303749a..ef1dd54ae5 100644 --- a/src/modules/mtree/mtree.c +++ b/src/modules/mtree/mtree.c @@ -122,7 +122,7 @@ m_tree_t* mt_init_tree(str* tname, str *dbtable, str *scols, int type, pt->type = type; pt->multi = multi; - pt->reload_time = (unsigned int)time(NULL); + pt->reload_time = (uint64_t)time(NULL); pt->tname.s = (char*)shm_malloc((1+tname->len)*sizeof(char)); if(pt->tname.s==NULL) { diff --git a/src/modules/mtree/mtree.h b/src/modules/mtree/mtree.h index acc8ef0706..1d5c665f47 100644 --- a/src/modules/mtree/mtree.h +++ b/src/modules/mtree/mtree.h @@ -25,6 +25,8 @@ #ifndef _MTREE_H_ #define _MTREE_H_ +#include <stdint.h> + #include "../../core/str.h" #include "../../core/parser/msg_parser.h" #include "../../core/rpc.h" @@ -76,7 +78,7 @@ typedef struct _m_tree unsigned int nritems; unsigned int memsize; unsigned int reload_count; - unsigned int reload_time; + uint64_t reload_time; mt_node_t *head; struct _m_tree *next; } m_tree_t; diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 66f72bbd02..b8a0ee5722 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -560,7 +560,7 @@ static int mt_load_db(m_tree_t *pt) new_tree.nritems = 0; new_tree.memsize = 0; new_tree.reload_count++; - new_tree.reload_time = (unsigned int)time(NULL); + new_tree.reload_time = (uint64_t)time(NULL); if (mt_dbf.use_table(db_con, &old_tree->dbtable) < 0) @@ -888,13 +888,13 @@ void rpc_mtree_summary(rpc_t* rpc, void* c) rpc->fault(c, 500, "Internal error adding items"); return; } - if(rpc->struct_add(ih, "d", "reload_count", - (int)pt->reload_count) < 0 ) { + if(rpc->struct_add(ih, "j", "reload_count", + pt->reload_count) < 0 ) { rpc->fault(c, 500, "Internal error adding items"); return; } - if(rpc->struct_add(ih, "d", "reload_time", - (int)pt->reload_time) < 0 ) { + if(rpc->struct_add(ih, "J", "reload_time", + pt->reload_time) < 0 ) { rpc->fault(c, 500, "Internal error adding items"); return; }

1 0

git:master:05ea2235: modules: readme files regenerated - auth ... [skip ci]
by Kamailio Dev 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 05ea223549f4834c5e3b92f9025d5cf8a2b73890 URL: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-13T09:31:40+01:00 modules: readme files regenerated - auth ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/dispatcher/README Modified: src/modules/dlgs/README Modified: src/modules/ims_usrloc_scscf/README Modified: src/modules/pua_usrloc/README Modified: src/modules/secsipid/README Modified: src/modules/tsilo/README Modified: src/modules/uid_avp_db/README Modified: src/modules/uid_uri_db/README Modified: src/modules/uri_db/README --- Diff: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf… Patch: https://github.com/kamailio/kamailio/commit/05ea223549f4834c5e3b92f9025d5cf…

1 0

git:master:0df94c3b: auth: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 0df94c3ba0fe249e29db52691176bbe751e556b6 URL: https://github.com/kamailio/kamailio/commit/0df94c3ba0fe249e29db52691176bbe… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 auth: docs fixes --- Modified: src/modules/auth/doc/auth_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/0df94c3ba0fe249e29db52691176bbe… Patch: https://github.com/kamailio/kamailio/commit/0df94c3ba0fe249e29db52691176bbe… --- diff --git a/src/modules/auth/doc/auth_params.xml b/src/modules/auth/doc/auth_params.xml index e3cb3ddfb4..5527ef557c 100644 --- a/src/modules/auth/doc/auth_params.xml +++ b/src/modules/auth/doc/auth_params.xml @@ -30,8 +30,8 @@ <title><varname>auth_checks_in_dlg</varname> (flags)</title> <para> These three module parameters control which optional integrity - checks will be performed on the SIP message carrying digest response - during SIP MD5 digest authentication. <varname>auth_check_register</varname> + checks will be performed on the SIP message carrying digest response + during SIP MD5 digest authentication. <varname>auth_checks_register</varname> controls integrity checks to be performed on REGISTER messages, <varname>auth_checks_no_dlg</varname> controls which optional integrity checks will be performed on SIP requests that have no To @@ -197,7 +197,8 @@ modparam("auth", "qop", "auth") # set qop=auth If a response doesn't include <emphasis>qop</emphasis> or <emphasis>nc</emphasis> (for example obsolete UAs that don't support them) the response will be checked according to the other enabled - nonce checks, in this order: one_time_nonce and auth_check_*. + nonce checks, in this order: <varname>one_time_nonce</varname> and + <varname>auth_checks_*</varname>. If a response includes <emphasis>nc</emphasis> only the normal <varname>nonce_expire</varname> checks and the <varname>nonce_count</varname> checks will be performed, all

1 0

git:master:a22aadf3: secsipid: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: a22aadf3b51f5bfff5b50a3de9a354fe07c216f4 URL: https://github.com/kamailio/kamailio/commit/a22aadf3b51f5bfff5b50a3de9a354f… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 secsipid: docs fixes --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a22aadf3b51f5bfff5b50a3de9a354f… Patch: https://github.com/kamailio/kamailio/commit/a22aadf3b51f5bfff5b50a3de9a354f… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index be388c17d6..ceed6e2984 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -117,7 +117,7 @@ modparam("secsipid", "timeout", 2) <section> <title><varname>cache_dir</varname> (str)</title> <para> - The path to the directory where to save cached pyblic keys. If set, + The path to the directory where to save cached public keys. If set, it activates the public key file caching in the libsecsipid library. </para> <para>

1 0

git:master:fdb36374: uid_uri_db: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: fdb3637460b16ddfea86ba67b9181a40d1466395 URL: https://github.com/kamailio/kamailio/commit/fdb3637460b16ddfea86ba67b9181a4… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 uid_uri_db: docs fixes --- Modified: src/modules/uid_uri_db/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/fdb3637460b16ddfea86ba67b9181a4… Patch: https://github.com/kamailio/kamailio/commit/fdb3637460b16ddfea86ba67b9181a4… --- diff --git a/src/modules/uid_uri_db/doc/params.xml b/src/modules/uid_uri_db/doc/params.xml index d325cc7f71..d12e446482 100644 --- a/src/modules/uid_uri_db/doc/params.xml +++ b/src/modules/uid_uri_db/doc/params.xml @@ -44,8 +44,8 @@ modparam("module", "uri_table", "uri") </example> </section> - <section id="uri_user_column"> - <title><varname>uri_user_column</varname> (string)</title> + <section id="username_column"> + <title><varname>username_column</varname> (string)</title> <para> Column holding usernames in the URI table. </para> @@ -53,10 +53,10 @@ modparam("module", "uri_table", "uri") Default value is "username". </para> <example> - <title>Set <varname>uri_user_column</varname> parameter</title> + <title>Set <varname>username_column</varname> parameter</title> <programlisting> ... -modparam("module", "uri_user_column", "username") +modparam("module", "username_column", "username") ... </programlisting> </example>

1 0

git:master:1bbe8726: uri_db: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 1bbe87261d17219dfc3b7b98e1f9f16f4e0f48b9 URL: https://github.com/kamailio/kamailio/commit/1bbe87261d17219dfc3b7b98e1f9f16… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 uri_db: docs fixes --- Modified: src/modules/uri_db/doc/uri_db_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1bbe87261d17219dfc3b7b98e1f9f16… Patch: https://github.com/kamailio/kamailio/commit/1bbe87261d17219dfc3b7b98e1f9f16… --- diff --git a/src/modules/uri_db/doc/uri_db_admin.xml b/src/modules/uri_db/doc/uri_db_admin.xml index c5507b3c01..ba119782ee 100644 --- a/src/modules/uri_db/doc/uri_db_admin.xml +++ b/src/modules/uri_db/doc/uri_db_admin.xml @@ -80,7 +80,7 @@ modparam("uri_db", "db_url", "mysql://username:password@localhost/kamailio") The DB table that should be used. It is possible to use the <quote>subscriber</quote> and <quote>uri</quote> table. If the <quote>uri</quote> table should be used, an additional parameter - <quote>use-uri-table</quote>) must be set. + <quote>use_uri_table</quote>) must be set. </para> <para> <emphasis> @@ -88,7 +88,7 @@ modparam("uri_db", "db_url", "mysql://username:password@localhost/kamailio") </emphasis> </para> <example> - <title>Set <varname>uri_table</varname> parameter</title> + <title>Set <varname>db_table</varname> parameter</title> <programlisting format="linespecific"> ... modparam("uri_db", "db_table", "uri")

1 0

[kamailio/kamailio] Docs fixes (PR #3367)
by Bastian Triller 13 Feb '23

13 Feb '23

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3367 -- Commit Summary -- * dlgs: docs fixes * dispatcher: docs fixes * ims_usrloc_scscf: docs fixes * pua_usrloc: docs fixes * tsilo: docs fixes * uid_avp_db: docs fixes * uid_uri_db: docs fixes * uri_db: docs fixes * auth: docs fixes * secsipid: docs fixes -- File Changes -- M src/modules/auth/doc/auth_params.xml (7) M src/modules/dispatcher/doc/dispatcher_admin.xml (2) M src/modules/dlgs/doc/dlgs_admin.xml (26) M src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml (4) M src/modules/pua_usrloc/doc/pua_usrloc_admin.xml (2) M src/modules/secsipid/doc/secsipid_admin.xml (2) M src/modules/tsilo/doc/tsilo_admin.xml (2) M src/modules/uid_avp_db/doc/params.xml (2) M src/modules/uid_avp_db/uid_avp_db.c (4) M src/modules/uid_uri_db/doc/params.xml (8) M src/modules/uri_db/doc/uri_db_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3367.patch https://github.com/kamailio/kamailio/pull/3367.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3367 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3367(a)github.com>

2 2

git:master:73830ac7: pua_usrloc: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 73830ac71534efecc2b38816a20f6f113c27aaf2 URL: https://github.com/kamailio/kamailio/commit/73830ac71534efecc2b38816a20f6f1… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 pua_usrloc: docs fixes --- Modified: src/modules/pua_usrloc/doc/pua_usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/73830ac71534efecc2b38816a20f6f1… Patch: https://github.com/kamailio/kamailio/commit/73830ac71534efecc2b38816a20f6f1… --- diff --git a/src/modules/pua_usrloc/doc/pua_usrloc_admin.xml b/src/modules/pua_usrloc/doc/pua_usrloc_admin.xml index 2cfeb6ec80..f2d53bbd42 100644 --- a/src/modules/pua_usrloc/doc/pua_usrloc_admin.xml +++ b/src/modules/pua_usrloc/doc/pua_usrloc_admin.xml @@ -97,7 +97,7 @@ modparam("pua_usrloc", "default_domain", "kamailio.org") </emphasis> </para> <example> - <title>Set <varname>presentity_prefix</varname> parameter</title> + <title>Set <varname>entity_prefix</varname> parameter</title> <programlisting format="linespecific"> ... modparam("pua_usrloc", "entity_prefix", "pres")

1 0

git:master:48895319: tsilo: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 4889531912e7c04c0e1d04dd81dec21f4520455c URL: https://github.com/kamailio/kamailio/commit/4889531912e7c04c0e1d04dd81dec21… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 tsilo: docs fixes --- Modified: src/modules/tsilo/doc/tsilo_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4889531912e7c04c0e1d04dd81dec21… Patch: https://github.com/kamailio/kamailio/commit/4889531912e7c04c0e1d04dd81dec21… --- diff --git a/src/modules/tsilo/doc/tsilo_admin.xml b/src/modules/tsilo/doc/tsilo_admin.xml index f762bd6b95..5f23ae9fc7 100644 --- a/src/modules/tsilo/doc/tsilo_admin.xml +++ b/src/modules/tsilo/doc/tsilo_admin.xml @@ -310,7 +310,7 @@ if (is_method("REGISTER")) { if (is_method("REGISTER")) { $var(tindex) = ... $var(tlabel) = ... - ts_append_to("$var(tindex)", "$var(tlabel", "location"); + ts_append_to("$var(tindex)", "$var(tlabel)", "location"); } ... </programlisting>

1 0

git:master:9ffe7b06: uid_avp_db: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 9ffe7b06b094a4af558a0033c1baa16e5c61977b URL: https://github.com/kamailio/kamailio/commit/9ffe7b06b094a4af558a0033c1baa16… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 uid_avp_db: docs fixes --- Modified: src/modules/uid_avp_db/doc/params.xml Modified: src/modules/uid_avp_db/uid_avp_db.c --- Diff: https://github.com/kamailio/kamailio/commit/9ffe7b06b094a4af558a0033c1baa16… Patch: https://github.com/kamailio/kamailio/commit/9ffe7b06b094a4af558a0033c1baa16… --- diff --git a/src/modules/uid_avp_db/doc/params.xml b/src/modules/uid_avp_db/doc/params.xml index b83404f1e0..3a3b543f99 100644 --- a/src/modules/uid_avp_db/doc/params.xml +++ b/src/modules/uid_avp_db/doc/params.xml @@ -71,7 +71,7 @@ </section> <section> - <title><varname>name</varname> (string)</title> + <title><varname>name_column</varname> (string)</title> <para> The name of the column containing attribute names. </para> diff --git a/src/modules/uid_avp_db/uid_avp_db.c b/src/modules/uid_avp_db/uid_avp_db.c index b391d8778b..d73e665379 100644 --- a/src/modules/uid_avp_db/uid_avp_db.c +++ b/src/modules/uid_avp_db/uid_avp_db.c @@ -108,8 +108,8 @@ static param_export_t params[] = { {"flags_column", PARAM_STRING, &flags_column }, {"scheme_column", PARAM_STRING, &scheme_column }, - {"attr_group", PARAM_STR | PARAM_USE_FUNC, (void*)declare_attr_group }, - {"auto_unlock_extra_attrs", PARAM_INT, &auto_unlock }, + {"attr_group", PARAM_STR | PARAM_USE_FUNC, (void*)declare_attr_group }, + {"auto_unlock_extra_attrs", PARAM_INT, &auto_unlock }, {0, 0, 0} };

1 0

git:master:a10f6fbc: dispatcher: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: a10f6fbcd0c62663102fc3cd7caf82096d3c8a7f URL: https://github.com/kamailio/kamailio/commit/a10f6fbcd0c62663102fc3cd7caf820… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 dispatcher: docs fixes --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/a10f6fbcd0c62663102fc3cd7caf820… Patch: https://github.com/kamailio/kamailio/commit/a10f6fbcd0c62663102fc3cd7caf820… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 022c915e13..e296f1c5bc 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -771,7 +771,7 @@ modparam("dispatcher", "ds_ping_latency_stats", 1) </emphasis> </para> <example> - <title>Set the <quote>ds_hash_size</quote> parameter</title> + <title>Set the <quote>ds_latency_estimator_alpha</quote> parameter</title> <programlisting format="linespecific"> ... modparam("dispatcher", "ds_latency_estimator_alpha", 900)

1 0

git:master:beee3a4a: ims_usrloc_scscf: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: beee3a4a872601bda2d440da2e79ec684c18a8bc URL: https://github.com/kamailio/kamailio/commit/beee3a4a872601bda2d440da2e79ec6… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 ims_usrloc_scscf: docs fixes --- Modified: src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/beee3a4a872601bda2d440da2e79ec6… Patch: https://github.com/kamailio/kamailio/commit/beee3a4a872601bda2d440da2e79ec6… --- diff --git a/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml b/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml index e505311d3f..fc8400c5f6 100644 --- a/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml +++ b/src/modules/ims_usrloc_scscf/doc/ims_usrloc_scscf_admin.xml @@ -124,7 +124,7 @@ <para>Max number of subscribes allowed per watcher for each IMPU </para> <para><emphasis> Default value is 0. </emphasis></para> <example> - <title>Set <varname>subscription_expires_range</varname> parameter</title> + <title>Set <varname>max_subscribes</varname> parameter</title> <programlisting format="linespecific">... modparam("ims_usrloc_scscf", "max_subscribes", 2) </programlisting> @@ -279,7 +279,7 @@ <para>If contact is put into delay delete state, this is how long we delay before deleting </para> <para><emphasis> Default value is 30</emphasis></para> <example> - <title>Set <varname>contact_delete_delay </varname>parameter</title> + <title>Set <varname>contact_delete_delay</varname>parameter</title> <programlisting format="linespecific"> modparam("ims_usrloc_scscf", "contact_delete_delay", 32) </programlisting>

1 0

git:master:4fd41112: dlgs: docs fixes
by Henning Westerholt 13 Feb '23

13 Feb '23

Module: kamailio Branch: master Commit: 4fd411126d72402278c886895518c44a916bebfc URL: https://github.com/kamailio/kamailio/commit/4fd411126d72402278c886895518c44… Author: Bastian Triller <bastian.triller(a)gmail.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2023-02-13T09:25:30+01:00 dlgs: docs fixes --- Modified: src/modules/dlgs/doc/dlgs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4fd411126d72402278c886895518c44… Patch: https://github.com/kamailio/kamailio/commit/4fd411126d72402278c886895518c44… --- diff --git a/src/modules/dlgs/doc/dlgs_admin.xml b/src/modules/dlgs/doc/dlgs_admin.xml index bac89a0e28..03027c21fd 100644 --- a/src/modules/dlgs/doc/dlgs_admin.xml +++ b/src/modules/dlgs/doc/dlgs_admin.xml @@ -148,6 +148,28 @@ modparam("dlgs", "timer_interval", 60) </programlisting> </example> </section> + <section id="dlgs.p.hash_size"> + <title><varname>hash_size</varname> (integer)</title> + <para> + The size of the hash table internally used to keep the dialogs. A + larger table is much faster but consumes more memory. The hash size + must be a power of two. + </para> + <para> + <emphasis> + Default value is <quote>9</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>hash_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dlgs", "hash_size", 5) +... +</programlisting> + </example> + </section> + </section> <section> @@ -392,10 +414,10 @@ request_route { the same meaning like those for dlgs_count(...). </para> <example> - <title><function>dlgs.get</function> usage</title> + <title><function>dlgs.getall</function> usage</title> <programlisting format="linespecific"> ... -&kamctl; rpc dlgs.get src eq sip:alice@sipserver.com +&kamctl; rpc dlgs.getall src eq sip:alice@sipserver.com ... </programlisting> </example>

1 0

Commits to be merged in kamailio releases
by eric.mvondo＠orange.com 13 Feb '23

13 Feb '23

Hello Kamailio Community dev, I made a couple months ago 2 two contributions that have been merged in master branch. * tm: new param to specify reply codes for dns srv failover [ commit 062e6daa0f149e01674667f77608afb35b6e099a ] * topos: disable multiple comma separated values in One Single Via, Record-Route or Route header if needed [ commit 54fe9d29d15bd15b60950035ad348baacbb868fe ] but until now I don't see them In the last 3 previous releases. It's a must functionality for us. Thanks for feedbacks. Orange Restricted _________________________________________________________________________________________________________________________ Ce message et ses pieces jointes peuvent contenir des informations confidentielles ou privilegiees et ne doivent donc pas etre diffuses, exploites ou copies sans autorisation. Si vous avez recu ce message par erreur, veuillez le signaler a l'expediteur et le detruire ainsi que les pieces jointes. Les messages electroniques etant susceptibles d'alteration, Orange decline toute responsabilite si ce message a ete altere, deforme ou falsifie. Merci. This message and its attachments may contain confidential or privileged information that may be protected by law; they should not be distributed, used or copied without authorisation. If you have received this email in error, please notify the sender and delete this message and its attachments. As emails may be altered, Orange is not liable for messages that have been modified, changed or falsified. Thank you.

2 1

git:master:2384c389: modules: readme files regenerated - ctl ... [skip ci]
by Kamailio Dev 10 Feb '23

10 Feb '23

Module: kamailio Branch: master Commit: 2384c38947ce351a421b92727ae304fcbec211a4 URL: https://github.com/kamailio/kamailio/commit/2384c38947ce351a421b92727ae304f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-10T18:01:22+01:00 modules: readme files regenerated - ctl ... [skip ci] --- Modified: src/modules/ctl/README --- Diff: https://github.com/kamailio/kamailio/commit/2384c38947ce351a421b92727ae304f… Patch: https://github.com/kamailio/kamailio/commit/2384c38947ce351a421b92727ae304f… --- diff --git a/src/modules/ctl/README b/src/modules/ctl/README index 0e0b22565e..d7a3da9318 100644 --- a/src/modules/ctl/README +++ b/src/modules/ctl/README @@ -16,7 +16,7 @@ Andrei Pelinescu-Onciul 3. Parameters 3.1. binrpc (string) - 3.2. binrpc_buffer_size (integer or string) + 3.2. binrpc_buffer_size (integer) 3.3. mode (integer) 3.4. user (integer or string) 3.5. group (integer or string) @@ -56,7 +56,7 @@ Chapter 1. Admin Guide 3. Parameters 3.1. binrpc (string) - 3.2. binrpc_buffer_size (integer or string) + 3.2. binrpc_buffer_size (integer) 3.3. mode (integer) 3.4. user (integer or string) 3.5. group (integer or string) @@ -115,7 +115,7 @@ $ kamcmd ps 3. Parameters 3.1. binrpc (string) - 3.2. binrpc_buffer_size (integer or string) + 3.2. binrpc_buffer_size (integer) 3.3. mode (integer) 3.4. user (integer or string) 3.5. group (integer or string) @@ -170,7 +170,7 @@ modparam("ctl", "binrpc", "localhost:3000") # udp modparam("ctl", "binrpc", "tcp:3012") # tcp any , port 3012 modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 -3.2. binrpc_buffer_size (integer or string) +3.2. binrpc_buffer_size (integer) The size of the internal buffer used for printing elements of the RPC response (e.g., internal RPC printf()). The value is given in bytes.

1 0

git:master:44381746: ctl: doc - binrpc_buffer_size can get only integer value
by Daniel-Constantin Mierla 10 Feb '23

10 Feb '23

Module: kamailio Branch: master Commit: 44381746e0e826e8db04597942fa4cee6cbf9175 URL: https://github.com/kamailio/kamailio/commit/44381746e0e826e8db04597942fa4ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-10T17:53:42+01:00 ctl: doc - binrpc_buffer_size can get only integer value --- Modified: src/modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/44381746e0e826e8db04597942fa4ce… Patch: https://github.com/kamailio/kamailio/commit/44381746e0e826e8db04597942fa4ce… --- diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index 558d706464..5f944d7985 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -90,7 +90,7 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 </section> <section id="binrpc_buffer_size"> - <title><varname>binrpc_buffer_size</varname> (integer or string)</title> + <title><varname>binrpc_buffer_size</varname> (integer)</title> <para> The size of the internal buffer used for printing elements of the RPC response (e.g., internal RPC printf()). The value is given in bytes.

1 0

git:5.5:ee526921: pkg/kamailio: fixed rpm packging for CentOS 6
by Sergey Safarov 10 Feb '23

10 Feb '23

Module: kamailio Branch: 5.5 Commit: ee52692185a959a30d30382d72fb9578917d59b6 URL: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:48:44+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 (cherry picked from commit db634e7fb3e5913238561afb4381363bbfe58882) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… Patch: https://github.com/kamailio/kamailio/commit/ee52692185a959a30d30382d72fb957… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index dc341430327..58b0e572cf2 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -728,8 +728,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 0

git:5.6:b7f8c5a4: pkg/kamailio: fixed rpm packging for CentOS 6
by Sergey Safarov 10 Feb '23

10 Feb '23

Module: kamailio Branch: 5.6 Commit: b7f8c5a44b0f4d3e09e6cad1eaeeae7e9330cffe URL: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:47:53+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 (cherry picked from commit db634e7fb3e5913238561afb4381363bbfe58882) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… Patch: https://github.com/kamailio/kamailio/commit/b7f8c5a44b0f4d3e09e6cad1eaeeae7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 42c9bce60a..5a84894863 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 0

git:master:db634e7f: pkg/kamailio: fixed rpm packging for CentOS 6
by Sergey Safarov 10 Feb '23

10 Feb '23

Module: kamailio Branch: master Commit: db634e7fb3e5913238561afb4381363bbfe58882 URL: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2023-02-10T16:47:04+03:00 pkg/kamailio: fixed rpm packging for CentOS 6 --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… Patch: https://github.com/kamailio/kamailio/commit/db634e7fb3e5913238561afb4381363… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 36b3d65f08..bb608525b5 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -736,8 +736,12 @@ BuildRequires: zlib-devel Requires: libmysqlclient18 BuildRequires: libmysqlclient-devel %else +%if 0%{?rhel} == 6 +BuildRequires: mysql-devel +%else BuildRequires: mariadb-devel %endif +%endif %description mysql MySQL database connectivity for Kamailio.

1 0

git:master:857d777b: dlgs: cast to uint64_t when using time_t values
by Daniel-Constantin Mierla 10 Feb '23

10 Feb '23

Module: kamailio Branch: master Commit: 857d777b73d3802d157042b0ea7126b7b8dd45f8 URL: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-10T08:04:24+01:00 dlgs: cast to uint64_t when using time_t values --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… Patch: https://github.com/kamailio/kamailio/commit/857d777b73d3802d157042b0ea7126b… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 9fe29ca0b9..2f0bb65b6c 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -24,6 +24,7 @@ #include <unistd.h> #include <stdlib.h> #include <string.h> +#include <stdint.h> #include <regex.h> #include <fnmatch.h> @@ -657,8 +658,8 @@ int dlgs_ht_dbg(void) LM_ERR("\tdst: %.*s\n", it->dst.len, it->dst.s); LM_ERR("\tdata: %.*s\n", it->data.len, it->data.s); LM_ERR("\truid: %.*s\n", it->ruid.len, it->ruid.s); - LM_ERR("\thashid: %u ts_init: %u ts_answer: %u\n", it->hashid, - (unsigned int)it->ts_init, (unsigned int)it->ts_answer); + LM_ERR("\thashid: %u ts_init: %llu ts_answer: %llu\n", it->hashid, + (uint64_t)it->ts_init, (uint64_t)it->ts_answer); it = it->next; } lock_release(&dsht->slots[i].lock); @@ -1063,7 +1064,7 @@ static int dlgs_rpc_add_item(rpc_t *rpc, void *ctx, dlgs_item_t *it, int n, rpc->fault(ctx, 500, "Internal error creating rpc"); return -1; } - if(rpc->struct_add(th, "dSSSSSSSuuu", + if(rpc->struct_add(th, "dSSSSSSSJJu", "count", n, "src", &it->src, "dst", &it->dst, @@ -1072,8 +1073,8 @@ static int dlgs_rpc_add_item(rpc_t *rpc, void *ctx, dlgs_item_t *it, int n, "callid", &it->callid, "ftag", &it->ftag, "ttag", &it->ttag, - "ts_init", (unsigned int)it->ts_init, - "ts_answer", (unsigned int)it->ts_answer, + "ts_init", (uint64_t)it->ts_init, + "ts_answer", (uint64_t)it->ts_answer, "state", it->state)<0) { rpc->fault(ctx, 500, "Internal error creating item"); return -1;

1 0

git:master:8f5a1c20: dispatcher: cast to uint64_t when using time_t value
by Daniel-Constantin Mierla 10 Feb '23

10 Feb '23

Module: kamailio Branch: master Commit: 8f5a1c20a6816e18f9f08f3b0273691dc5f8cc2c URL: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-09T17:16:43+01:00 dispatcher: cast to uint64_t when using time_t value --- Modified: src/modules/dispatcher/ds_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… Patch: https://github.com/kamailio/kamailio/commit/8f5a1c20a6816e18f9f08f3b0273691… --- diff --git a/src/modules/dispatcher/ds_ht.c b/src/modules/dispatcher/ds_ht.c index 540d0b5fdad..87eaf5e7544 100644 --- a/src/modules/dispatcher/ds_ht.c +++ b/src/modules/dispatcher/ds_ht.c @@ -19,6 +19,7 @@ */ #include <stddef.h> +#include <stdint.h> #include <regex.h> #include "../../core/mem/shm_mem.h" @@ -333,8 +334,8 @@ int ds_ht_dbg(ds_ht_t *dsht) while(it) { LM_ERR("\tcell: %.*s\n", it->callid.len, it->callid.s); LM_ERR("\tduid: %.*s\n", it->duid.len, it->duid.s); - LM_ERR("\thid: %u expire: %u initexpire: %u\n", it->cellid, - (unsigned int)it->expire, (unsigned int)it->initexpire); + LM_ERR("\thid: %u expire: %llu initexpire: %llu\n", it->cellid, + (uint64_t)it->expire, (uint64_t)it->initexpire); LM_ERR("\tdset:%d\n", it->dset); it = it->next; }

1 0

git:master:dd6339f8: core: tmrec - cast to 64b types when using time_t value
by Daniel-Constantin Mierla 09 Feb '23

09 Feb '23

Module: kamailio Branch: master Commit: dd6339f817822cd0590aec2a9a467330bde499dd URL: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-09T12:38:53+01:00 core: tmrec - cast to 64b types when using time_t value --- Modified: src/core/utils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… Patch: https://github.com/kamailio/kamailio/commit/dd6339f817822cd0590aec2a9a46733… --- diff --git a/src/core/utils/tmrec.c b/src/core/utils/tmrec.c index 29366fe0b2..adae68edbf 100644 --- a/src/core/utils/tmrec.c +++ b/src/core/utils/tmrec.c @@ -31,6 +31,7 @@ #include <stdio.h> #include <string.h> #include <time.h> +#include <stdint.h> #include "../../core/mem/mem.h" #include "tmrec.h" @@ -271,7 +272,7 @@ int ac_print(ac_tm_t *_atp) return -1; } - printf("\nSys time: %d\nTime: %02d:%02d:%02d\n", (int)_atp->time, + printf("\nSys time: %llu\nTime: %02d:%02d:%02d\n", (uint64_t)_atp->time, _atp->t.tm_hour, _atp->t.tm_min, _atp->t.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_atp->t.tm_wday], _atp->t.tm_year+1900, _atp->t.tm_mon+1, _atp->t.tm_mday); @@ -511,15 +512,15 @@ int tr_print(tmrec_t *_trp) return -1; } printf("Recurrence definition\n-- start time ---\n"); - printf("Sys time: %d\n", (int)_trp->dtstart); + printf("Sys time: %llu\n", (uint64_t)_trp->dtstart); printf("Time: %02d:%02d:%02d\n", _trp->ts.tm_hour, _trp->ts.tm_min, _trp->ts.tm_sec); printf("Date: %s, %04d-%02d-%02d\n", _wdays[_trp->ts.tm_wday], _trp->ts.tm_year+1900, _trp->ts.tm_mon+1, _trp->ts.tm_mday); printf("---\n"); - printf("End time: %d\n", (int)_trp->dtend); - printf("Duration: %d\n", (int)_trp->duration); - printf("Until: %d\n", (int)_trp->until); + printf("End time: %llu\n", (uint64_t)_trp->dtend); + printf("Duration: %llu\n", (uint64_t)_trp->duration); + printf("Until: %llu\n", (uint64_t)_trp->until); printf("Freq: %d\n", (int)_trp->freq); printf("Interval: %d\n", (int)_trp->interval); if(_trp->byday) @@ -997,7 +998,7 @@ int tr_check_recurrence(tmrec_t *_trp, ac_tm_t *_atp, tr_res_t *_tsw) int check_freq_interval(tmrec_t *_trp, ac_tm_t *_atp) { - int _t0, _t1; + uint64_t _t0, _t1; struct tm _tm; if(!_trp || !_atp) return REC_ERR; @@ -1016,12 +1017,12 @@ int check_freq_interval(tmrec_t *_trp, ac_tm_t *_atp) _tm.tm_year = _trp->ts.tm_year; _tm.tm_mon = _trp->ts.tm_mon; _tm.tm_mday = _trp->ts.tm_mday; - _t0 = (int)mktime(&_tm); + _t0 = (uint64_t)mktime(&_tm); memset(&_tm, 0, sizeof(struct tm)); _tm.tm_year = _atp->t.tm_year; _tm.tm_mon = _atp->t.tm_mon; _tm.tm_mday = _atp->t.tm_mday; - _t1 = (int)mktime(&_tm); + _t1 = (uint64_t)mktime(&_tm); if(_trp->freq == FREQ_DAILY) return (((_t1-_t0)/(24*3600))%_trp->interval==0)? REC_MATCH:REC_NOMATCH;

1 0

git:master:0a3c1523: async: catch up on possible skipped slots due to slow tasks
by Daniel-Constantin Mierla 08 Feb '23

08 Feb '23

Module: kamailio Branch: master Commit: 0a3c15239a620474bbbc7f4d2f57dda0e9aa0f58 URL: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T15:51:37+01:00 async: catch up on possible skipped slots due to slow tasks --- Modified: src/modules/async/async_sleep.c --- Diff: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… Patch: https://github.com/kamailio/kamailio/commit/0a3c15239a620474bbbc7f4d2f57dda… --- diff --git a/src/modules/async/async_sleep.c b/src/modules/async/async_sleep.c index 02c3b8d488..d6dd41d3f1 100644 --- a/src/modules/async/async_sleep.c +++ b/src/modules/async/async_sleep.c @@ -271,9 +271,12 @@ int async_sleep(sip_msg_t *msg, int seconds, cfg_action_t *act, str *cbname) return 0; } +static unsigned int _async_timer_exec_last_slot = -1; + void async_timer_exec(unsigned int ticks, void *param) { - int slot; + unsigned int idx; + unsigned int slot; async_item_t *ai; sr_kemi_eng_t *keng = NULL; str cbname = STR_NULL; @@ -282,33 +285,55 @@ void async_timer_exec(unsigned int ticks, void *param) if(_async_list_head == NULL) return; - slot = ticks % ASYNC_RING_SIZE; + idx = ticks % ASYNC_RING_SIZE; - while(1) { - lock_get(&_async_list_head->ring[slot].lock); - ai = _async_list_head->ring[slot].lstart; - if(ai != NULL) - _async_list_head->ring[slot].lstart = ai->next; - lock_release(&_async_list_head->ring[slot].lock); + if(idx == _async_timer_exec_last_slot) { + /* timer faster than 1sec */ + return; + } - if(ai == NULL) - break; - if(ai->ract != NULL) { - tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); - ksr_msg_env_reset(); - } else { - keng = sr_kemi_eng_get(); - if(keng != NULL && ai->cbname_len>0) { - cbname.s = ai->cbname; - cbname.len = ai->cbname_len; - tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + if(_async_timer_exec_last_slot < 0) { + _async_timer_exec_last_slot = idx; + } + slot = (_async_timer_exec_last_slot + 1) % ASYNC_RING_SIZE; + if(slot != idx) { + LM_DBG("need to catch up from slot %u to %u (slots: %u)\n", slot, idx, + ASYNC_RING_SIZE); + } + + do { + while(1) { + lock_get(&_async_list_head->ring[slot].lock); + ai = _async_list_head->ring[slot].lstart; + if(ai != NULL) + _async_list_head->ring[slot].lstart = ai->next; + lock_release(&_async_list_head->ring[slot].lock); + + if(ai == NULL) + break; + if(ai->ract != NULL) { + tmb.t_continue(ai->tindex, ai->tlabel, ai->ract); ksr_msg_env_reset(); } else { - LM_WARN("no callback to be executed\n"); + keng = sr_kemi_eng_get(); + if(keng != NULL && ai->cbname_len>0) { + cbname.s = ai->cbname; + cbname.len = ai->cbname_len; + tmb.t_continue_cb(ai->tindex, ai->tlabel, &cbname, &evname); + ksr_msg_env_reset(); + } else { + LM_WARN("no callback to be executed\n"); + } } + shm_free(ai); } - shm_free(ai); - } + if(slot == idx) { + break; + } + slot = (slot + 1) % ASYNC_RING_SIZE; + } while(1); + + _async_timer_exec_last_slot = idx; } void async_mstimer_exec(unsigned int ticks, void *param)

1 0

git:master:6be85c8a: modules: readme files regenerated - seas ... [skip ci]
by Kamailio Dev 08 Feb '23

08 Feb '23

Module: kamailio Branch: master Commit: 6be85c8a72bc37b2bb4b1f4be59c5d0c20996850 URL: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2023-02-08T14:16:31+01:00 modules: readme files regenerated - seas ... [skip ci] --- Modified: src/modules/seas/README Modified: src/modules/siputils/README Modified: src/modules/tls/README Modified: src/modules/tls_wolfssl/README Modified: src/modules/xcap_client/README --- Diff: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0… Patch: https://github.com/kamailio/kamailio/commit/6be85c8a72bc37b2bb4b1f4be59c5d0…

1 0

[kamailio/kamailio] Typos (PR #3362)
by Дилян Палаузов 08 Feb '23

08 Feb '23

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3362 -- Commit Summary -- * doc/scripts: typos * seas: typos * siputis: typos * tls: typos * tls_wolfssl: typos * xcap_client: typos * xcap_server: typos * xhttp: typo * xhttp_pi: typos * xhttp_prom: typo * xhttp_rpc: typos * xmlrpc: typos * xprint: typos -- File Changes -- M doc/scripts/cdefs2doc/dump_cfg_defs.pl (4) M doc/scripts/cdefs2doc/dump_counters.pl (2) M doc/scripts/cdefs2doc/dump_rpcs.pl (2) M doc/scripts/cdefs2doc/dump_selects.pl (2) M src/modules/seas/doc/seas_admin.xml (2) M src/modules/seas/encode_content_length.c (2) M src/modules/seas/encode_content_length.h (4) M src/modules/seas/encode_msg.c (6) M src/modules/seas/encode_parameters.c (2) M src/modules/seas/encode_to_body.c (2) M src/modules/seas/encode_uri.c (2) M src/modules/seas/event_dispatcher.c (12) M src/modules/seas/seas.c (4) M src/modules/seas/seas_action.c (10) M src/modules/seas/statistics.c (6) M src/modules/siputils/chargingvector.c (2) M src/modules/siputils/checks.c (2) M src/modules/siputils/checks.h (2) M src/modules/siputils/contact_ops.c (2) M src/modules/siputils/doc/siputils_admin.xml (2) M src/modules/siputils/siputils.c (2) M src/modules/tls/doc/params.xml (12) M src/modules/tls/doc/tls.xml (2) M src/modules/tls/sbufq.h (2) M src/modules/tls/tls_cfg.h (2) M src/modules/tls/tls_ct_q.h (2) M src/modules/tls/tls_domain.c (8) M src/modules/tls/tls_init.c (18) M src/modules/tls/tls_init.h (6) M src/modules/tls/tls_server.c (10) M src/modules/tls_wolfssl/doc/tls_wolfssl.xml (2) M src/modules/tls_wolfssl/sbufq.h (2) M src/modules/tls_wolfssl/tls_cfg.h (2) M src/modules/tls_wolfssl/tls_ct_q.h (2) M src/modules/tls_wolfssl/tls_domain.c (6) M src/modules/tls_wolfssl/tls_init.c (4) M src/modules/tls_wolfssl/tls_server.c (4) M src/modules/xcap_client/doc/xcap_client_devel.xml (2) M src/modules/xcap_client/xcap_functions.c (2) M src/modules/xcap_server/xcap_misc.c (2) M src/modules/xcap_server/xcap_misc.h (2) M src/modules/xhttp/xhttp_mod.c (2) M src/modules/xhttp_pi/Makefile (4) M src/modules/xhttp_pi/xhttp_pi.c (2) M src/modules/xhttp_pi/xhttp_pi_fnc.c (12) M src/modules/xhttp_prom/xhttp_prom.c (2) M src/modules/xhttp_rpc/xhttp_rpc.c (6) M src/modules/xhttp_rpc/xhttp_rpc_fnc.c (6) M src/modules/xmlrpc/xmlrpc.c (16) M src/modules/xprint/xp_lib.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3362.patch https://github.com/kamailio/kamailio/pull/3362.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3362 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3362(a)github.com>

2 1

git:master:c86b5d85: xmlrpc: typos
by Daniel-Constantin Mierla 08 Feb '23

08 Feb '23

Module: kamailio Branch: master Commit: c86b5d85a8aa86c1c59b5eed2ded87aee4fd1682 URL: https://github.com/kamailio/kamailio/commit/c86b5d85a8aa86c1c59b5eed2ded87a… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T14:05:32+01:00 xmlrpc: typos --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c86b5d85a8aa86c1c59b5eed2ded87a… Patch: https://github.com/kamailio/kamailio/commit/c86b5d85a8aa86c1c59b5eed2ded87a… --- diff --git a/src/modules/xmlrpc/xmlrpc.c b/src/modules/xmlrpc/xmlrpc.c index 898099df30e..7cfb8567748 100644 --- a/src/modules/xmlrpc/xmlrpc.c +++ b/src/modules/xmlrpc/xmlrpc.c @@ -691,7 +691,7 @@ static void clean_xmlrpc_reply(struct xmlrpc_reply* reply) /** Create XML-RPC reply that indicates an error to the caller. * * This function is used to build the XML-RPC reply body that indicates that - * an error ocurred on the server. It is called when a management function in + * an error occurred on the server. It is called when a management function in * SER reports an error. The reply will contain the reason code and reason * phrase text provided by the management function that indicated the error. */ @@ -712,7 +712,7 @@ static int build_fault_reply(struct xmlrpc_reply* reply) } -/** Add a memory registion to the list of memory blocks that +/** Add a memory registration to the list of memory blocks that * need to be re-claimed later. * * @param type The type of the memory block (ordinary text or structure). @@ -868,7 +868,7 @@ static int print_structures(struct xmlrpc_reply* reply, * SER asks the management interface to send the reply to the client. The * function will generate the XML-RPC document, put it in body of a SIP * response and send the response to the client. The SIP/HTTP reply sent to - * the client will be always 200 OK, if an error ocurred on the server then it + * the client will be always 200 OK, if an error occurred on the server then it * will be indicated in the XML document in body. * * @param ctx A pointer to the context structure of the XML-RPC request that @@ -916,7 +916,7 @@ static void set_fault(struct xmlrpc_reply* reply, int code, char* fmt, ...) * SER. * * This function will be called whenever a management function in SER - * indicates that an error ocurred while it was processing the request. The + * indicates that an error occurred while it was processing the request. The * function takes the reply code and reason phrase as parameters, these will * be put in the body of the reply. * @@ -1264,7 +1264,7 @@ static enum xmlrpc_val_type xml_get_type(xmlNodePtr value) * This function receives a pointer to a parameter encoded in XML-RPC format * and tries to convert the value of the parameter into integer. Only * <i4>, <int>, <boolean>, <dateTime.iso8601> XML-RPC - * parameters can be converted to integer, attempts to conver other types will + * parameters can be converted to integer, attempts to convert other types will * fail. * @param val A pointer to an integer variable where the result will be * stored. @@ -1360,7 +1360,7 @@ static int get_int(int* val, struct xmlrpc_reply* reply, * This function receives a pointer to a parameter encoded in XML-RPC format * and tries to convert the value of the parameter into double. Only * <i4>, <int>, <double> XML-RPC parameters can be converted - * to double, attempts to conver other types will fail. + * to double, attempts to convert other types will fail. * @param val A pointer to an integer variable where the result will be * stored. * @param reply A pointer to XML-RPC reply being constructed (used to indicate @@ -1487,7 +1487,7 @@ static int get_string(char** val, struct xmlrpc_reply* reply, return -1; } type=xml_get_type(dbl); - LM_DBG("xmrpc parameter type: %d\n", type); + LM_DBG("xmlrpc parameter type: %d\n", type); switch(type){ case XML_T_STR: case XML_T_TXT: @@ -2235,7 +2235,7 @@ static void rpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) (hdr->parsed<(void*)r_ctx->msg || hdr->parsed>=(void*)(r_ctx->msg+r_ctx->msg_shm_block_size))) { /* header parsed filed doesn't point inside uas.request memory - * chunck -> it was added by failure funcs.-> free it as pkg */ + * chunk -> it was added by failure funcs.-> free it as pkg */ DBG("DBG:free_faked_req: removing hdr->parsed %d\n", hdr->type); clean_hdr_field(hdr);

1 0

git:master:ec6f3b12: xprint: typos
by Daniel-Constantin Mierla 08 Feb '23

08 Feb '23

Module: kamailio Branch: master Commit: ec6f3b122f9c41b437ccfcb07b0952e2ffcc2719 URL: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… Author: �� <git-dpa(a)aegee.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2023-02-08T14:05:32+01:00 xprint: typos --- Modified: src/modules/xprint/xp_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… Patch: https://github.com/kamailio/kamailio/commit/ec6f3b122f9c41b437ccfcb07b0952e… --- diff --git a/src/modules/xprint/xp_lib.c b/src/modules/xprint/xp_lib.c index 89d53d59fc2..06b744fe92d 100644 --- a/src/modules/xprint/xp_lib.c +++ b/src/modules/xprint/xp_lib.c @@ -239,7 +239,7 @@ static int xl_get_ruri(struct sip_msg *msg, str *res, str *hp, int hi, int hf) if(msg==NULL || res==NULL) return -1; - if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have a ruri */ + if(msg->first_line.type == SIP_REPLY) /* REPLY doesn't have a ruri */ return xl_get_null(msg, res, hp, hi, hf); if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) @@ -580,7 +580,7 @@ static int xl_get_color(struct sip_msg *msg, str *res, str *hp, int hi, int hf) p = color; end = p + COL_BUF; - /* excape sequenz */ + /* escape sequence */ append_sstring(p, end, "\033["); if(hp->s[0]!='_')

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev