Add support for SCION addresses

multiaddr_test.go

@@ -156,6 +156,10 @@ func TestConstructFails(t *testing.T) {
 		"/",
 		"",
 		"/p2p/QmxoHT6iViN5xAjoz1VZ553cL31U9F94ht3QvWR1FrEbZY", // sha256 multihash with digest len > 32
+		"/scion",
+		"/scion//udp/1234",
+		"/scion/0-",
+		"/scion/1234",
 	}
 
 	for _, a := range cases {
@@ -266,6 +270,10 @@ var good = []string{
 	"/ip4/127.0.0.1/tcp/0/p2p/12D3KooWCryG7Mon9orvQxcS1rYZjotPgpwoJNHHKcLLfE4Hf5mV/http-path/foo",
 	"/ip4/127.0.0.1/tcp/443/tls/sni/example.com/http/http-path/foo",
 	"/memory/4",
+	"/scion/0-0",
+	"/scion/1-ff00:0:110",
+	"/scion/1-ff00:0:110/ip4/1.2.3.4",
+	"/scion/1-ff00:0:110/ip6/::ffff:127.0.0.1/udp/111",
 }
 
 func TestConstructSucceeds(t *testing.T) {
@@ -542,6 +550,13 @@ func TestEncapsulate(t *testing.T) {
 		joined = (*first).Encapsulate(rest)
 		require.True(t, joined.Equal(m))
 	})
+
+	// SCION Multiaddr
+	m5, _ := NewMultiaddr("/scion/1-ff00:0:110")
+	e := m5.Encapsulate(m)
+	if s := e.String(); s != "/scion/1-ff00:0:110/ip4/127.0.0.1/udp/1234" {
+		t.Error("encapsulate /scion/1-ff00:0:110/ip4/127.0.0.1/udp/1234 failed.", s)
+	}
 }
 
 func TestDecapsulateComment(t *testing.T) {
@@ -671,6 +686,11 @@ func TestGetValue(t *testing.T) {
 	a = newMultiaddr(t, "/ip4/0.0.0.0/unix/a/b/c/d") // ending in a path one.
 	assertValueForProto(t, a, P_IP4, "0.0.0.0")
 	assertValueForProto(t, a, P_UNIX, "/a/b/c/d")
+
+	a = newMultiaddr(t, "/scion/1-ff00:0:110/ip4/127.0.0.1/udp/1234")
+	assertValueForProto(t, a, P_SCION, "1-ff00:0:110")
+	assertValueForProto(t, a, P_IP4, "127.0.0.1")
+	assertValueForProto(t, a, P_UDP, "1234")
 }
 
 func FuzzNewMultiaddrBytes(f *testing.F) {
@@ -758,6 +778,7 @@ func TestRoundTrip(t *testing.T) {
 		"/p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP",
 		"/p2p/QmbHVEEepCi7rn7VL7Exxpd2Ci9NNB6ifvqwhsrbRMgQFP/unix/a/b/c",
 		"/http-path/tmp%2Fbar",
+		"/scion/1-ff00:0:110/ip6/::ffff:127.0.0.1/tcp/111",
 	} {
 		ma, err := NewMultiaddr(s)
 		if err != nil {

protocols.go

@@ -42,6 +42,7 @@ const (
 	P_WEBRTC_DIRECT     = 280
 	P_WEBRTC            = 281
 	P_MEMORY            = 777
+	P_SCION             = 13639680
 )
 
 var (
@@ -290,6 +291,14 @@ var (
 		Size:       64,
 		Transcoder: TranscoderMemory,
 	}
+	protoSCION = Protocol{
+		Name:       "scion",
+		Code:       P_SCION,
+		VCode:      CodeToVarint(P_SCION),
+		Size:       LengthPrefixedVarSize,
+		Path:       false,
+		Transcoder: TranscoderSCION,
+	}
 )
 
 func init() {
@@ -332,6 +341,7 @@ func init() {
 		protoWebRTCDirect,
 		protoWebRTC,
 		protoMemory,
+		protoSCION,
 	} {
 		if err := AddProtocol(p); err != nil {
 			panic(err)

transcoders.go

@@ -518,3 +518,32 @@ func memoryValidate(b []byte) error {
 
 	return nil
 }
+var TranscoderSCION = NewTranscoderFromFunctions(scionStB, scionBtS, scionVal)
+
+func scionVal(b []byte) error {
+	// SCION IA is 16 bit ISD and 48 bit AS numbers separated by "-"
+	// ISD numbers formatted as decimal, AS numbering similar to IPv6
+	// E.g.: "0-0" or "1234-ff00:0:110"
+	if len(b) < 3 {
+		return fmt.Errorf("byte slice too short: %d", len(b))
+	}
+	if minus := bytes.IndexByte(b, '-'); minus < 0 {
+		return errors.New("scion addresses must contain '-'")
+	}
+	return nil
+}
+
+func scionStB(s string) ([]byte, error) {
+	b := []byte(s)
+	if err := scionVal(b); err != nil {
+		return nil, err
+	}
+	return b, nil
+}
+
+func scionBtS(b []byte) (string, error) {
+	if err := scionVal(b); err != nil {
+		return "", err
+	}
+	return string(b), nil
+}