<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [x] Commit message has the format required by CONTRIBUTING guide
- [x] Commits are split per component (core, individual modules, libs, utils, ...)
- [x] Each component has a single commit (if not, squash them into one commit)
- [x] No commits to README files for modules (changes must be done to docbook files
in `doc/` subfolder, the README file is autogenerated)
#### Type Of Change
- [ ] Small bug fix (non-breaking change which fixes an issue)
- [x] New feature (non-breaking change which adds new functionality)
- [ ] Breaking change (fix or feature that would change existing functionality)
#### Checklist:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [x] Tested changes locally
#### Description
<!-- Describe your changes in detail -->
Allow replicating location's socket via its name.
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/3364
-- Commit Summary --
* dmq_usrloc: Add option to replicate socket via its name
-- File Changes --
M src/modules/dmq_usrloc/doc/dmq_usrloc_admin.xml (9)
M src/modules/dmq_usrloc/usrloc_sync.c (24)
M src/modules/dmq_usrloc/usrloc_sync.h (2)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/3364.patchhttps://github.com/kamailio/kamailio/pull/3364.diff
--
Reply to this email directly or view it on GitHub:
https://github.com/kamailio/kamailio/pull/3364
You are receiving this because you are subscribed to this thread.
Message ID: <kamailio/kamailio/pull/3364(a)github.com>
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);
}
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
*/
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