encoding according to defined type in dictionary

Author: corbamico

go.mod

@@ -1,8 +1,8 @@
 module github.com/corbamico/ccg-go
 
-go 1.13
+go 1.15
 
 require (
 	github.com/fiorix/go-diameter/v4 v4.0.1
-	github.com/google/gopacket v1.1.17
+	github.com/google/gopacket v1.1.18
 )

go.sum

@@ -1,7 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/fiorix/go-diameter v3.0.2+incompatible h1:PLk2NkqMYILlEdeiz0hJVB3xcuuL+Gc9iCaEgjfbs5w=
 github.com/fiorix/go-diameter/v4 v4.0.1 h1:IEjXnzKDej/a1Z703XGfFbgvengXIBLuWLvAGWv+ZK8=
 github.com/fiorix/go-diameter/v4 v4.0.1/go.mod h1:Qx/+pf+c9sBUHWq1d7EH3bkdwN8U0mUpdy9BieDw6UQ=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -10,6 +9,8 @@ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5y
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/gopacket v1.1.17 h1:rMrlX2ZY2UbvT+sdz3+6J+pp2z+msCq9MxTU6ymxbBY=
 github.com/google/gopacket v1.1.17/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
+github.com/google/gopacket v1.1.18 h1:lum7VRA9kdlvBi7/v2p7/zcbkduHaCH/SVVyurs7OpY=
+github.com/google/gopacket v1.1.18/go.mod h1:UdDNZ1OO62aGYVnPhxT1U6aI7ukYtA/kB8vaU0diBUM=
 github.com/ishidawataru/sctp v0.0.0-20190922091402-408ec287e38c h1:PwVcPU2rqkJIG0Lz/UGbGcbfi/HhEbOIId+w4xkbGHQ=
 github.com/ishidawataru/sctp v0.0.0-20190922091402-408ec287e38c/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

internal/json2diam.go

@@ -149,8 +149,9 @@ func isJSON(s []byte) bool {
 func encode(key string, value interface{}, appid uint32) (avp *diam.AVP, err error) {
 	var avpcode int
 	var subAVP *diam.AVP
-	//var dictAVP *dict.AVP
 	var matched bool
+	var foundAVP bool
+
 	vendoridInt := int(0)
 	dictAVP := &dict.AVP{Code: 0, VendorID: 0}
 
@@ -180,14 +181,28 @@ func encode(key string, value interface{}, appid uint32) (avp *diam.AVP, err err
 		if dictAVP, err = dict.Default.FindAVP(appid, key); err != nil {
 			return nil, err
 		}
+		foundAVP = true
 	}
 
 	//2. handle value
-	//TODO, should be handle value according dictAVP found in dictionary
+	//should be handle value according dictAVP found in dictionary
+	//2020-08-20, Handle foundAVP
 	switch value.(type) {
 	case float64:
+		if foundAVP {
+			if avp := newAVP(dictAVP.Code, dictAVP.VendorID, value, dictAVP.Data.Type); avp != nil {
+				return avp, nil
+			}
+			return nil, errors.New("Encode Error, Mismatch Type with defined in Dictionary")
+		}
 		return diam.NewAVP(dictAVP.Code, 0, dictAVP.VendorID, datatype.Unsigned32(value.(float64))), nil
 	case string:
+		if foundAVP {
+			if avp := newAVP(dictAVP.Code, dictAVP.VendorID, value, dictAVP.Data.Type); avp != nil {
+				return avp, nil
+			}
+			return nil, errors.New("Encode Error, Mismatch Type with defined in Dictionary")
+		}
 		return diam.NewAVP(dictAVP.Code, 0, dictAVP.VendorID, datatype.UTF8String(value.(string))), nil
 	case map[string]interface{}:
 		grouped := &diam.GroupedAVP{
@@ -204,3 +219,43 @@ func encode(key string, value interface{}, appid uint32) (avp *diam.AVP, err err
 		return nil, errors.New("Unknown Data Type")
 	}
 }
+
+func newAVP(avpcode uint32, vendorid uint32, value interface{}, typeid datatype.TypeID) *diam.AVP {
+	switch typeid {
+	case datatype.UnknownType:
+	case datatype.AddressType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Address(value.(string)))
+	case datatype.DiameterIdentityType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.DiameterIdentity(value.(string)))
+	case datatype.DiameterURIType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.DiameterURI(value.(string)))
+	case datatype.EnumeratedType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Enumerated(value.(float64)))
+	case datatype.Float32Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Float32(value.(float64)))
+	case datatype.Float64Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Float64(value.(float64)))
+	case datatype.GroupedType:
+	case datatype.IPFilterRuleType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.IPFilterRule(value.(string)))
+	case datatype.IPv4Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.IPv4(value.(string)))
+	case datatype.Integer32Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Integer32(value.(float64)))
+	case datatype.Integer64Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Integer64(value.(float64)))
+	case datatype.OctetStringType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.OctetString(value.(string)))
+	case datatype.TimeType:
+		if t, err := time.Parse(time.RFC3339, value.(string)); err == nil {
+			return diam.NewAVP(avpcode, 0, vendorid, datatype.Time(t))
+		}
+	case datatype.UTF8StringType:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.UTF8String(value.(string)))
+	case datatype.Unsigned32Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Unsigned32(value.(float64)))
+	case datatype.Unsigned64Type:
+		return diam.NewAVP(avpcode, 0, vendorid, datatype.Unsigned64(value.(float64)))
+	}
+	return nil
+}