bgp multihop support

loxilb-io · Oct 25, 2023 · 3e695cf · 3e695cf
1 parent 9e2edc1
commit 3e695cf
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/api/models/b_g_p_neigh.go b/api/models/b_g_p_neigh.go
diff --git a/api/restapi/embedded_spec.go b/api/restapi/embedded_spec.go
diff --git a/api/restapi/handler/gobgp.go b/api/restapi/handler/gobgp.go
@@ -36,6 +36,9 @@ func ConfigPostBGPNeigh(params operations.PostConfigBgpNeighParams) middleware.R
 	// Remote Port
 	bgpNeighMod.RemotePort = uint16(params.Attr.RemotePort)
 
+	// Multi-hop or not
+	bgpNeighMod.MultiHop = params.Attr.SetMultiHop
+
 	tk.LogIt(tk.LogDebug, "[API] GoBGP neighAdd : %v\n", bgpNeighMod)
 	_, err := ApiHooks.NetGoBGPNeighAdd(&bgpNeighMod)
 	if err != nil {

diff --git a/api/swagger.yml b/api/swagger.yml
@@ -3100,6 +3100,9 @@ definitions:
       remotePort:
         type: integer
         description: Remote Connect Port (default 179)
+      setMultiHop:
+        type: boolean
+        description: Enable multi-hop peering (if needed)
 
   BGPGlobalConfig:
     type: object

diff --git a/common/common.go b/common/common.go
@@ -605,6 +605,7 @@ type GoBGPNeighMod struct {
 	Addr       net.IP `json:"neighIP"`
 	RemoteAS   uint32 `json:"remoteAS"`
 	RemotePort uint16 `json:"remotePort"`
+	MultiHop   bool   `json:"multiHop"`
 }
 
 // Equal - check if two session tunnel entries are equal

diff --git a/loxinet/apiclient.go b/loxinet/apiclient.go
@@ -590,7 +590,7 @@ func (na *NetAPIStruct) NetParamGet(param *cmn.ParamMod) (int, error) {
 // NetGoBGPNeighAdd - Add bgp neigh to gobgp
 func (na *NetAPIStruct) NetGoBGPNeighAdd(param *cmn.GoBGPNeighMod) (int, error) {
 	if mh.bgp != nil {
-		return mh.bgp.BGPNeighMod(true, param.Addr, param.RemoteAS, uint32(param.RemotePort))
+		return mh.bgp.BGPNeighMod(true, param.Addr, param.RemoteAS, uint32(param.RemotePort), param.MultiHop)
 	}
 	tk.LogIt(tk.LogDebug, "loxilb BGP mode is disabled \n")
 	return 0, errors.New("loxilb BGP mode is disabled")
@@ -600,7 +600,7 @@ func (na *NetAPIStruct) NetGoBGPNeighAdd(param *cmn.GoBGPNeighMod) (int, error)
 // NetGoBGPNeighDel - Del bgp neigh from gobgp
 func (na *NetAPIStruct) NetGoBGPNeighDel(param *cmn.GoBGPNeighMod) (int, error) {
 	if mh.bgp != nil {
-		return mh.bgp.BGPNeighMod(false, param.Addr, param.RemoteAS, uint32(param.RemotePort))
+		return mh.bgp.BGPNeighMod(false, param.Addr, param.RemoteAS, uint32(param.RemotePort), param.MultiHop)
 	}
 	tk.LogIt(tk.LogDebug, "loxilb BGP mode is disabled \n")
 	return 0, errors.New("loxilb BGP mode is disabled")

diff --git a/loxinet/gobgpclient.go b/loxinet/gobgpclient.go
@@ -909,7 +909,7 @@ func (gbh *GoBgpH) resetBGPMed(toLow bool) error {
 }
 
 // BGPNeighMod - Routine to add BGP neigh to goBGP server
-func (gbh *GoBgpH) BGPNeighMod(add bool, neigh net.IP, ras uint32, rPort uint32) (int, error) {
+func (gbh *GoBgpH) BGPNeighMod(add bool, neigh net.IP, ras uint32, rPort uint32, mhop bool) (int, error) {
 	var peer *api.Peer
 	var err error
 
@@ -930,6 +930,13 @@ func (gbh *GoBgpH) BGPNeighMod(add bool, neigh net.IP, ras uint32, rPort uint32)
 		peer.Transport.RemotePort = 179
 	}
 
+	if mhop {
+		peer.EbgpMultihop = &api.EbgpMultihop{
+			Enabled:     true,
+			MultihopTtl: uint32(8),
+		}
+	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
 	defer cancel()