Merge branch 'feat/static-route-21' into dev

Closes #21.

api/rpc.go

@@ -192,6 +192,7 @@ func (s *NetworkService) List(ctx context.Context, req *pb.NetworkListRequest) (
 			Type:                network.GetType().String(),
 			CreatedAt:           network.GetCreatedAt(),
 			AssociatedUsernames: network.GetAssociatedUsernames(),
+			Via:                 network.GetVia(),
 		})
 	}
 
@@ -200,7 +201,7 @@ func (s *NetworkService) List(ctx context.Context, req *pb.NetworkListRequest) (
 
 func (s *NetworkService) Create(ctx context.Context, req *pb.NetworkCreateRequest) (*pb.NetworkCreateResponse, error) {
 	logrus.Debugf("rpc call: network create: %s", req.Name)
-	network, err := ovpm.CreateNewNetwork(req.Name, req.CIDR, ovpm.NetworkTypeFromString(req.Type))
+	network, err := ovpm.CreateNewNetwork(req.Name, req.CIDR, ovpm.NetworkTypeFromString(req.Type), req.Via)
 	if err != nil {
 		return nil, err
 	}
@@ -211,6 +212,7 @@ func (s *NetworkService) Create(ctx context.Context, req *pb.NetworkCreateReques
 		Type:                network.GetType().String(),
 		CreatedAt:           network.GetCreatedAt(),
 		AssociatedUsernames: network.GetAssociatedUsernames(),
+		Via:                 network.GetVia(),
 	}
 
 	return &pb.NetworkCreateResponse{Network: &n}, nil
@@ -234,6 +236,7 @@ func (s *NetworkService) Delete(ctx context.Context, req *pb.NetworkDeleteReques
 		Type:                network.GetType().String(),
 		CreatedAt:           network.GetCreatedAt(),
 		AssociatedUsernames: network.GetAssociatedUsernames(),
+		Via:                 network.GetVia(),
 	}
 
 	return &pb.NetworkDeleteResponse{Network: &n}, nil

bindata/bindata.go

@@ -72,7 +72,7 @@ func (fi bindataFileInfo) Sys() interface{} {
 	return nil
 }
 
-var _templateCcdFileTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xca\x4c\x4b\xce\xcf\x4b\xcb\x4c\xd7\x2d\x28\x2d\xce\x50\xa8\xae\x56\xd0\xf3\x0c\x50\xa8\xad\x05\xb3\xfc\x52\x4b\x7c\x13\x8b\xb3\x15\x6a\x6b\xb9\x94\x33\x8b\xf2\x4b\x4b\x52\x15\x0c\x2d\x8d\xf4\x0c\xcd\x2c\xf4\x2c\x0d\xf4\x0c\x14\x8c\x4c\x4d\xf5\x60\xd8\x80\x0b\x10\x00\x00\xff\xff\xb7\x2b\x33\x90\x4a\x00\x00\x00")
+var _templateCcdFileTmpl = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xca\x4c\x4b\xce\xcf\x4b\xcb\x4c\xd7\x2d\x28\x2d\xce\x50\xa8\xae\x56\xd0\xf3\x0c\x50\xa8\xad\x05\xb3\xfc\x52\x4b\x7c\x13\x8b\xb3\x15\x6a\x6b\xb9\x94\x33\x8b\xf2\x4b\x4b\x52\x15\x0c\x2d\x8d\xf4\x0c\xcd\x2c\xf4\x2c\x0d\xf4\x0c\x14\x8c\x4c\x4d\xf5\x60\xd8\x80\xab\xba\xba\x28\x31\x2f\x3d\x55\x41\x2f\x08\xa4\xb2\xb8\xb6\x96\x0b\x6c\xa4\x12\x44\x63\x75\x75\x66\x5e\x4a\x6a\x85\x82\x9e\x82\x01\xd8\x74\x18\xcf\x10\x85\x67\x54\x5b\xab\xc4\x55\x5d\xad\x90\x9a\x97\x02\xb2\x15\x10\x00\x00\xff\xff\x2e\xb5\xed\x50\x9d\x00\x00\x00")
 
 func templateCcdFileTmplBytes() ([]byte, error) {
 	return bindataRead(
@@ -87,7 +87,7 @@ func templateCcdFileTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 74, mode: os.FileMode(420), modTime: time.Unix(1503755947, 0)}
+	info := bindataFileInfo{name: "template/ccd.file.tmpl", size: 157, mode: os.FileMode(420), modTime: time.Unix(1503785209, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -107,7 +107,7 @@ func templateClientOvpnTmpl() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 355, mode: os.FileMode(420), modTime: time.Unix(1503760948, 0)}
+	info := bindataFileInfo{name: "template/client.ovpn.tmpl", size: 355, mode: os.FileMode(420), modTime: time.Unix(1503776353, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

cmd/ovpm/net.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	"github.com/Sirupsen/logrus"
+	"github.com/asaskevich/govalidator"
 	"github.com/cad/ovpm"
 	"github.com/cad/ovpm/pb"
 	"github.com/olekukonko/tablewriter"
@@ -29,19 +30,41 @@ var netDefineCommand = cli.Command{
 			Name:  "type, t",
 			Usage: "type of the network (see $ovpm net types)",
 		},
+		cli.StringFlag{
+			Name:  "via, v",
+			Usage: "if network type is route, via represents route's gateway",
+		},
 	},
 	Action: func(c *cli.Context) error {
 		action = "net:create"
 		name := c.String("name")
 		cidr := c.String("cidr")
 		typ := c.String("type")
+		via := c.String("via")
 
 		if name == "" || cidr == "" || typ == "" {
 			fmt.Println(cli.ShowSubcommandHelp(c))
 			os.Exit(1)
 		}
 
-		if ovpm.NetworkTypeFromString(typ) == ovpm.UNDEFINEDNET {
+		switch ovpm.NetworkTypeFromString(typ) {
+		case ovpm.ROUTE:
+			if via != "" && !govalidator.IsCIDR(via) {
+				fmt.Printf("validation error: `%s` must be a network in the CIDR form", via)
+				fmt.Println()
+				fmt.Println(cli.ShowSubcommandHelp(c))
+				os.Exit(1)
+			} else {
+				via = ""
+			}
+		case ovpm.SERVERNET:
+			if via != "" {
+				fmt.Println("--via flag can only be used with --type ROUTE")
+				fmt.Println()
+				fmt.Println(cli.ShowSubcommandHelp(c))
+				os.Exit(1)
+			}
+		default: // Means UNDEFINEDNET
 			fmt.Printf("undefined network type %s", typ)
 			fmt.Println()
 			fmt.Println("Network Types:")
@@ -55,7 +78,7 @@ var netDefineCommand = cli.Command{
 		defer conn.Close()
 		netSvc := pb.NewNetworkServiceClient(conn)
 
-		response, err := netSvc.Create(context.Background(), &pb.NetworkCreateRequest{Name: name, CIDR: cidr, Type: typ})
+		response, err := netSvc.Create(context.Background(), &pb.NetworkCreateRequest{Name: name, CIDR: cidr, Type: typ, Via: via})
 		if err != nil {
 			logrus.Errorf("network can not be created '%s': %v", name, err)
 			os.Exit(1)
@@ -86,6 +109,7 @@ var netListCommand = cli.Command{
 		table.SetHeader([]string{"#", "name", "cidr", "type", "assoc", "created at"})
 		//table.SetBorder(false)
 		for i, network := range resp.Networks {
+			// Create associated user list for this network.
 			var usernameList string
 			usernames := network.GetAssociatedUsernames()
 			count := len(usernames)
@@ -96,8 +120,15 @@ var netListCommand = cli.Command{
 					usernameList = usernameList + fmt.Sprintf("%s, ", uname)
 				}
 			}
-
-			data := []string{fmt.Sprintf("%v", i+1), network.Name, network.CIDR, network.Type, usernameList, network.CreatedAt}
+			var cidr = network.CIDR
+			var via = network.Via
+			if via == "" {
+				via = "vpn-server"
+			}
+			if ovpm.NetworkTypeFromString(network.Type) == ovpm.ROUTE {
+				cidr = fmt.Sprintf("%s via %s", network.CIDR, via)
+			}
+			data := []string{fmt.Sprintf("%v", i+1), network.Name, cidr, network.Type, usernameList, network.CreatedAt}
 			table.Append(data)
 		}
 		table.Render()

net.go

@@ -2,6 +2,7 @@ package ovpm
 
 import (
 	"encoding/binary"
+	"errors"
 	"fmt"
 	"log"
 	"net"
@@ -70,6 +71,7 @@ type DBNetwork struct {
 	Name  string `gorm:"unique_index"`
 	CIDR  string
 	Type  NetworkType
+	Via   string
 	Users []*DBUser `gorm:"many2many:network_users;"`
 }
 
@@ -105,7 +107,7 @@ func GetAllNetworks() []*DBNetwork {
 }
 
 // CreateNewNetwork creates a new network definition in the system.
-func CreateNewNetwork(name, cidr string, nettype NetworkType) (*DBNetwork, error) {
+func CreateNewNetwork(name, cidr string, nettype NetworkType, via string) (*DBNetwork, error) {
 	if !IsInitialized() {
 		return nil, fmt.Errorf("you first need to create server")
 	}
@@ -121,6 +123,10 @@ func CreateNewNetwork(name, cidr string, nettype NetworkType) (*DBNetwork, error
 		return nil, fmt.Errorf("validation error: `%s` must be a network in the CIDR form", cidr)
 	}
 
+	if !govalidator.IsCIDR(via) && via != "" {
+		return nil, fmt.Errorf("validation error: `%s` must be a network in the CIDR form", via)
+	}
+
 	if nettype == UNDEFINEDNET {
 		return nil, fmt.Errorf("validation error: `%s` must be a valid network type", nettype)
 	}
@@ -130,11 +136,24 @@ func CreateNewNetwork(name, cidr string, nettype NetworkType) (*DBNetwork, error
 		return nil, fmt.Errorf("can not parse CIDR %s: %v", cidr, err)
 	}
 
+	// Overwrite via with the parsed CIDR string.
+	if nettype == ROUTE && via != "" {
+		_, viaNet, err := net.ParseCIDR(via)
+		if err != nil {
+			return nil, fmt.Errorf("can not parse CIDR %s: %v", via, err)
+		}
+		via = viaNet.String()
+
+	} else {
+		via = ""
+	}
+
 	network := DBNetwork{
 		Name:  name,
 		CIDR:  ipnet.String(),
 		Type:  nettype,
 		Users: []*DBUser{},
+		Via:   via,
 	}
 	db.Save(&network)
 
@@ -261,6 +280,11 @@ func (n *DBNetwork) GetAssociatedUsernames() []string {
 	return usernames
 }
 
+// GetVia returns network' via.
+func (n *DBNetwork) GetVia() string {
+	return n.Via
+}
+
 // interfaceOfIP returns a network interface that has the given IP.
 func interfaceOfIP(ipnet *net.IPNet) *net.Interface {
 	ifaces, err := net.Interfaces()
@@ -478,3 +502,20 @@ func IP2HostID(ip net.IP) uint32 {
 	hostid := binary.BigEndian.Uint32(ip)
 	return hostid
 }
+
+// IncrementIP will return next ip address within the network.
+func IncrementIP(ip, mask string) (string, error) {
+	ipAddr := net.ParseIP(ip).To4()
+	netMask := net.IPMask(net.ParseIP(mask).To4())
+	ipNet := net.IPNet{IP: ipAddr, Mask: netMask}
+	for i := len(ipAddr) - 1; i >= 0; i-- {
+		ipAddr[i]++
+		if ip[i] != 0 {
+			break
+		}
+	}
+	if !ipNet.Contains(ipAddr) {
+		return ip, errors.New("overflowed CIDR while incrementing IP")
+	}
+	return ipAddr.String(), nil
+}

net_test.go

@@ -17,7 +17,7 @@ func TestVPNCreateNewNetwork(t *testing.T) {
 	cidrStr := "192.168.1.0/24"
 	netType := SERVERNET
 
-	n, err := CreateNewNetwork(netName, cidrStr, netType)
+	n, err := CreateNewNetwork(netName, cidrStr, netType, "")
 	if err != nil {
 		t.Fatalf("unexpected error when creating a new network: %v", err)
 	}
@@ -64,7 +64,7 @@ func TestVPNDeleteNetwork(t *testing.T) {
 	cidrStr := "192.168.1.0/24"
 	netType := SERVERNET
 
-	n, err := CreateNewNetwork(netName, cidrStr, netType)
+	n, err := CreateNewNetwork(netName, cidrStr, netType, "")
 	if err != nil {
 		t.Fatalf("unexpected error when creating a new network: %v", err)
 	}
@@ -102,7 +102,7 @@ func TestVPNGetNetwork(t *testing.T) {
 	cidrStr := "192.168.1.0/24"
 	netType := SERVERNET
 
-	_, err := CreateNewNetwork(netName, cidrStr, netType)
+	_, err := CreateNewNetwork(netName, cidrStr, netType, "")
 	if err != nil {
 		t.Fatalf("unexpected error when creating a new network: %v", err)
 	}
@@ -144,7 +144,7 @@ func TestVPNGetAllNetworks(t *testing.T) {
 		{"testnet3", "asdkfjadflsa", SERVERNET, false},
 	}
 	for _, tt := range getallnettests {
-		_, err := CreateNewNetwork(tt.name, tt.cidr, tt.netType)
+		_, err := CreateNewNetwork(tt.name, tt.cidr, tt.netType, "")
 		if (err == nil) != tt.passing {
 			t.Fatalf("unexpected error when creating a new network: %v", err)
 		}
@@ -185,7 +185,7 @@ func TestNetAssociate(t *testing.T) {
 	userName := "testUser2"
 	user, _ := CreateNewUser(userName, "123", false, 0)
 
-	n, _ := CreateNewNetwork(netName, cidrStr, netType)
+	n, _ := CreateNewNetwork(netName, cidrStr, netType, "")
 	err := n.Associate(user.Username)
 	if err != nil {
 		t.Fatal(err)
@@ -220,7 +220,7 @@ func TestNetDissociate(t *testing.T) {
 	userName := "testUser2"
 	user, _ := CreateNewUser(userName, "123", false, 0)
 
-	n, _ := CreateNewNetwork(netName, cidrStr, netType)
+	n, _ := CreateNewNetwork(netName, cidrStr, netType, "")
 	n.Associate(user.Username)
 
 	n = nil
@@ -264,7 +264,7 @@ func TestNetGetAssociatedUsers(t *testing.T) {
 	userName := "testUser2"
 	user, _ := CreateNewUser(userName, "123", false, 0)
 
-	n, _ := CreateNewNetwork(netName, cidrStr, netType)
+	n, _ := CreateNewNetwork(netName, cidrStr, netType, "")
 	n.Associate(user.Username)
 	n = nil
 	n, _ = GetNetwork(netName)

pb/network.pb.go

@@ -21,6 +21,7 @@ type NetworkCreateRequest struct {
 	Name string `protobuf:"bytes,1,opt,name=Name" json:"Name,omitempty"`
 	CIDR string `protobuf:"bytes,2,opt,name=CIDR" json:"CIDR,omitempty"`
 	Type string `protobuf:"bytes,3,opt,name=Type" json:"Type,omitempty"`
+	Via  string `protobuf:"bytes,4,opt,name=Via" json:"Via,omitempty"`
 }
 
 func (m *NetworkCreateRequest) Reset()                    { *m = NetworkCreateRequest{} }
@@ -49,6 +50,13 @@ func (m *NetworkCreateRequest) GetType() string {
 	return ""
 }
 
+func (m *NetworkCreateRequest) GetVia() string {
+	if m != nil {
+		return m.Via
+	}
+	return ""
+}
+
 type NetworkListRequest struct {
 }
 
@@ -135,6 +143,7 @@ type Network struct {
 	Type                string   `protobuf:"bytes,3,opt,name=Type" json:"Type,omitempty"`
 	CreatedAt           string   `protobuf:"bytes,4,opt,name=CreatedAt" json:"CreatedAt,omitempty"`
 	AssociatedUsernames []string `protobuf:"bytes,5,rep,name=AssociatedUsernames" json:"AssociatedUsernames,omitempty"`
+	Via                 string   `protobuf:"bytes,6,opt,name=Via" json:"Via,omitempty"`
 }
 
 func (m *Network) Reset()                    { *m = Network{} }
@@ -177,6 +186,13 @@ func (m *Network) GetAssociatedUsernames() []string {
 	return nil
 }
 
+func (m *Network) GetVia() string {
+	if m != nil {
+		return m.Via
+	}
+	return ""
+}
+
 type NetworkCreateResponse struct {
 	Network *Network `protobuf:"bytes,1,opt,name=Network" json:"Network,omitempty"`
 }
@@ -513,32 +529,33 @@ var _NetworkService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("network.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 429 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x4e, 0xf2, 0x40,
-	0x14, 0xa5, 0x14, 0xf8, 0xe8, 0x25, 0x9f, 0x8b, 0x01, 0x65, 0x18, 0xc0, 0x90, 0x49, 0x8c, 0xc4,
-	0x05, 0x31, 0xb8, 0x72, 0x03, 0x21, 0x90, 0x28, 0x6a, 0x58, 0x54, 0x7d, 0x00, 0x7e, 0x66, 0xd1,
-	0x88, 0xb4, 0x76, 0xaa, 0xc6, 0x07, 0xf1, 0x4d, 0x7c, 0x40, 0xd3, 0xce, 0x74, 0x98, 0x42, 0xd1,
-	0x18, 0x76, 0xd3, 0x73, 0xee, 0x9c, 0x73, 0x39, 0x77, 0x2e, 0xf0, 0x7f, 0xc5, 0x82, 0x77, 0xd7,
-	0x7f, 0xea, 0x78, 0xbe, 0x1b, 0xb8, 0x28, 0xeb, 0xcd, 0xa8, 0x0d, 0x95, 0x89, 0x00, 0x87, 0x3e,
-	0x9b, 0x06, 0xcc, 0x66, 0x2f, 0xaf, 0x8c, 0x07, 0x08, 0x41, 0x6e, 0x32, 0x7d, 0x66, 0xd8, 0x68,
-	0x19, 0x6d, 0xcb, 0x8e, 0xce, 0x21, 0x36, 0x1c, 0x8f, 0x6c, 0x9c, 0x15, 0x58, 0x78, 0x0e, 0xb1,
-	0x87, 0x0f, 0x8f, 0x61, 0x53, 0x60, 0xe1, 0x99, 0x56, 0x00, 0x49, 0xcd, 0x3b, 0x87, 0x07, 0x52,
-	0x91, 0x9e, 0x29, 0xa7, 0x11, 0x5b, 0xb2, 0x1f, 0x9d, 0x68, 0x1d, 0x6a, 0xb2, 0xf6, 0x8a, 0x05,
-	0x83, 0xe5, 0x32, 0x94, 0xe5, 0xb1, 0xd0, 0x18, 0xaa, 0x92, 0x1c, 0x70, 0xee, 0xce, 0x9d, 0x5f,
-	0xba, 0x26, 0x50, 0x7c, 0xe4, 0xcc, 0x5f, 0x85, 0xb8, 0xe8, 0x5c, 0x7d, 0xd3, 0x1b, 0xc0, 0x71,
-	0x4f, 0xce, 0xbe, 0x5a, 0x9f, 0x06, 0xfc, 0x93, 0x62, 0xfb, 0xa4, 0x87, 0x1a, 0x60, 0x89, 0x51,
-	0x2c, 0x06, 0x01, 0xce, 0x45, 0xc4, 0x1a, 0x40, 0xe7, 0x50, 0x56, 0xbf, 0x7a, 0x11, 0x7b, 0x73,
-	0x9c, 0x6f, 0x99, 0x6d, 0xcb, 0x4e, 0xa3, 0x68, 0x0f, 0x0e, 0x37, 0x26, 0xcc, 0x3d, 0x77, 0xc5,
-	0x19, 0x3a, 0x51, 0xfd, 0x46, 0x7d, 0x96, 0xba, 0xa5, 0x8e, 0x37, 0xeb, 0x48, 0xc8, 0x8e, 0x39,
-	0xda, 0x83, 0x72, 0x62, 0x9a, 0xf2, 0xf6, 0x29, 0x14, 0x25, 0xcc, 0xb1, 0xd1, 0x32, 0x37, 0xaf,
-	0x2b, 0x52, 0xf3, 0x8f, 0xe7, 0xfe, 0x37, 0xff, 0x2e, 0x90, 0xb4, 0xb7, 0x20, 0x45, 0x2a, 0x90,
-	0x8f, 0x80, 0xa8, 0x07, 0xcb, 0x16, 0x1f, 0x94, 0xa8, 0xb9, 0x6a, 0x4f, 0x44, 0xdc, 0xd0, 0xde,
-	0x96, 0x3e, 0x73, 0x41, 0x76, 0xbf, 0x4c, 0x38, 0x90, 0xec, 0x3d, 0xf3, 0xdf, 0x9c, 0x39, 0x43,
-	0x7d, 0x28, 0x88, 0xe0, 0x10, 0xd6, 0xfa, 0x4b, 0x6c, 0x0b, 0xa9, 0xa5, 0x30, 0xd2, 0x2e, 0x83,
-	0x2e, 0x21, 0x17, 0x26, 0x87, 0x8e, 0xb4, 0x22, 0x6d, 0x31, 0x48, 0x75, 0x0b, 0x57, 0x57, 0xfb,
-	0x50, 0x10, 0xa1, 0x25, 0xbc, 0x13, 0xfb, 0x93, 0xf0, 0x4e, 0x26, 0x4c, 0x33, 0x68, 0x02, 0x25,
-	0x2d, 0x35, 0xd4, 0xd4, 0x6a, 0xb7, 0x37, 0x8b, 0x1c, 0xef, 0xa2, 0x95, 0xde, 0x35, 0x58, 0x2a,
-	0x51, 0x54, 0xd7, 0xca, 0x37, 0x57, 0x91, 0x34, 0xd2, 0x49, 0xa5, 0x74, 0x0b, 0xb0, 0xce, 0x1f,
-	0xe9, 0xd5, 0x5b, 0xab, 0x48, 0x9a, 0x3b, 0xd8, 0x58, 0x6c, 0x56, 0x88, 0xfe, 0xd0, 0x2e, 0xbe,
-	0x03, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x4a, 0x6c, 0x70, 0xe1, 0x04, 0x00, 0x00,
+	// 447 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x5d, 0x6f, 0xda, 0x30,
+	0x14, 0x25, 0x04, 0x32, 0x72, 0xd1, 0xa6, 0xc9, 0xb0, 0x61, 0x0c, 0x4c, 0xc8, 0xd2, 0x34, 0xb4,
+	0x07, 0x34, 0xb1, 0xa7, 0xbd, 0x80, 0x10, 0x48, 0x1b, 0xdb, 0xc4, 0x43, 0xfa, 0xf1, 0xce, 0x87,
+	0x1f, 0xa2, 0x52, 0x92, 0xc6, 0x69, 0xab, 0xfe, 0xa2, 0xfe, 0x81, 0xfe, 0xc0, 0xca, 0xb1, 0x63,
+	0x1c, 0x08, 0xad, 0x2a, 0xde, 0x9c, 0x73, 0xae, 0xef, 0xf1, 0x3d, 0xf7, 0xde, 0xc0, 0xfb, 0x2d,
+	0x8b, 0xef, 0x83, 0xe8, 0xaa, 0x1f, 0x46, 0x41, 0x1c, 0xa0, 0x62, 0xb8, 0xa4, 0x6b, 0xa8, 0xcf,
+	0x25, 0x38, 0x89, 0xd8, 0x22, 0x66, 0x1e, 0xbb, 0xb9, 0x65, 0x3c, 0x46, 0x08, 0x4a, 0xf3, 0xc5,
+	0x35, 0xc3, 0x56, 0xd7, 0xea, 0xb9, 0x5e, 0x72, 0x16, 0xd8, 0x64, 0x36, 0xf5, 0x70, 0x51, 0x62,
+	0xe2, 0x2c, 0xb0, 0xf3, 0x87, 0x90, 0x61, 0x5b, 0x62, 0xe2, 0x8c, 0x3e, 0x82, 0x7d, 0xe9, 0x2f,
+	0x70, 0x29, 0x81, 0xc4, 0x91, 0xd6, 0x01, 0x29, 0x95, 0xff, 0x3e, 0x8f, 0x95, 0x06, 0xfd, 0xae,
+	0xb5, 0xa7, 0x6c, 0xc3, 0x5e, 0xd4, 0xa6, 0x2d, 0x68, 0xaa, 0xd8, 0xdf, 0x2c, 0x1e, 0x6f, 0x36,
+	0x42, 0x88, 0xa7, 0x89, 0x66, 0xd0, 0x50, 0xe4, 0x98, 0xf3, 0x60, 0xe5, 0xbf, 0x52, 0x07, 0x81,
+	0xca, 0x05, 0x67, 0xd1, 0x56, 0xe0, 0xb2, 0x16, 0xfd, 0x4d, 0xff, 0x02, 0x4e, 0xdf, 0xe4, 0x9f,
+	0x9a, 0xeb, 0xd1, 0x82, 0x77, 0x2a, 0xd9, 0x49, 0x7e, 0xb6, 0xc1, 0x95, 0xcd, 0x59, 0x8f, 0x63,
+	0xe5, 0xea, 0x0e, 0x40, 0x3f, 0xa0, 0xa6, 0xab, 0x5e, 0xa7, 0xda, 0x1c, 0x97, 0xbb, 0x76, 0xcf,
+	0xf5, 0xf2, 0xa8, 0xb4, 0x3f, 0xce, 0xae, 0x3f, 0x43, 0xf8, 0xb4, 0x37, 0x05, 0x3c, 0x0c, 0xb6,
+	0x9c, 0xa1, 0xaf, 0xba, 0x82, 0xe4, 0xe5, 0xd5, 0x41, 0xb5, 0x1f, 0x2e, 0xfb, 0x0a, 0xf2, 0x52,
+	0x8e, 0x0e, 0xa1, 0x96, 0xe9, 0xaf, 0xba, 0xfd, 0x0d, 0x2a, 0x0a, 0xe6, 0xd8, 0xea, 0xda, 0xfb,
+	0xd7, 0x35, 0x69, 0xe8, 0xa7, 0x93, 0xf0, 0x36, 0xfd, 0x01, 0x90, 0xbc, 0xe9, 0x50, 0x49, 0xea,
+	0x50, 0x4e, 0x80, 0xe4, 0x0d, 0xae, 0x27, 0x3f, 0x28, 0xd1, 0x9d, 0x36, 0x86, 0x46, 0xde, 0x30,
+	0xa6, 0xcd, 0x9c, 0x02, 0x49, 0x0e, 0x9e, 0x6c, 0xf8, 0xa0, 0xd8, 0x33, 0x16, 0xdd, 0xf9, 0x2b,
+	0x86, 0x46, 0xe0, 0x48, 0xe3, 0x10, 0x36, 0xde, 0x97, 0xd9, 0x28, 0xd2, 0xcc, 0x61, 0x94, 0x5c,
+	0x01, 0xfd, 0x82, 0x92, 0x70, 0x0e, 0x7d, 0x36, 0x82, 0x8c, 0x55, 0x21, 0x8d, 0x03, 0x5c, 0x5f,
+	0x1d, 0x81, 0x23, 0x4d, 0xcb, 0x68, 0x67, 0x36, 0x2a, 0xa3, 0x9d, 0x75, 0x98, 0x16, 0xd0, 0x1c,
+	0xaa, 0x86, 0x6b, 0xa8, 0x63, 0xc4, 0x1e, 0xee, 0x1a, 0xf9, 0x72, 0x8c, 0xd6, 0xf9, 0xfe, 0x80,
+	0xab, 0x1d, 0x45, 0x2d, 0x23, 0x7c, 0x7f, 0x39, 0x49, 0x3b, 0x9f, 0xd4, 0x99, 0xfe, 0x01, 0xec,
+	0xfc, 0x47, 0x66, 0xf4, 0xc1, 0x72, 0x92, 0xce, 0x11, 0x36, 0x4d, 0xb6, 0x74, 0x92, 0x9f, 0xde,
+	0xcf, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xb3, 0x16, 0xc9, 0x05, 0x05, 0x00, 0x00,
 }

pb/network.proto

@@ -6,6 +6,7 @@ message NetworkCreateRequest {
   string Name = 1;
   string CIDR = 2;
   string Type = 3;
+  string Via = 4;
 }
 message NetworkListRequest {}
 message NetworkDeleteRequest {
@@ -34,6 +35,7 @@ message Network {
   string Type = 3;
   string CreatedAt = 4;
   repeated string AssociatedUsernames = 5;
+  string Via = 6;
 }
 message NetworkCreateResponse {
   Network Network = 1;

template/ccd.file.tmpl

@@ -1,2 +1,5 @@
 ifconfig-push {{ .IP }} {{ .NetMask }}
 #iroute 192.168.90.0 255.255.255.0
+{{range .Routes}}
+push "route {{index . 0}} {{index . 1}} {{index . 2}}"
+{{ end }}

vpn.go

@@ -480,6 +480,8 @@ func emitCCD() error {
 	if err != nil {
 		return err
 	}
+
+	// Filesystem related stuff. Skipping when testing.
 	if !Testing {
 		// Clean and then create and write rendered ccd data.
 		err = os.RemoveAll(_DefaultVPNCCDPath)
@@ -500,12 +502,40 @@ func emitCCD() error {
 			}
 		}
 	}
+	// Render ccd templates for the users.
 	for _, user := range users {
+		var associatedRoutes [][3]string
+		for _, network := range GetAllNetworks() {
+			switch network.Type {
+			case ROUTE:
+				for _, assocUsername := range network.GetAssociatedUsernames() {
+					if assocUsername == user.Username {
+						via := network.Via
+						if via == "" {
+							server, err := GetServerInstance()
+							if err != nil {
+								return err
+							}
+							via, err = IncrementIP(server.Net, server.Mask)
+							if err != nil {
+								return err
+							}
+						}
+						ip, mask, err := net.ParseCIDR(network.CIDR)
+						if err != nil {
+							return err
+						}
+						associatedRoutes = append(associatedRoutes, [3]string{ip.To4().String(), net.IP(mask.Mask).To4().String(), via})
+					}
+				}
+			}
+		}
 		var result bytes.Buffer
 		params := struct {
 			IP      string
 			NetMask string
-		}{IP: user.getIP().String(), NetMask: _DefaultServerNetMask}
+			Routes  [][3]string // [0] is IP, [1] is Netmask, [2] is Via
+		}{IP: user.getIP().String(), NetMask: _DefaultServerNetMask, Routes: associatedRoutes}
 
 		data, err := bindata.Asset("template/ccd.file.tmpl")
 		if err != nil {
@@ -591,10 +621,9 @@ func emitIptables() error {
 				// get destination network's iface
 				iface := interfaceOfIP(networkIPNet)
 				if iface == nil {
-					return fmt.Errorf("cant find interface for %s", networkIPNet.String())
+					logrus.Warnf("network doesn't exist on server %s[SERVERNET]: cant find interface for %s", network.Name, networkIPNet.String())
+					return nil
 				}
-				logrus.Debugf("emitIptables: net(%s) iface name '%s'", network.Name, iface.Name)
-				logrus.Debugf("emitIptables: user '%s' ip addr '%s'", user.GetUsername(), userIP.String())
 				// enable nat for the user to the destination network n
 				if found {
 					err = ipt.AppendUnique("nat", "POSTROUTING", "-s", userIP.String(), "-o", iface.Name, "-j", "MASQUERADE")