✨ ip.cidr, ip.address and raw IP storage (#5292)

* ✨ ip.cidr and raw IP storage

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🧹 rename mask -> prefixlength

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🧹 expand int2ip types

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🐛 print CIDR of IP by default

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🐎 more efficient bitmask generator

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 📃 clarify IP internal vars

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* ✨ add ip.address

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🔨 switch from manual to proto-based IP marshaling

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🧹 remove those unnecessary types

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

* 🧹 split up test for data conversion

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

---------

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>

Author: arlimus

cli/printer/mql.go

@@ -787,7 +787,7 @@ func (print *Printer) Data(typ types.Type, data interface{}, codeID string, bund
 		return print.Secondary(data.(string))
 
 	case types.IP:
-		return print.Secondary(data.(string))
+		return print.Secondary(data.(llx.RawIP).String())
 
 	case types.ArrayLike:
 		if data == nil {

llx/builtin.go

@@ -596,13 +596,15 @@ func init() {
 			string("!=" + types.Empty): {f: stringNotEmptyV2, Label: "!="},
 			string("==" + types.IP):    {f: ipCmpIP, Label: "=="},
 			string("!=" + types.IP):    {f: ipNotIP, Label: "!="},
-			"version":                  {f: ipVersion},
-			"subnet":                   {f: ipSubnet},
+			"address":                  {f: ipAddress},
+			"cidr":                     {f: ipCIDR},
+			"inRange":                  {f: ipInRange},
+			"isUnspecified":            {f: ipUnspecified},
 			"prefix":                   {f: ipPrefix},
 			"prefixLength":             {f: ipPrefixLength},
+			"subnet":                   {f: ipSubnet},
 			"suffix":                   {f: ipSuffix},
-			"isUnspecified":            {f: ipUnspecified},
-			"inRange":                  {f: ipInRange, Label: "inRange"},
+			"version":                  {f: ipVersion},
 		},
 		types.ArrayLike: {
 			"[]":                       {f: arrayGetIndexV2},

llx/builtin_global.go

@@ -272,17 +272,11 @@ func ipCall(e *blockExecutor, f *Function, ref uint64) (*RawData, uint64, error)
 		return res, dref, err
 	}
 
-	raw, ok := res.Value.(string)
-	if ok {
-		return IPData(raw), 0, nil
-	}
-
-	rawInt, ok := res.Value.(int64)
-	if ok {
-		return IPData(int2ip(rawInt)), 0, nil
+	ip, ok := any2ip(res.Value)
+	if !ok {
+		return nil, 0, errors.New("called `ip` with unsupported type (expected string, int or IP)")
 	}
-
-	return nil, 0, errors.New("called `ip` with unsupported type (expected string or int)")
+	return IPData(ip), 0, nil
 }
 
 func stringCall(e *blockExecutor, f *Function, ref uint64) (*RawData, uint64, error) {