Re: [sr-dev] [kamailio/kamailio] [WIP] tls: add support for OpenSSL engine and private keys in HSM (#1484)

2018-03-21 Thread aalba6675 
@aalba6675 pushed 1 commit.

6966c9f  proof-of-concept: implement process-local storage for HSM keys


-- 
You are receiving this because you are subscribed to this thread.
View it on GitHub:
https://github.com/kamailio/kamailio/pull/1484/files/b9b3a3247a312f5f406b40b637fbafed8b25..6966c9f20a444818cc3028afd448f3c5f46a9add
___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:e85f66f0: modules: readme files regenerated - msilo ... [skip ci]

2018-03-21 Thread Kamailio Dev 
Module: kamailio
Branch: master
Commit: e85f66f041ff25fa026d2ddc2116c2280be3857e
URL: 
https://github.com/kamailio/kamailio/commit/e85f66f041ff25fa026d2ddc2116c2280be3857e

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2018-03-21T22:46:36+01:00

modules: readme files regenerated - msilo ... [skip ci]

---

Modified: src/modules/msilo/README
Modified: src/modules/siptrace/README
Modified: src/modules/speeddial/README
Modified: src/modules/sqlops/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/e85f66f041ff25fa026d2ddc2116c2280be3857e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/e85f66f041ff25fa026d2ddc2116c2280be3857e.patch


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:7ce1ed71: sqlops: use database entities in docs

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 7ce1ed7105f184e1b41565e0c40c6d32fabaa974
URL: 
https://github.com/kamailio/kamailio/commit/7ce1ed7105f184e1b41565e0c40c6d32fabaa974

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:33:37+01:00

sqlops: use database entities in docs

---

Modified: src/modules/sqlops/doc/sqlops_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/7ce1ed7105f184e1b41565e0c40c6d32fabaa974.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7ce1ed7105f184e1b41565e0c40c6d32fabaa974.patch

---

diff --git a/src/modules/sqlops/doc/sqlops_admin.xml 
b/src/modules/sqlops/doc/sqlops_admin.xml
index 4d8604927a..63027bea66 100644
--- a/src/modules/sqlops/doc/sqlops_admin.xml
+++ b/src/modules/sqlops/doc/sqlops_admin.xml
@@ -146,7 +146,7 @@
Set sqlcon parameter

 ...
-modparam("sqlops","sqlcon","cb=mysql://kamailio:abc@10.10.1.1/testdb")
+modparam("sqlops","sqlcon","cb=")
 modparam("sqlops","sqlcon","ca=")
 ...
 


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:2e4b862a: siptrace: use database entities in docs

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 2e4b862af6809222140671bd0200e610a08fbec2
URL: 
https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e610a08fbec2

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:32:20+01:00

siptrace: use database entities in docs

---

Modified: src/modules/siptrace/doc/siptrace_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e610a08fbec2.diff
Patch: 
https://github.com/kamailio/kamailio/commit/2e4b862af6809222140671bd0200e610a08fbec2.patch

---

diff --git a/src/modules/siptrace/doc/siptrace_admin.xml 
b/src/modules/siptrace/doc/siptrace_admin.xml
index 6b39b02a8e..504e6e98b8 100644
--- a/src/modules/siptrace/doc/siptrace_admin.xml
+++ b/src/modules/siptrace/doc/siptrace_admin.xml
@@ -102,14 +102,14 @@



-   Default value is 
"mysql://kamailio:kamailiorw@localhost/okamailio".
+   Default value is "".



Set db_url parameter

 ...
-modparam("siptrace", "db_url", "mysql://user:passwd@host/dbname")
+modparam("siptrace", "db_url", "")
 ...
 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:7171bab1: mohqueue: use database entities in docs

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 7171bab19bab04535ab1a8f30a8c8fb3293f4fc0
URL: 
https://github.com/kamailio/kamailio/commit/7171bab19bab04535ab1a8f30a8c8fb3293f4fc0

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:31:47+01:00

mohqueue: use database entities in docs

---

Modified: src/modules/mohqueue/doc/mohqueue_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/7171bab19bab04535ab1a8f30a8c8fb3293f4fc0.diff
Patch: 
https://github.com/kamailio/kamailio/commit/7171bab19bab04535ab1a8f30a8c8fb3293f4fc0.patch

---

diff --git a/src/modules/mohqueue/doc/mohqueue_admin.xml 
b/src/modules/mohqueue/doc/mohqueue_admin.xml
index 7b5652e7f1..112b1f4fa4 100644
--- a/src/modules/mohqueue/doc/mohqueue_admin.xml
+++ b/src/modules/mohqueue/doc/mohqueue_admin.xml
@@ -88,7 +88,7 @@ The URL to connect to the database for the mohqueue tables.
 Set db_url:
 
 ...
-modparam ("mohqueue", "db_url", 
"mysql://kamailio:kamailiorw@localhost/kamailio")
+modparam ("mohqueue", "db_url", "")
 ...
 
   


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:e8214716: ims_usrloc_pcscf: use database entity in docs

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: e82147166ae1961be827f6b05e00d80073d0880e
URL: 
https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80073d0880e

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:31:10+01:00

ims_usrloc_pcscf: use database entity in docs

---

Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80073d0880e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/e82147166ae1961be827f6b05e00d80073d0880e.patch

---

diff --git a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml 
b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml
index c04c50c72d..a237a1eb61 100644
--- a/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml
+++ b/src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_admin.xml
@@ -110,14 +110,14 @@ modparam("ims_usrloc_pcscf", "timer_interval", 30)
   Database URL
 
   Default value is
- 
"mysql://kamailio:kamailiorw@localhost/kamailio".
+ "".
 
   
 Set db_url parameter
 
 ...
 modparam("ims_usrloc_pcscf", "db_url",
-   "dbdriver://username:password@dbhost/dbname")
+   "")
 ...
 
   


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:90e96be7: db_cluster: use database entity in docs

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 90e96be7efab2a41417f3997fb06010ce0973d27
URL: 
https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010ce0973d27

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:30:30+01:00

db_cluster: use database entity in docs

---

Modified: src/modules/db_cluster/doc/db_cluster_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010ce0973d27.diff
Patch: 
https://github.com/kamailio/kamailio/commit/90e96be7efab2a41417f3997fb06010ce0973d27.patch

---

diff --git a/src/modules/db_cluster/doc/db_cluster_admin.xml 
b/src/modules/db_cluster/doc/db_cluster_admin.xml
index dd0bdef80f..eb1e8bc489 100644
--- a/src/modules/db_cluster/doc/db_cluster_admin.xml
+++ b/src/modules/db_cluster/doc/db_cluster_admin.xml
@@ -80,9 +80,9 @@

 ...
 modparam("db_cluster", "connection",
- "con1=>mysql://kamailio:kamailiorw@localhost/kamailio1")
+ "con1=>1")
 modparam("db_cluster", "connection",
- "con2=>mysql://kamailio:kamailiorw@localhost/kamailio2")
+ "con2=>2")
 ...
 

@@ -199,9 +199,9 @@ modparam("db_cluster", "max_query_length", 5)

 ...
 modparam("db_cluster", "connection",
- "c1=mysql://kamailio:kamailiorw@localhost/kamailio1")
+ "c1=1")
 modparam("db_cluster", "connection",
- "c2=mysql://kamailio:kamailiorw@localhost/kamailio2")
+ "c2=2")
 modparam("db_cluster", "cluster", "k1=c1=9r9p;c2=9r9p")
 
 modparam("acc", "db_url", "cluster://k1")


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:25ca18fd: msilo module: fix openser DB URL in docs and example cfg

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 25ca18fdafae53e38c296852547f3d71155681ec
URL: 
https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d71155681ec

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:20:46+01:00

msilo module: fix openser DB URL in docs and example cfg

---

Modified: src/modules/msilo/doc/msilo.cfg
Modified: src/modules/msilo/doc/msilo_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d71155681ec.diff
Patch: 
https://github.com/kamailio/kamailio/commit/25ca18fdafae53e38c296852547f3d71155681ec.patch

---

diff --git a/src/modules/msilo/doc/msilo.cfg b/src/modules/msilo/doc/msilo.cfg
index 05329f0299..7bec0841e6 100644
--- a/src/modules/msilo/doc/msilo.cfg
+++ b/src/modules/msilo/doc/msilo.cfg
@@ -42,7 +42,7 @@ modparam("usrloc", "db_mode", 0)
 
 # -- msilo params --
 
-modparam("msilo","db_url","mysql://openser:openserrw@localhost/openser")
+modparam("msilo","db_url","mysql://kamailio:kamailiorw@localhost/kamailio")
 modparam("msilo","from_address","sip:regist...@kamailio.org")
 modparam("msilo","contact_hdr","Contact: 
registrar@192.168.1.2:5060;msilo=yes\r\n")
 modparam("msilo","content_type_hdr","Content-Type: text/plain\r\n")
diff --git a/src/modules/msilo/doc/msilo_admin.xml 
b/src/modules/msilo/doc/msilo_admin.xml
index 9d30e54045..7d53dba51b 100644
--- a/src/modules/msilo/doc/msilo_admin.xml
+++ b/src/modules/msilo/doc/msilo_admin.xml
@@ -109,7 +109,7 @@
Set the db_url parameter

 ...
-modparam("msilo", "db_url", "mysql://user:pas...@host.com/dbname")
+modparam("msilo", "db_url", "")
 ...
 



___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:a315486e: doc stylesheets: use kamailio default database

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: a315486e6061680a253629d90505c011fe544d94
URL: 
https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c011fe544d94

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:29:54+01:00

doc stylesheets: use kamailio default database

---

Modified: doc/stylesheets/dbschema_k/xsl/dbdoc.xsl

---

Diff:  
https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c011fe544d94.diff
Patch: 
https://github.com/kamailio/kamailio/commit/a315486e6061680a253629d90505c011fe544d94.patch

---

diff --git a/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl 
b/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl
index 20194cc7a4..ba6d623955 100644
--- a/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl
+++ b/doc/stylesheets/dbschema_k/xsl/dbdoc.xsl
@@ -53,7 +53,7 @@ ALL CHANGES DONE HERE WILL BE LOST IF THE FILE IS 
REGENERATEDURL to the database containing the data.


-   Default value is 
mysql://openserro:openserro@localhost/openser.
+   Default value is 
mysql://kamailio:kamailiorw@localhost/kamailio.


Set db_url 
parameter


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:6b39875c: usrloc: doxygen docs fixes

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: 6b39875c2f0d6f475171232890e0c80c09685787
URL: 
https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80c09685787

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T22:04:57+01:00

usrloc: doxygen docs fixes

---

Modified: src/modules/usrloc/dlist.c
Modified: src/modules/usrloc/dlist.h
Modified: src/modules/usrloc/udomain.c
Modified: src/modules/usrloc/urecord.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80c09685787.diff
Patch: 
https://github.com/kamailio/kamailio/commit/6b39875c2f0d6f475171232890e0c80c09685787.patch

---

diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c
index 48b3ee1ef3..f649130a98 100644
--- a/src/modules/usrloc/dlist.c
+++ b/src/modules/usrloc/dlist.c
@@ -85,7 +85,7 @@ static inline int find_dlist(str* _n, dlist_t** _d)
  * \param flags contact flags
  * \param part_idx part index
  * \param part_max maximal part
- * \param GAU options
+ * \param options options
  * \return 0 on success, positive if buffer size was not sufficient, negative 
on failure
  */
 static inline int get_all_db_ucontacts(void *buf, int len, unsigned int flags,
@@ -333,7 +333,7 @@ static inline int get_all_db_ucontacts(void *buf, int len, 
unsigned int flags,
  * \param flags contact flags
  * \param part_idx part index
  * \param part_max maximal part
- * \param GAU options
+ * \param options options
  * \return 0 on success, positive if buffer size was not sufficient, negative 
on failure
  */
 static inline int get_all_mem_ucontacts(void *buf, int len, unsigned int flags,
@@ -483,7 +483,7 @@ static inline int get_all_mem_ucontacts(void *buf, int len, 
unsigned int flags,
  * \param flags contact flags
  * \param part_idx part index
  * \param part_max maximal part
- * \param GAU options
+ * \param options options
  * \return 0 on success, positive if buffer size was not sufficient, negative 
on failure
  */
 int get_all_ucontacts(void *buf, int len, unsigned int flags,
diff --git a/src/modules/usrloc/dlist.h b/src/modules/usrloc/dlist.h
index 2ad223120e..2f496b2631 100644
--- a/src/modules/usrloc/dlist.h
+++ b/src/modules/usrloc/dlist.h
@@ -109,7 +109,7 @@ int synchronize_all_udomains(int istart, int istep);
  * \param flags contact flags
  * \param part_idx part index
  * \param part_max maximal part
- * \param GAU options
+ * \param options options
  * \return 0 on success, positive if buffer size was not sufficient, negative 
on failure
  */
 int get_all_ucontacts(void *buf, int len, unsigned int flags,
diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c
index aacca0513b..054f781818 100644
--- a/src/modules/usrloc/udomain.c
+++ b/src/modules/usrloc/udomain.c
@@ -764,7 +764,7 @@ urecord_t* db_load_urecord(db1_con_t* _c, udomain_t* _d, 
str *_aor)
  * \brief Loads from DB all contacts for a RUID
  * \param _c database connection
  * \param _d domain
- * \param _aor address of record
+ * \param _ruid record unique id
  * \return pointer to the record on success, 0 on errors or if nothing is found
  */
 urecord_t* db_load_urecord_by_ruid(db1_con_t* _c, udomain_t* _d, str *_ruid)
@@ -1010,8 +1010,10 @@ void mem_delete_urecord(udomain_t* _d, struct urecord* 
_r)
 
 
 /*!
- * \brief Run timer handler for given domain
+ * \brief Run timer handler for given domain, delete urecords
  * \param _d domain
+ * \param istart start of run
+ * \param istep loop steps
  */
 void mem_timer_udomain(udomain_t* _d, int istart, int istep)
 {
diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c
index 482c14efcf..598cbd88fe 100644
--- a/src/modules/usrloc/urecord.c
+++ b/src/modules/usrloc/urecord.c
@@ -735,7 +735,7 @@ static inline struct ucontact* contact_path_match( 
ucontact_t* ptr, str* _c, str
 /*!
  * \brief Match a contact record to a Call-ID only
  * \param ptr contact record
- * \param _c contact string
+ * \param _callid callid string
  * \return ptr on successfull match, 0 when they not match
  */
 static inline struct ucontact* contact_match_callidonly( ucontact_t* ptr, str* 
_callid)


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:fbff4a87: modules: readme files regenerated - phonenum ... [skip ci]

2018-03-21 Thread Kamailio Dev 
Module: kamailio
Branch: master
Commit: fbff4a8709e12f699098c23626dc6e75f620b978
URL: 
https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e75f620b978

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2018-03-21T15:01:31+01:00

modules: readme files regenerated - phonenum ... [skip ci]

---

Modified: src/modules/phonenum/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e75f620b978.diff
Patch: 
https://github.com/kamailio/kamailio/commit/fbff4a8709e12f699098c23626dc6e75f620b978.patch

---

diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README
index 82aece96b4..711a532e65 100644
--- a/src/modules/phonenum/README
+++ b/src/modules/phonenum/README
@@ -10,7 +10,7 @@ Daniel-Constantin Mierla
 

 
-   Copyright © 2017 Daniel-Constantin Mierla (asipto.com)
+   Copyright © 2017 Daniel-Constantin Mierla (asipto.com)
  __
 
Table of Contents
@@ -97,7 +97,7 @@ Chapter 1. Admin Guide
 
Phone number search mode.
 
-   Default value is "0".
+   Default value is “0”.
 
Example 1.1. Set smode parameter
 ...
@@ -108,7 +108,7 @@ modparam("phonenum", "smode", 0)
 
4.1. phonenum_match(num, pvc)
 
-4.1. phonenum_match(num, pvc)
+4.1.  phonenum_match(num, pvc)
 
Match num against the libphonenumber and set the attributes inside the
pvc container. The function has to be called before accessing a key
@@ -120,8 +120,13 @@ modparam("phonenum", "smode", 0)
 
Example 1.2. phonenum_match usage
 ...
-if(phonenum_match("1-484-555-", "src"))
-xlog("number normalized to: $phn(src=>num)\n");
+if(phonenum_match("1-484-555-", "src")) {
+if($phn(src=>valid)==1) {
+xlog("number normalized to: $phn(src=>normalized)\n");
+} else {
+xlog("number normalization error: $phn(src=>error)\n");
+}
+}
 ...
 
 5. Pseudo Variables
@@ -129,10 +134,14 @@ if(phonenum_match("1-484-555-", "src"))
  * $phn(pvc=>key) - pvc is an identifier for this query result; it is
designated by the second parameter of phonenum_match(). The key can
be one of the following:
-  + number - normalized phone number
-  + country - country for phone number
-  + region - region for phone number
-  + operator - operator for phone number
+  + number - phone number that is matched
+  + valid - 1 if the matched number has a valid result; 0
+otherwise
+  + normalized - normalized phone number
+  + cctel - country code for phone number
+  + ltype - local network type
+  + ndesc - phone number description
+  + error - error string if phone number matching fails.
 
Exported pseudo-variables are documented at
https://www.kamailio.org/wiki/.


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:70a61e0b: phonenum: docs - updated pv names to match c code

2018-03-21 Thread Daniel-Constantin Mierla 
Module: kamailio
Branch: master
Commit: 70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84
URL: 
https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2018-03-21T14:59:29+01:00

phonenum: docs - updated pv names to match c code

---

Modified: src/modules/phonenum/doc/phonenum_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84.diff
Patch: 
https://github.com/kamailio/kamailio/commit/70a61e0bfa0640fbba8d6cfe57f6ad4c6a431b84.patch

---

diff --git a/src/modules/phonenum/doc/phonenum_admin.xml 
b/src/modules/phonenum/doc/phonenum_admin.xml
index 1b13cfb2b9..16e85c5766 100644
--- a/src/modules/phonenum/doc/phonenum_admin.xml
+++ b/src/modules/phonenum/doc/phonenum_admin.xml
@@ -111,8 +111,13 @@ modparam("phonenum", "smode", 0)
phonenum_match usage

 ...
-if(phonenum_match("1-484-555-", "src"))
-xlog("number normalized to: $phn(src=num)\n");
+if(phonenum_match("1-484-555-", "src")) {
+if($phn(src=valid)==1) {
+xlog("number normalized to: $phn(src=normalized)\n");
+} else {
+xlog("number normalization error: $phn(src=error)\n");
+}
+}
 ...
 

@@ -131,16 +136,27 @@ if(phonenum_match("1-484-555-", "src"))



-   number - 
normalized phone number
+   number - phone 
number that is matched


-   country - country 
for phone number
+   valid - 1 if the 
matched number has a
+   valid result; 0 otherwise


-   region - region 
for phone number
+   normalized - 
normalized phone number


-   operator - 
operator for phone number
+   cctel - country 
code for phone number
+   
+   
+   ltype - local 
network type
+   
+   
+   ndesc - phone 
number description
+   
+   
+   error - error 
string if phone number
+   matching fails.





___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:54c6a037: phonenum: build cctel from formatted number

2018-03-21 Thread Daniel-Constantin Mierla 
Module: kamailio
Branch: master
Commit: 54c6a03704767a3dc15eb633ce1628e93c99a8ff
URL: 
https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e93c99a8ff

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2018-03-21T14:59:29+01:00

phonenum: build cctel from formatted number

---

Modified: src/modules/phonenum/cphonenumber.cpp

---

Diff:  
https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e93c99a8ff.diff
Patch: 
https://github.com/kamailio/kamailio/commit/54c6a03704767a3dc15eb633ce1628e93c99a8ff.patch

---

diff --git a/src/modules/phonenum/cphonenumber.cpp 
b/src/modules/phonenum/cphonenumber.cpp
index 71e76ab004..b723543f55 100644
--- a/src/modules/phonenum/cphonenumber.cpp
+++ b/src/modules/phonenum/cphonenumber.cpp
@@ -134,7 +134,10 @@ telnum_t* telnum_parse(char* number, char* region)
string descNumber = 
_phoneGeoCoder->GetDescriptionForNumber(parsedNumber, Locale("en"));
res->ndesc = strdup(descNumber.c_str());
res->ltype = 
strdup(telnum_linetype(_phoneUtil.GetNumberType(parsedNumber)));
-   res->cctel = _phoneUtil.GetCountryCodeForRegion(regionStr);
+   // res->cctel = _phoneUtil.GetCountryCodeForRegion(regionStr);
+   string regionCode;
+   _phoneUtil.GetRegionCodeForNumber(parsedNumber, );
+   res->cctel = _phoneUtil.GetCountryCodeForRegion(regionCode);
 
return res;
 }


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:2196c677: phonenum: fixed lenght in pv name comparisons

2018-03-21 Thread Daniel-Constantin Mierla 
Module: kamailio
Branch: master
Commit: 2196c677785fc4df4f4f1c03831eff679dcd5363
URL: 
https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff679dcd5363

Author: Daniel-Constantin Mierla 
Committer: Daniel-Constantin Mierla 
Date: 2018-03-21T14:59:29+01:00

phonenum: fixed lenght in pv name comparisons

---

Modified: src/modules/phonenum/phonenum_pv.c

---

Diff:  
https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff679dcd5363.diff
Patch: 
https://github.com/kamailio/kamailio/commit/2196c677785fc4df4f4f1c03831eff679dcd5363.patch

---

diff --git a/src/modules/phonenum/phonenum_pv.c 
b/src/modules/phonenum/phonenum_pv.c
index 9fd9ce93f4..f4e2763bf0 100644
--- a/src/modules/phonenum/phonenum_pv.c
+++ b/src/modules/phonenum/phonenum_pv.c
@@ -165,19 +165,19 @@ int pv_parse_phonenum_name(pv_spec_p sp, str *in)
 
switch(pvs.len) {
case 5:
-   if(strncmp(pvs.s, "ltype", 6) == 0)
+   if(strncmp(pvs.s, "ltype", 5) == 0)
gpv->type = 2;
-   else if(strncmp(pvs.s, "ndesc", 6) == 0)
+   else if(strncmp(pvs.s, "ndesc", 5) == 0)
gpv->type = 3;
-   else if(strncmp(pvs.s, "error", 6) == 0)
+   else if(strncmp(pvs.s, "error", 5) == 0)
gpv->type = 4;
-   else if(strncmp(pvs.s, "cctel", 6) == 0)
+   else if(strncmp(pvs.s, "cctel", 5) == 0)
gpv->type = 5;
-   else if(strncmp(pvs.s, "valid", 6) == 0)
+   else if(strncmp(pvs.s, "valid", 5) == 0)
gpv->type = 6;
else
goto error;
-   break;  
+   break;
case 6:
if(strncmp(pvs.s, "number", 6) == 0)
gpv->type = 0;
@@ -315,7 +315,10 @@ int phonenum_update_pv(str *tomatch, str *name)
LM_DBG("no match for: %s\n", gr->tomatch);
return -2;
}
-   LM_DBG("phonenum PV updated for: %s\n", gr->tomatch);
+   LM_DBG("phonenum PV updated for: %s (%d/%s/%s)\n", gr->tomatch,
+   gr->record->valid,
+   (gr->record->normalized)?gr->record->normalized:"none",
+   (gr->record->error)?gr->record->error:"none");
 
return 1;
 }


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:f80bfac4: modules: readme files regenerated - nathelper ... [skip ci]

2018-03-21 Thread Kamailio Dev 
Module: kamailio
Branch: master
Commit: f80bfac4c8f91144248a5569fb3c844e0ab84159
URL: 
https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844e0ab84159

Author: Kamailio Dev 
Committer: Kamailio Dev 
Date: 2018-03-21T08:31:56+01:00

modules: readme files regenerated - nathelper ... [skip ci]

---

Modified: src/modules/nathelper/README

---

Diff:  
https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844e0ab84159.diff
Patch: 
https://github.com/kamailio/kamailio/commit/f80bfac4c8f91144248a5569fb3c844e0ab84159.patch

---

diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README
index 3dd341016f..e70d537311 100644
--- a/src/modules/nathelper/README
+++ b/src/modules/nathelper/README
@@ -568,13 +568,15 @@ fix_nated_register();
  * 1 - The “Contact” header field is searched for occurrence of
RFC1918 or RFC6598 addresses.
  * 2 - the "received" test is used: address in the “Via” header is
-   compared against source IP address of signaling
+   compared against source IP address of signaling. If the “Via”
+   header contains no port, it uses the default SIP port 5060
  * 4 - The Top Most “Via” is searched for occurrence of RFC1918 or
RFC6598 addresses
  * 8 - The SDP is searched for occurrence of RFC1918 or RFC6598
addresses
  * 16 - Test if the source port is different from the port in the
-   “Via” header
+   “Via” header. If the “Via” header contains no port, it uses the
+   default SIP port 5060
  * 32 - Test if the source IP address of signaling is a RFC1918 or
RFC6598 address
  * 64 - Test if the source connection of signaling is a WebSocket


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev

[sr-dev] git:master:f327fbb8: nathelper: small docs addition related to nat_uac_test()

2018-03-21 Thread Henning Westerholt 
Module: kamailio
Branch: master
Commit: f327fbb8fbb61a2298aa05dec5e265d266d3e44e
URL: 
https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d266d3e44e

Author: Henning Westerholt 
Committer: Henning Westerholt 
Date: 2018-03-21T08:22:27+01:00

nathelper: small docs addition related to nat_uac_test()

---

Modified: src/modules/nathelper/doc/nathelper_admin.xml

---

Diff:  
https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d266d3e44e.diff
Patch: 
https://github.com/kamailio/kamailio/commit/f327fbb8fbb61a2298aa05dec5e265d266d3e44e.patch

---

diff --git a/src/modules/nathelper/doc/nathelper_admin.xml 
b/src/modules/nathelper/doc/nathelper_admin.xml
index 83dc8f5faa..975f579d93 100644
--- a/src/modules/nathelper/doc/nathelper_admin.xml
+++ b/src/modules/nathelper/doc/nathelper_admin.xml
@@ -632,7 +632,8 @@ fix_nated_register();

2 -  the "received" test is used: 
address
in the Via header is compared against 
source
-   IP address of signaling
+   IP address of signaling. If the Via 
header contains
+   no port, it uses the default SIP port 5060


4 -  The Top Most 
Via is searched 
@@ -643,8 +644,9 @@ fix_nated_register();
RFC1918 or RFC6598 addresses


-   16 -  Test if the source port is 
different
-   from the port in the Via header
+   16 -  Test if the source port is 
different from the port
+   in the Via header. If the 
Via header contains
+   no port, it uses the default SIP port 5060


32 -  Test if the source IP 
address of


___
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev