Add more rich network functions

api/descriptions.proto

@@ -2,6 +2,9 @@ syntax = "proto3";
 
 package api;
 
+// To generate description.pb.go, run:
+// $ protoc --go_out=. descriptions.proto
+
 message SandboxConfig {
     string hostname = 1;
     repeated string dns = 2;
@@ -54,11 +57,12 @@ message InterfaceDescription {
     string id = 1;
     bool lo = 2;
     string bridge = 3;
-    string ip = 4;
+    repeated string ip = 4;
     string mac = 5;
-    string gw = 6;
-    string tapName = 7;
-    string options = 8;
+    uint64 mtu = 6;
+    string gw = 7;
+    string tapName = 8;
+    string options = 9;
 }
 
 message PortDescription {

hyperstart/api/json/constants.go

@@ -29,6 +29,7 @@ const (
 	INIT_REMOVECONTAINER
 	INIT_PROCESSASYNCEVENT
 	INIT_SIGNALPROCESS
+	INIT_DELETEINTERFACE // 25
 )
 
 // "hyperstart" is the special container ID for adding processes.

hyperstart/api/json/spec.go

@@ -81,6 +81,7 @@ type NetworkInf struct {
 	Device    string `json:"device"`
 	IpAddress string `json:"ipAddress"`
 	NetMask   string `json:"netMask"`
+	Mtu       uint64 `json:"mtu"`
 }
 
 type Route struct {

hyperstart/libhyperstart/hyperstart.go

@@ -27,6 +27,7 @@ type Hyperstart interface {
 	WriteFile(container, path string, data []byte) error
 	ReadFile(container, path string) ([]byte, error)
 	AddRoute(r []hyperstartapi.Route) error
-	UpdateInterface(dev, ip, mask string) error
+	AddInterface(inf *hyperstartapi.NetworkInf) error
+	DeleteInterface(inf *hyperstartapi.NetworkInf) error
 	OnlineCpuMem() error
 }

hyperstart/libhyperstart/json.go

@@ -646,12 +646,12 @@ func (h *jsonBasedHyperstart) AddRoute(r []hyperstartapi.Route) error {
 	return h.hyperstartCommand(hyperstartapi.INIT_SETUPROUTE, hyperstartapi.Routes{Routes: r})
 }
 
-func (h *jsonBasedHyperstart) UpdateInterface(dev, ip, mask string) error {
-	return h.hyperstartCommand(hyperstartapi.INIT_SETUPINTERFACE, hyperstartapi.NetworkInf{
-		Device:    dev,
-		IpAddress: ip,
-		NetMask:   mask,
-	})
+func (h *jsonBasedHyperstart) AddInterface(inf *hyperstartapi.NetworkInf) error {
+	return h.hyperstartCommand(hyperstartapi.INIT_SETUPINTERFACE, inf)
+}
+
+func (h *jsonBasedHyperstart) DeleteInterface(inf *hyperstartapi.NetworkInf) error {
+	return h.hyperstartCommand(hyperstartapi.INIT_DELETEINTERFACE, inf)
 }
 
 func (h *jsonBasedHyperstart) TtyWinResize4242(container, process string, row, col uint16) error {

hypervisor/context.go

@@ -270,6 +270,27 @@ func (ctx *VmContext) RemoveInterface(id string, result chan api.Result) {
 	ctx.networks.removeInterface(id, result)
 }
 
+func (ctx *VmContext) AddIPAddr(id, ip string) error {
+	ctx.lock.Lock()
+	defer ctx.lock.Unlock()
+
+	return ctx.networks.AddIPAddr(id, ip)
+}
+
+func (ctx *VmContext) DeleteIPAddr(id, ip string) error {
+	ctx.lock.Lock()
+	defer ctx.lock.Unlock()
+
+	return ctx.networks.DeleteIPAddr(id, ip)
+}
+
+func (ctx *VmContext) UpdateMtu(id string, mtu uint64) error {
+	ctx.lock.Lock()
+	defer ctx.lock.Unlock()
+
+	return ctx.networks.UpdateMtu(id, mtu)
+}
+
 func (ctx *VmContext) validateContainer(c *api.ContainerDescription) error {
 	for vn, vr := range c.Volumes {
 		if _, ok := ctx.volumes[vn]; !ok {

hypervisor/driver.go

@@ -44,6 +44,7 @@ type GuestNicInfo struct {
 	Ipaddr  string
 	Index   int
 	Busaddr int
+	Mtu     uint64
 }
 
 type HypervisorDriver interface {

hypervisor/events.go

@@ -2,6 +2,8 @@ package hypervisor
 
 import (
 	"os"
+
+	"github.com/hyperhq/runv/api"
 )
 
 type VmEvent interface {
@@ -56,14 +58,15 @@ type InterfaceCreated struct {
 	Id         string //user specified in (ref api.InterfaceDescription: a user identifier of interface, user may use this to specify a nic, normally you can use IPAddr as an Id, however, in some driver (probably vbox?), user may not specify the IPAddr.)
 	Index      int
 	PCIAddr    int
+	Mtu        uint64
 	Fd         *os.File
 	Bridge     string
 	HostDevice string
 	DeviceName string
 	MacAddr    string
-	IpAddr     string
-	NetMask    string
+	IpAddr     []string
 	RouteTable []*RouteRule
+	Desc       *api.InterfaceDescription
 }
 
 type RouteRule struct {