Selaa lähdekoodia

Merge pull request #447 from sanimej/libn-exp-local

Pass the vxlan port in network endian order
aboch 10 vuotta sitten
vanhempi
commit
d0b979069f
1 muutettua tiedostoa jossa 2 lisäystä ja 1 poistoa
  1. 2 1
      libnetwork/drivers/overlay/ov_utils.go

+ 2 - 1
libnetwork/drivers/overlay/ov_utils.go

@@ -6,6 +6,7 @@ import (
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/netutils"
 	"github.com/docker/libnetwork/types"
 	"github.com/docker/libnetwork/types"
 	"github.com/vishvananda/netlink"
 	"github.com/vishvananda/netlink"
+	"github.com/vishvananda/netlink/nl"
 )
 )
 
 
 func validateID(nid, eid types.UUID) error {
 func validateID(nid, eid types.UUID) error {
@@ -54,7 +55,7 @@ func createVxlan(vni uint32) (string, error) {
 		LinkAttrs: netlink.LinkAttrs{Name: name},
 		LinkAttrs: netlink.LinkAttrs{Name: name},
 		VxlanId:   int(vni),
 		VxlanId:   int(vni),
 		Learning:  true,
 		Learning:  true,
-		Port:      vxlanPort,
+		Port:      int(nl.Swap16(vxlanPort)), //network endian order
 		Proxy:     true,
 		Proxy:     true,
 		L3miss:    true,
 		L3miss:    true,
 		L2miss:    true,
 		L2miss:    true,