Merge branch 'master' of ssh://git.sip-router.org/sip-router

* 'master' of ssh://git.sip-router.org/sip-router:
  modules_k/nathelper: add_contact_alias ipv6 fix
  lib/srdb1/schema: use &ip_addr_len; entity in address and lcr_gw schema

lib/srdb1/schema/address.xml

@@ -9,7 +9,7 @@
 
 <table id="address" xmlns:db="http://docbook.org/ns/docbook">
     <name>address</name>
-    <version>5</version>
+    <version>6</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by the permissions module. More information is available at: &KAMAILIO_MOD_DOC;permissions.html
@@ -38,7 +38,7 @@
     <column>
         <name>ip_addr</name>
         <type>string</type>
-        <size>48</size>
+        <size>&ip_add_len;</size>
         <description>IP address</description>
     </column>
 

lib/srdb1/schema/lcr_gw.xml

@@ -10,7 +10,7 @@
 
 <table id="lcr_gw" xmlns:db="http://docbook.org/ns/docbook">
     <name>lcr_gw</name>
-    <version>2</version>
+    <version>3</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by lcr (Least Cost Routing) module
@@ -46,7 +46,7 @@
     <column id="ip_addr">
         <name>ip_addr</name>
         <type>string</type>
-        <size>47</size>
+        <size>&ip_add_len;</size>
         <null/>
         <description>IPv4 or IPv6 Address of the gateway</description>
     </column>

modules/lcr/lcr_mod.c

@@ -91,7 +91,7 @@ MODULE_VERSION
  */
 #define LCR_RULE_TABLE_VERSION 2
 #define LCR_RULE_TARGET_TABLE_VERSION 1
-#define LCR_GW_TABLE_VERSION 2
+#define LCR_GW_TABLE_VERSION 3
 
 /* database defaults */
 

modules_k/nathelper/nathelper.c

@@ -855,7 +855,8 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2)
     }
 
     /* Compare source ip and port against contact uri */
-    if ((ip = str2ip(&(uri.host))) == NULL) {
+    if (((ip = str2ip(&(uri.host))) == NULL) &&
+	((ip = str2ip6(&(uri.host))) == NULL)) {
 	LM_DBG("contact uri host is not an ip address\n");
     } else {
 	if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) &&
@@ -895,8 +896,8 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2)
     }
 
     /* Create  ;alias param */
-    param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ +
-	1 /* ~ */ + 1 /* proto */ + 1 /* closing > */;
+    param_len = SALIAS_LEN + 1 /* [ */ + IP6_MAX_STR_SIZE + 1 /* ] */ +
+	1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* > */;
     param = (char*)pkg_malloc(param_len);
     if (!param) {
 	LM_ERR("no pkg memory left for alias param\n");
@@ -905,12 +906,16 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2)
     at = param;
     /* ip address */
     append_str(at, SALIAS, SALIAS_LEN);
+    if (msg->rcv.src_ip.af == AF_INET6)
+	append_chr(at, '[');
     ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN);
     if (ip_len <= 0) {
 	LM_ERR("failed to copy source ip\n");
 	goto err;
     }
     at = at + ip_len;
+    if (msg->rcv.src_ip.af == AF_INET6)
+	append_chr(at, ']');
     /* port */
     append_chr(at, '~');
     port = int2str(msg->rcv.src_port, &len);

modules_k/permissions/address.c

@@ -44,7 +44,7 @@
 #include "../../ut.h"
 #include "../../resolve.h"
 
-#define TABLE_VERSION 5
+#define TABLE_VERSION 6
 
 struct addr_list ***addr_hash_table; /* Ptr to current hash table ptr */
 struct addr_list **addr_hash_table_1;     /* Pointer to hash table 1 */

utils/kamctl/db_berkeley/kamailio/version

@@ -13,7 +13,7 @@ acc|4
 active_watchers|
 active_watchers|11
 address|
-address|5
+address|6
 aliases|
 aliases|6
 carrier_name|
@@ -61,7 +61,7 @@ imc_members|1
 imc_rooms|
 imc_rooms|1
 lcr_gw|
-lcr_gw|2
+lcr_gw|3
 lcr_rule|
 lcr_rule|2
 lcr_rule_target|

utils/kamctl/db_sqlite/lcr-create.sql

@@ -1,9 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('lcr_gw','2');
+INSERT INTO version (table_name, table_version) values ('lcr_gw','3');
 CREATE TABLE lcr_gw (
     id INTEGER PRIMARY KEY NOT NULL,
     lcr_id SMALLINT NOT NULL,
     gw_name VARCHAR(128),
-    ip_addr VARCHAR(47),
+    ip_addr VARCHAR(50),
     hostname VARCHAR(64),
     port SMALLINT,
     params VARCHAR(64),

utils/kamctl/db_sqlite/permissions-create.sql

@@ -9,11 +9,11 @@ CREATE TABLE trusted (
 
 CREATE INDEX trusted_peer_idx ON trusted (src_ip);
 
-INSERT INTO version (table_name, table_version) values ('address','5');
+INSERT INTO version (table_name, table_version) values ('address','6');
 CREATE TABLE address (
     id INTEGER PRIMARY KEY NOT NULL,
     grp INTEGER DEFAULT 1 NOT NULL,
-    ip_addr VARCHAR(48) NOT NULL,
+    ip_addr VARCHAR(50) NOT NULL,
     mask INTEGER DEFAULT 32 NOT NULL,
     port SMALLINT DEFAULT 0 NOT NULL,
     tag VARCHAR(64)

utils/kamctl/dbtext/kamailio/version

@@ -1,7 +1,7 @@
 table_name(string) table_version(int) 
 acc:4
 active_watchers:11
-address:5
+address:6
 aliases:6
 carrier_name:1
 carrierfailureroute:2
@@ -25,7 +25,7 @@ grp:2
 htable:2
 imc_members:1
 imc_rooms:1
-lcr_gw:2
+lcr_gw:3
 lcr_rule:2
 lcr_rule_target:1
 location:6

utils/kamctl/mysql/lcr-create.sql

@@ -1,9 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('lcr_gw','2');
+INSERT INTO version (table_name, table_version) values ('lcr_gw','3');
 CREATE TABLE lcr_gw (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     lcr_id SMALLINT UNSIGNED NOT NULL,
     gw_name VARCHAR(128),
-    ip_addr VARCHAR(47),
+    ip_addr VARCHAR(50),
     hostname VARCHAR(64),
     port SMALLINT UNSIGNED,
     params VARCHAR(64),

utils/kamctl/mysql/permissions-create.sql

@@ -9,11 +9,11 @@ CREATE TABLE trusted (
 
 CREATE INDEX peer_idx ON trusted (src_ip);
 
-INSERT INTO version (table_name, table_version) values ('address','5');
+INSERT INTO version (table_name, table_version) values ('address','6');
 CREATE TABLE address (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     grp INT(11) UNSIGNED DEFAULT 1 NOT NULL,
-    ip_addr VARCHAR(48) NOT NULL,
+    ip_addr VARCHAR(50) NOT NULL,
     mask INT DEFAULT 32 NOT NULL,
     port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL,
     tag VARCHAR(64)

utils/kamctl/oracle/lcr-create.sql

@@ -1,9 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('lcr_gw','2');
+INSERT INTO version (table_name, table_version) values ('lcr_gw','3');
 CREATE TABLE lcr_gw (
     id NUMBER(10) PRIMARY KEY,
     lcr_id NUMBER(5),
     gw_name VARCHAR2(128),
-    ip_addr VARCHAR2(47),
+    ip_addr VARCHAR2(50),
     hostname VARCHAR2(64),
     port NUMBER(5),
     params VARCHAR2(64),

utils/kamctl/oracle/permissions-create.sql

@@ -17,11 +17,11 @@ BEGIN map2users('trusted'); END;
 /
 CREATE INDEX trusted_peer_idx  ON trusted (src_ip);
 
-INSERT INTO version (table_name, table_version) values ('address','5');
+INSERT INTO version (table_name, table_version) values ('address','6');
 CREATE TABLE address (
     id NUMBER(10) PRIMARY KEY,
     grp NUMBER(10) DEFAULT 1 NOT NULL,
-    ip_addr VARCHAR2(48),
+    ip_addr VARCHAR2(50),
     mask NUMBER(10) DEFAULT 32 NOT NULL,
     port NUMBER(5) DEFAULT 0 NOT NULL,
     tag VARCHAR2(64)

utils/kamctl/postgres/lcr-create.sql

@@ -1,9 +1,9 @@
-INSERT INTO version (table_name, table_version) values ('lcr_gw','2');
+INSERT INTO version (table_name, table_version) values ('lcr_gw','3');
 CREATE TABLE lcr_gw (
     id SERIAL PRIMARY KEY NOT NULL,
     lcr_id SMALLINT NOT NULL,
     gw_name VARCHAR(128),
-    ip_addr VARCHAR(47),
+    ip_addr VARCHAR(50),
     hostname VARCHAR(64),
     port SMALLINT,
     params VARCHAR(64),

utils/kamctl/postgres/permissions-create.sql

@@ -9,11 +9,11 @@ CREATE TABLE trusted (
 
 CREATE INDEX trusted_peer_idx ON trusted (src_ip);
 
-INSERT INTO version (table_name, table_version) values ('address','5');
+INSERT INTO version (table_name, table_version) values ('address','6');
 CREATE TABLE address (
     id SERIAL PRIMARY KEY NOT NULL,
     grp INTEGER DEFAULT 1 NOT NULL,
-    ip_addr VARCHAR(48) NOT NULL,
+    ip_addr VARCHAR(50) NOT NULL,
     mask INTEGER DEFAULT 32 NOT NULL,
     port SMALLINT DEFAULT 0 NOT NULL,
     tag VARCHAR(64)