@@ -55,32 +55,33 @@ static  ip6_node IPv6ranges[IPv6RANGES_SIZE] = {

     { {0x00000000, 0x00000000, 0x00000000, 0x00000000} , "UNSPECIFIED",         {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF} },  //::/128

     { {0x00000000, 0x00000000, 0x00000000, 0x00000001} , "LOOPBACK",            {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF} },  //::1/128

     { {0x00000000, 0x00000000, 0x0000FFFF, 0x00000000} , "IPV4MAP",             {0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x00000000} },  //::FFFF:0:0/96

-    { {0x01000000, 0x00000000, 0x00000000, 0x00000000} , "DISCARD",             {0xFFFFFFFF, 0xFFFFFF00, 0x00000000, 0x00000000} },  //0100::/64

-    { {0x20010002, 0x00000000, 0x00000000, 0x00000000} , "BMWG",                {0xFFFFFFFF, 0xFF000000, 0x00000000, 0x00000000} },  //2001:0002::/48

+    { {0x01000000, 0x00000000, 0x00000000, 0x00000000} , "DISCARD",             {0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000} },  //0100::/64

+    { {0x20010002, 0x00000000, 0x00000000, 0x00000000} , "BMWG",                {0xFFFFFFFF, 0xFFFF0000, 0x00000000, 0x00000000} },  //2001:0002::/48

     { {0x20010000, 0x00000000, 0x00000000, 0x00000000} , "TEREDO",              {0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000} },  //2001::/32

     { {0x20010DB8, 0x00000000, 0x00000000, 0x00000000} , "DOCUMENTATION",       {0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000} },  //2001:DB8::/32

     { {0x20010010, 0x00000000, 0x00000000, 0x00000000} , "ORCHID",              {0xFFFFFFF0, 0x00000000, 0x00000000, 0x00000000} },  //2001:10::/28

     { {0x20020000, 0x00000000, 0x00000000, 0x00000000} , "6TO4",                {0xFFFF0000, 0x00000000, 0x00000000, 0x00000000} },  //2002::/16

-    { {0xFE800000, 0x00000000, 0x00000000, 0x00000000} , "LINK-LOCAL-UNICAST",  {0xFFC00000, 0x00000000, 0x00000000, 0x00000000} },  //FE80::/10

     { {0xFEC00000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFFC00000, 0x00000000, 0x00000000, 0x00000000} },  //FEC0::/10

-    { {0xFE800000, 0x00000000, 0x00000000, 0x00000000} , "LINK-LOCAL-UNICAST",  {0xFFc00000, 0x00000000, 0x00000000, 0x00000000} },  // FE80::/10

-    { {0xFEC00000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFFc00000, 0x00000000, 0x00000000, 0x00000000} },  // FEC0::/10

+    { {0xFE800000, 0x00000000, 0x00000000, 0x00000000} , "LINK-LOCAL-UNICAST",  {0xFFc00000, 0x00000000, 0x00000000, 0x00000000} },  //FE80::/10

     { {0xFE000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFF800000, 0x00000000, 0x00000000, 0x00000000} },  //FE00::/9

-    { {0xFE000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFF800000, 0x00000000, 0x00000000, 0x00000000} },  // FE00::/9

     { {0x00000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFF000000, 0x00000000, 0x00000000, 0x00000000} },  //::/8

     { {0x01000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFF000000, 0x00000000, 0x00000000, 0x00000000} },  //0100::/8

     { {0xFF000000, 0x00000000, 0x00000000, 0x00000000} , "MULTICAST",           {0xFF000000, 0x00000000, 0x00000000, 0x00000000} },  //FF00::/8

-    { {0xFF000000, 0x00000000, 0x00000000, 0x00000000} , "MULTICAST",           {0xFF000000, 0x00000000, 0x00000000, 0x00000000} },  // FF00::/8

     { {0x02000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFE000000, 0x00000000, 0x00000000, 0x00000000} },  //0200::/7

     { {0xFC000000, 0x00000000, 0x00000000, 0x00000000} , "UNIQUE-LOCAL-UNICAST",{0xFE000000, 0x00000000, 0x00000000, 0x00000000} },  //FC00::/7

-    { {0xFC000000, 0x00000000, 0x00000000, 0x00000000} , "UNIQUE-LOCAL-UNICAST",{0xFE000000, 0x00000000, 0x00000000, 0x00000000} },  // FC00::/7

     { {0x04000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFC000000, 0x00000000, 0x00000000, 0x00000000} },  //400::/6

     { {0xF8000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFC000000, 0x00000000, 0x00000000, 0x00000000} },  //F800::/6

-    { {0xF8000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xFC000000, 0x00000000, 0x00000000, 0x00000000} },  // F800::/6

     { {0x08000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF8000000, 0x00000000, 0x00000000, 0x00000000} },  //0800::/5

-    { {0xF0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF8000000, 0x00000000, 0x00000000, 0x00000000} },  // F000::/5

-    { {0xE0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF0000000, 0x00000000, 0x00000000, 0x00000000} },  // E000::/4

-    { {0xC0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} }   // C000::/3

+    { {0xF0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF8000000, 0x00000000, 0x00000000, 0x00000000} },  //F000::/5

+    { {0xE0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF0000000, 0x00000000, 0x00000000, 0x00000000} },  //E000::/4

+    { {0x10000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xF0000000, 0x00000000, 0x00000000, 0x00000000} },  //1000::/4

+    { {0xC0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} },  //C000::/3

+    { {0x20000000, 0x00000000, 0x00000000, 0x00000000} , "GLOBAL-UNICAST",      {0xE0000000, 0x00000000, 0x00000000, 0x00000000} },  //2000::/3

+    { {0x40000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} },  //4000::/3

+    { {0x60000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} },  //6000::/3

+    { {0x80000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} },  //8000::/3

+    { {0xA0000000, 0x00000000, 0x00000000, 0x00000000} , "RESERVED",            {0xE0000000, 0x00000000, 0x00000000, 0x00000000} }   //A000::/3

+

 };

@@ -90,6 +91,9 @@ int ip6_iptype(str string_ip, char **res)

   char in6_string[INET6_ADDRSTRLEN];

   int i;

+  if (string_ip.len >= INET6_ADDRSTRLEN)

+        return 0;

+

   memcpy(in6_string, string_ip.s, string_ip.len);

   in6_string[string_ip.len] = '\0';

@@ -114,6 +118,9 @@ int ip4_iptype(str string_ip, char **res)

   char in4_string[INET_ADDRSTRLEN];

   int i;

+  if (string_ip.len >= INET_ADDRSTRLEN)

+      return 0;

+

   memcpy(in4_string, string_ip.s, string_ip.len);

   in4_string[string_ip.len] = '\0';

@@ -88,6 +88,7 @@ static int w_is_ipv6_reference(struct sip_msg*, char*);

 static int w_ip_type(struct sip_msg*, char*);

 static int w_detailed_ipv6_type(struct sip_msg* _msg, char* _s,  char *res);

 static int w_detailed_ipv4_type(struct sip_msg* _msg, char* _s,  char *res);

+static int w_detailed_ip_type(struct sip_msg* _msg, char* _s,  char *res);

 static int w_compare_ips(struct sip_msg*, char*, char*);

 static int w_compare_pure_ips(struct sip_msg*, char*, char*);

 static int w_is_ip_rfc1918(struct sip_msg*, char*);

@@ -126,6 +127,8 @@ static cmd_export_t cmds[] =

   fixup_detailed_ip_type, fixup_free_detailed_ip_type, ANY_ROUTE },

   { "detailed_ipv6_type", (cmd_function)w_detailed_ipv6_type, 2,

   fixup_detailed_ip_type, fixup_free_detailed_ip_type, ANY_ROUTE },

+  { "detailed_ip_type", (cmd_function)w_detailed_ip_type, 2,

+  fixup_detailed_ip_type, fixup_free_detailed_ip_type, ANY_ROUTE },

   { "compare_ips", (cmd_function)w_compare_ips, 2, fixup_spve_spve, 0,

   REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE },

   { "compare_pure_ips", (cmd_function)w_compare_pure_ips, 2, fixup_spve_spve, 0,

@@ -484,12 +487,18 @@ static int w_ip_type(struct sip_msg* _msg, char* _s)

 static int w_detailed_ipv4_type(struct sip_msg* _msg, char* _s,  char *_dst)

 {

-    return _detailed_ip_type(AF_INET, _msg, _s, _dst);

+    return _detailed_ip_type(ip_type_ipv4, _msg, _s, _dst);

 }

 static int w_detailed_ipv6_type(struct sip_msg* _msg, char* _s,  char *_dst)

 {

-    return _detailed_ip_type(AF_INET6, _msg, _s, _dst);

+    return _detailed_ip_type(ip_type_ipv6, _msg, _s, _dst);

+}

+

+static int w_detailed_ip_type(struct sip_msg* _msg, char* _s,  char *_dst)

+{

+    /* `ip_type_error` should read `unknown type` */

+    return _detailed_ip_type(ip_type_error, _msg, _s, _dst);

 }

 /*! \brief Return the IP type of the given argument (string or pv): 1 = IPv4, 2 = IPv6, 3 = IPv6 refenrece, -1 = invalid IP. */

@@ -499,6 +508,7 @@ static int _detailed_ip_type(unsigned int _type, struct sip_msg* _msg, char* _s,

   pv_spec_t *dst;

   pv_value_t val;

   char *res;

+  unsigned int assumed_type;

   if (_s == NULL) {

     LM_ERR("bad parameter\n");

@@ -511,15 +521,18 @@ static int _detailed_ip_type(unsigned int _type, struct sip_msg* _msg, char* _s,

     return -3;

   }

-  switch (_type) {

-      case AF_INET:

+  assumed_type = (ip_type_error == _type)? ip_parser_execute(string.s, string.len) : _type;

+

+  switch (assumed_type) {

+      case ip_type_ipv4:

           if (!ip4_iptype(string, &res)) {

               LM_ERR("bad ip parameter\n");

               return -1;

           }

           break;

-      case AF_INET6:

-          /* make IPv6 from reference if needed */

+      case ip_type_ipv6_reference:

+      case ip_type_ipv6:

+          /* consider this reference */

           if (string.s[0] == '[') {

               string.s++;

               string.len -= 2;