Skip to content
This repository was archived by the owner on Mar 27, 2026. It is now read-only.

Move to commons #16

Merged
wnagele merged 5 commits into from
Oct 28, 2025
Merged

Move to commons #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1f1639
Use IsHost from util
wnagele Oct 28, 2025
9a59347
Move ParseSegments to util and adjust to []string since we don't use …
wnagele Oct 28, 2025
941de24
Use DecodeSRv6Endpoint and EncodeSRv6Endpoint from util
wnagele Oct 28, 2025
3ef248c
Use Hex/Base64 convert from util
wnagele Oct 28, 2025
ee7c765
mod :broom:
wnagele Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ module github.com/datum-cloud/galactic-agent
go 1.24.9

require (
github.com/datum-cloud/galactic-common v0.0.0-20251028162316-06f70d39f8ed
github.com/datum-cloud/galactic-common v0.0.0-20251028201425-f06de7d6ad01
github.com/eclipse/paho.mqtt.golang v1.5.0
github.com/kenshaw/baseconv v0.1.1
github.com/spf13/cobra v1.9.1
github.com/spf13/viper v1.20.1
github.com/vishvananda/netlink v1.3.2-0.20250622222046-78aca1ace529
Expand All @@ -20,6 +19,7 @@ require (
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/kenshaw/baseconv v0.1.1 // indirect
github.com/lorenzosaino/go-sysctl v0.3.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/sagikazarmark/locafero v0.7.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I=
github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/datum-cloud/galactic-common v0.0.0-20251028162316-06f70d39f8ed h1:g1FgebSEgbJGq3RpB6GsJAObUFChP2IuP1OwBqINRlU=
github.com/datum-cloud/galactic-common v0.0.0-20251028162316-06f70d39f8ed/go.mod h1:lJ8fte6gUiIi7cecSrfvicTQMgq+ejFrdN97ElARDR8=
github.com/datum-cloud/galactic-common v0.0.0-20251028201425-f06de7d6ad01 h1:NYfkB6qPWPp0+mgpcr9R2v56efAZNbaetZPAazjkl/M=
github.com/datum-cloud/galactic-common v0.0.0-20251028201425-f06de7d6ad01/go.mod h1:gXCoJaHM1Yy8au9VdKNbKJBGIKbqcPdfKvd9lQ9UNyM=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
40 changes: 6 additions & 34 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@ package main

import (
"context"
"encoding/binary"
"fmt"
"golang.org/x/sync/errgroup"
"log"
"net"
"os"
"os/signal"
"strconv"
"syscall"

"golang.org/x/sync/errgroup"

"github.com/spf13/cobra"
"github.com/spf13/viper"

Expand All @@ -20,6 +17,7 @@ import (
"github.com/datum-cloud/galactic-agent/api/local"
"github.com/datum-cloud/galactic-agent/api/remote"
"github.com/datum-cloud/galactic-agent/srv6"
"github.com/datum-cloud/galactic-common/util"
)

var configFile string
Expand Down Expand Up @@ -58,15 +56,15 @@ func main() {
ctx, stop := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
defer stop() //nolint:errcheck

_, err := EncodeVPCToSRv6Endpoint(viper.GetString("srv6_net"), "ffffffffffff", "ffff")
_, err := util.EncodeSRv6Endpoint(viper.GetString("srv6_net"), "ffffffffffff", "ffff")
if err != nil {
log.Fatalf("srv6_endpoint invalid: %v", err)
}

l = local.Local{
SocketPath: viper.GetString("socket_path"),
RegisterHandler: func(vpc, vpcAttachment string, networks []string) error {
srv6_endpoint, err := EncodeVPCToSRv6Endpoint(viper.GetString("srv6_net"), vpc, vpcAttachment)
srv6_endpoint, err := util.EncodeSRv6Endpoint(viper.GetString("srv6_net"), vpc, vpcAttachment)
if err != nil {
return err
}
Expand All @@ -91,7 +89,7 @@ func main() {
return nil
},
DeregisterHandler: func(vpc, vpcAttachment string, networks []string) error {
srv6_endpoint, err := EncodeVPCToSRv6Endpoint(viper.GetString("srv6_net"), vpc, vpcAttachment)
srv6_endpoint, err := util.EncodeSRv6Endpoint(viper.GetString("srv6_net"), vpc, vpcAttachment)
if err != nil {
return err
}
Expand Down Expand Up @@ -167,29 +165,3 @@ func main() {
log.Fatalf("Execution failed: %v", err)
}
}

func EncodeVPCToSRv6Endpoint(srv6_net, vpc, vpcAttachment string) (string, error) {
ip, ipnet, err := net.ParseCIDR(srv6_net)
if err != nil {
return "", err
}
if ip.To4() != nil {
return "", fmt.Errorf("provided srv6_net is not IPv6: %s", srv6_net)
}
mask_len, _ := ipnet.Mask.Size()
if mask_len > 64 {
return "", fmt.Errorf("srv6_net must be at least 64 bits long")
}

vpcInt, err := strconv.ParseUint(vpc, 16, 64)
if err != nil {
return "", fmt.Errorf("invalid vpc %q: %w", vpc, err)
}
vpcAttachmentInt, err := strconv.ParseUint(vpcAttachment, 16, 16)
if err != nil {
return "", fmt.Errorf("invalid vpcAttachment %q: %w", vpcAttachment, err)
}

binary.BigEndian.PutUint64(ip[8:16], (vpcInt<<16)|vpcAttachmentInt)
return ip.String(), nil
}
63 changes: 16 additions & 47 deletions srv6/srv6.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@ package srv6
import (
"errors"
"fmt"
"net"
"strings"

"github.com/kenshaw/baseconv"
"github.com/vishvananda/netlink"

"github.com/datum-cloud/galactic-agent/srv6/neighborproxy"
Expand All @@ -20,15 +17,15 @@ func RouteIngressAdd(ipStr string) error {
if err != nil {
return fmt.Errorf("invalid ip: %w", err)
}
vpc, vpcAttachment, err := util.ExtractVPCFromSRv6Endpoint(ip)
vpc, vpcAttachment, err := util.DecodeSRv6Endpoint(ip)
if err != nil {
return fmt.Errorf("could not extract SRv6 endpoint: %w", err)
}
vpc, err = ToBase62(vpc)
vpc, err = util.HexToBase62(vpc)
if err != nil {
return fmt.Errorf("invalid vpc: %w", err)
}
vpcAttachment, err = ToBase62(vpcAttachment)
vpcAttachment, err = util.HexToBase62(vpcAttachment)
if err != nil {
return fmt.Errorf("invalid vpcattachment: %w", err)
}
Expand All @@ -44,15 +41,15 @@ func RouteIngressDel(ipStr string) error {
if err != nil {
return fmt.Errorf("invalid ip: %w", err)
}
vpc, vpcAttachment, err := util.ExtractVPCFromSRv6Endpoint(ip)
vpc, vpcAttachment, err := util.DecodeSRv6Endpoint(ip)
if err != nil {
return fmt.Errorf("could not extract SRv6 endpoint: %w", err)
}
vpc, err = ToBase62(vpc)
vpc, err = util.HexToBase62(vpc)
if err != nil {
return fmt.Errorf("invalid vpc: %w", err)
}
vpcAttachment, err = ToBase62(vpcAttachment)
vpcAttachment, err = util.HexToBase62(vpcAttachment)
if err != nil {
return fmt.Errorf("invalid vpcattachment: %w", err)
}
Expand All @@ -72,26 +69,26 @@ func RouteEgressAdd(prefixStr, srcStr string, segmentsStr []string) error {
if err != nil {
return fmt.Errorf("invalid src: %w", err)
}
segments, err := ParseSegments(segmentsStr)
segments, err := util.ParseSegments(segmentsStr)
if err != nil {
return fmt.Errorf("invalid segments: %w", err)
}

vpc, vpcAttachment, err := util.ExtractVPCFromSRv6Endpoint(src)
vpc, vpcAttachment, err := util.DecodeSRv6Endpoint(src)
if err != nil {
return fmt.Errorf("could not extract SRv6 endpoint: %w", err)
}
vpc, err = ToBase62(vpc)
vpc, err = util.HexToBase62(vpc)
if err != nil {
return fmt.Errorf("invalid vpc: %w", err)
}
vpcAttachment, err = ToBase62(vpcAttachment)
vpcAttachment, err = util.HexToBase62(vpcAttachment)
if err != nil {
return fmt.Errorf("invalid vpcattachment: %w", err)
}

var errs []error
if IsHost(prefix) {
if util.IsHost(prefix) {
if err := neighborproxy.Add(prefix, vpc, vpcAttachment); err != nil {
errs = append(errs, fmt.Errorf("neighborproxy add failed: %w", err))
}
Expand All @@ -114,26 +111,26 @@ func RouteEgressDel(prefixStr, srcStr string, segmentsStr []string) error {
if err != nil {
return fmt.Errorf("invalid src: %w", err)
}
segments, err := ParseSegments(segmentsStr)
segments, err := util.ParseSegments(segmentsStr)
if err != nil {
return fmt.Errorf("invalid segments: %w", err)
}

vpc, vpcAttachment, err := util.ExtractVPCFromSRv6Endpoint(src)
vpc, vpcAttachment, err := util.DecodeSRv6Endpoint(src)
if err != nil {
return fmt.Errorf("could not extract SRv6 endpoint: %w", err)
}
vpc, err = ToBase62(vpc)
vpc, err = util.HexToBase62(vpc)
if err != nil {
return fmt.Errorf("invalid vpc: %w", err)
}
vpcAttachment, err = ToBase62(vpcAttachment)
vpcAttachment, err = util.HexToBase62(vpcAttachment)
if err != nil {
return fmt.Errorf("invalid vpcattachment: %w", err)
}

var errs []error
if IsHost(prefix) {
if util.IsHost(prefix) {
if err := neighborproxy.Delete(prefix, vpc, vpcAttachment); err != nil {
errs = append(errs, fmt.Errorf("neighborproxy delete failed: %w", err))
}
Expand All @@ -146,31 +143,3 @@ func RouteEgressDel(prefixStr, srcStr string, segmentsStr []string) error {
}
return nil
}

func ToBase62(value string) (string, error) {
return baseconv.Convert(strings.ToLower(value), baseconv.DigitsHex, baseconv.Digits62)
}

func IsHost(ipNet *net.IPNet) bool {
ones, bits := ipNet.Mask.Size()
// host if mask is full length: /32 for IPv4, /128 for IPv6
return ones == bits
}

func ParseSegments(input []string) ([]net.IP, error) {
var segments []net.IP
for _, ipStr := range input {
ip, err := util.ParseIP(ipStr)
if err != nil {
return nil, fmt.Errorf("could not parse ip (%s): %v", ipStr, err)
}
if ip.To4() != nil {
return nil, fmt.Errorf("not an ipv6 address: %s", ipStr)
}
segments = append([]net.IP{ip}, segments...)
}
if len(segments) == 0 {
return nil, fmt.Errorf("no segments parsed: %v", input)
}
return segments, nil
}