fixup

Author: louisroyer

config/config.yaml

@@ -7,6 +7,7 @@
 http-address: "192.0.2.1"
 http-port: "8080"
 controller-uri: "http://192.0.2.2:8080"
+backbone-ip: "fd00::01"
 
 linux-headend-set-source-address: "fd00:51D5:0000::"
 ipv4-headend-prefix: "10.0.200.3/32"
@@ -25,7 +26,7 @@ headends:
             - "fd00:51D5:0000:4::"
     source-address-prefix: "fd00:51D5:000:1:9999::/80"
   - name: "linux test"
-    to: "10.0.300.0/24"
+    to: "10.0.100.0/24"
     provider: "Linux"
     behavior: "H.Encaps"
     policy:

internal/app/setup.go

@@ -63,7 +63,7 @@ func (s *Setup) AddTasks() {
 	// 0.3 http server
 	// 0.4 controller registry
 	if s.config.Locator != nil {
-		s.RegisterTask("ctrl.registry", tasks.NewControllerRegistry(s.config.ControllerURI, s.config.BackboneAddress, *s.config.Locator, httpURI))
+		s.RegisterTask("ctrl.registry", tasks.NewControllerRegistry(s.config.ControllerURI, s.config.BackboneIP, *s.config.Locator, httpURI))
 	}
 
 	// 1.  ifaces
@@ -272,10 +272,11 @@ func (s *Setup) Exit() {
 
 	// 0.2. unregister from controller
 	if s.config.Locator != nil {
-		if err := s.RunInitTask("ctrl.registry"); err != nil {
+		if err := s.RunExitTask("ctrl.registry"); err != nil {
 			fmt.Println(err)
 		}
 	}
+
 	// 1.  ip rules
 	// 1.1 rule to rttable nextmn-gtp4
 	if s.config.GTP4HeadendPrefix != nil {
@@ -293,7 +294,7 @@ func (s *Setup) Exit() {
 	// 2  endpoints + headends
 	// 2. nextmn gtp4 headends
 	for _, h := range s.config.Headends.FilterWithBehavior(config.ProviderNextMN, config.H_M_GTP4_D) {
-		t_name := fmt.Sprintf("nextmn.headend/%s", h.Name)
+		t_name := fmt.Sprintf("nextmn.headend.gtp4/%s", h.Name)
 		if err := s.RunExitTask(t_name); err != nil {
 			fmt.Println(err)
 		}

internal/config/config.go

@@ -6,6 +6,7 @@ package config
 
 import (
 	"io/ioutil"
+	"net/netip"
 	"path/filepath"
 
 	"gopkg.in/yaml.v3"
@@ -33,13 +34,13 @@ type SRv6Config struct {
 
 	// interface with controller
 	HTTPAddress string  `yaml:"http-address"`
-	HTTPPort    *string `yaml:"http-port,omitemty"` // default: 80
+	HTTPPort    *string `yaml:"http-port,omitempty"` // default: 80
 	// TODO: use a better type for this information
-	ControllerURI string `yaml:controller-uri"` // example: http://192.0.2.2/8080
+	ControllerURI string `yaml:"controller-uri"` // example: http://192.0.2.2/8080
 
 	// Backbone IPv6 address
 	// TODO: use a better type for this information
-	BackboneAddress string
+	BackboneIP netip.Addr `yaml:"backbone-ip"`
 
 	// headends
 	LinuxHeadendSetSourceAddress *string  `yaml:"linux-headend-set-source-address,omitempty"`

internal/tasks/controller-registry.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
+	"net/netip"
 )
 
 // ControllerRegistry registers and unregisters into controller
@@ -17,12 +18,12 @@ type ControllerRegistry struct {
 	RemoteControlURI string // URI of the controller
 	LocalControlURI  string // URI of the router, used to control it
 	Locator          string
-	Backbone         string
+	Backbone         netip.Addr
 	Resource         string
 }
 
 // Create a new ControllerRegistry
-func NewControllerRegistry(remoteControlURI string, backbone string, locator string, localControlURI string) *ControllerRegistry {
+func NewControllerRegistry(remoteControlURI string, backbone netip.Addr, locator string, localControlURI string) *ControllerRegistry {
 	return &ControllerRegistry{
 		WithState:        NewState(),
 		RemoteControlURI: remoteControlURI,
@@ -37,7 +38,7 @@ func NewControllerRegistry(remoteControlURI string, backbone string, locator str
 func (t *ControllerRegistry) RunInit() error {
 	data := map[string]string{
 		"locator":  t.Locator,
-		"backbone": t.Backbone,
+		"backbone": t.Backbone.String(),
 		"control":  t.LocalControlURI,
 	}
 	json_data, err := json.Marshal(data)
@@ -54,7 +55,7 @@ func (t *ControllerRegistry) RunInit() error {
 		return fmt.Errorf("HTTP Bad request\n")
 	}
 	if resp.StatusCode >= 500 {
-		return fmt.Errorf("HTTP Control Server: internal error %v\n", resp.Body)
+		return fmt.Errorf("HTTP Control Server: internal error\n")
 	}
 	if resp.StatusCode == 201 { // created
 		t.Resource = resp.Header.Get("Location")

main.go

@@ -65,8 +65,8 @@ func main() {
 			}(ch, setup)
 			setup.AddTasks()
 			if err := setup.Run(); err != nil {
-				fmt.Println("Error while running, exiting…")
-				log.Fatal(err)
+				fmt.Println("Error while running, exiting…:", err)
+				setup.Exit()
 				os.Exit(2)
 			}
 			return nil