Mustafa Arici пре 7 година
родитељ
комит
e51f96374f
8 измењених фајлова са 38 додато и 38 уклоњено
  1. 6 6
      api/pb/auth.pb.go
  2. 11 11
      api/pb/network.pb.go
  3. 10 10
      api/pb/user.pb.go
  4. 8 8
      api/pb/vpn.pb.go
  5. 2 2
      bindata/bindata.go
  6. 1 1
      const.go
  7. 0 0
      template/bundle.js
  8. 0 0
      webui/ovpm/public/bundle.js

+ 6 - 6
api/pb/auth.pb.go

@@ -199,8 +199,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for AuthService service
-
+// AuthServiceClient is the client API for AuthService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type AuthServiceClient interface {
 	Status(ctx context.Context, in *AuthStatusRequest, opts ...grpc.CallOption) (*AuthStatusResponse, error)
 	Authenticate(ctx context.Context, in *AuthAuthenticateRequest, opts ...grpc.CallOption) (*AuthAuthenticateResponse, error)
@@ -216,7 +217,7 @@ func NewAuthServiceClient(cc *grpc.ClientConn) AuthServiceClient {
 
 func (c *authServiceClient) Status(ctx context.Context, in *AuthStatusRequest, opts ...grpc.CallOption) (*AuthStatusResponse, error) {
 	out := new(AuthStatusResponse)
-	err := grpc.Invoke(ctx, "/pb.AuthService/Status", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.AuthService/Status", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -225,15 +226,14 @@ func (c *authServiceClient) Status(ctx context.Context, in *AuthStatusRequest, o
 
 func (c *authServiceClient) Authenticate(ctx context.Context, in *AuthAuthenticateRequest, opts ...grpc.CallOption) (*AuthAuthenticateResponse, error) {
 	out := new(AuthAuthenticateResponse)
-	err := grpc.Invoke(ctx, "/pb.AuthService/Authenticate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.AuthService/Authenticate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for AuthService service
-
+// AuthServiceServer is the server API for AuthService service.
 type AuthServiceServer interface {
 	Status(context.Context, *AuthStatusRequest) (*AuthStatusResponse, error)
 	Authenticate(context.Context, *AuthAuthenticateRequest) (*AuthAuthenticateResponse, error)

+ 11 - 11
api/pb/network.pb.go

@@ -715,8 +715,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for NetworkService service
-
+// NetworkServiceClient is the client API for NetworkService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type NetworkServiceClient interface {
 	Create(ctx context.Context, in *NetworkCreateRequest, opts ...grpc.CallOption) (*NetworkCreateResponse, error)
 	List(ctx context.Context, in *NetworkListRequest, opts ...grpc.CallOption) (*NetworkListResponse, error)
@@ -737,7 +738,7 @@ func NewNetworkServiceClient(cc *grpc.ClientConn) NetworkServiceClient {
 
 func (c *networkServiceClient) Create(ctx context.Context, in *NetworkCreateRequest, opts ...grpc.CallOption) (*NetworkCreateResponse, error) {
 	out := new(NetworkCreateResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/Create", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/Create", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -746,7 +747,7 @@ func (c *networkServiceClient) Create(ctx context.Context, in *NetworkCreateRequ
 
 func (c *networkServiceClient) List(ctx context.Context, in *NetworkListRequest, opts ...grpc.CallOption) (*NetworkListResponse, error) {
 	out := new(NetworkListResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/List", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/List", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -755,7 +756,7 @@ func (c *networkServiceClient) List(ctx context.Context, in *NetworkListRequest,
 
 func (c *networkServiceClient) Delete(ctx context.Context, in *NetworkDeleteRequest, opts ...grpc.CallOption) (*NetworkDeleteResponse, error) {
 	out := new(NetworkDeleteResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/Delete", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/Delete", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -764,7 +765,7 @@ func (c *networkServiceClient) Delete(ctx context.Context, in *NetworkDeleteRequ
 
 func (c *networkServiceClient) GetAllTypes(ctx context.Context, in *NetworkGetAllTypesRequest, opts ...grpc.CallOption) (*NetworkGetAllTypesResponse, error) {
 	out := new(NetworkGetAllTypesResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/GetAllTypes", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/GetAllTypes", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -773,7 +774,7 @@ func (c *networkServiceClient) GetAllTypes(ctx context.Context, in *NetworkGetAl
 
 func (c *networkServiceClient) GetAssociatedUsers(ctx context.Context, in *NetworkGetAssociatedUsersRequest, opts ...grpc.CallOption) (*NetworkGetAssociatedUsersResponse, error) {
 	out := new(NetworkGetAssociatedUsersResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/GetAssociatedUsers", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/GetAssociatedUsers", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -782,7 +783,7 @@ func (c *networkServiceClient) GetAssociatedUsers(ctx context.Context, in *Netwo
 
 func (c *networkServiceClient) Associate(ctx context.Context, in *NetworkAssociateRequest, opts ...grpc.CallOption) (*NetworkAssociateResponse, error) {
 	out := new(NetworkAssociateResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/Associate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/Associate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -791,15 +792,14 @@ func (c *networkServiceClient) Associate(ctx context.Context, in *NetworkAssocia
 
 func (c *networkServiceClient) Dissociate(ctx context.Context, in *NetworkDissociateRequest, opts ...grpc.CallOption) (*NetworkDissociateResponse, error) {
 	out := new(NetworkDissociateResponse)
-	err := grpc.Invoke(ctx, "/pb.NetworkService/Dissociate", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.NetworkService/Dissociate", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for NetworkService service
-
+// NetworkServiceServer is the server API for NetworkService service.
 type NetworkServiceServer interface {
 	Create(context.Context, *NetworkCreateRequest) (*NetworkCreateResponse, error)
 	List(context.Context, *NetworkListRequest) (*NetworkListResponse, error)

+ 10 - 10
api/pb/user.pb.go

@@ -627,8 +627,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for UserService service
-
+// UserServiceClient is the client API for UserService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type UserServiceClient interface {
 	List(ctx context.Context, in *UserListRequest, opts ...grpc.CallOption) (*UserResponse, error)
 	Create(ctx context.Context, in *UserCreateRequest, opts ...grpc.CallOption) (*UserResponse, error)
@@ -648,7 +649,7 @@ func NewUserServiceClient(cc *grpc.ClientConn) UserServiceClient {
 
 func (c *userServiceClient) List(ctx context.Context, in *UserListRequest, opts ...grpc.CallOption) (*UserResponse, error) {
 	out := new(UserResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/List", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/List", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -657,7 +658,7 @@ func (c *userServiceClient) List(ctx context.Context, in *UserListRequest, opts
 
 func (c *userServiceClient) Create(ctx context.Context, in *UserCreateRequest, opts ...grpc.CallOption) (*UserResponse, error) {
 	out := new(UserResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/Create", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/Create", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -666,7 +667,7 @@ func (c *userServiceClient) Create(ctx context.Context, in *UserCreateRequest, o
 
 func (c *userServiceClient) Update(ctx context.Context, in *UserUpdateRequest, opts ...grpc.CallOption) (*UserResponse, error) {
 	out := new(UserResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/Update", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/Update", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -675,7 +676,7 @@ func (c *userServiceClient) Update(ctx context.Context, in *UserUpdateRequest, o
 
 func (c *userServiceClient) Delete(ctx context.Context, in *UserDeleteRequest, opts ...grpc.CallOption) (*UserResponse, error) {
 	out := new(UserResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/Delete", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/Delete", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -684,7 +685,7 @@ func (c *userServiceClient) Delete(ctx context.Context, in *UserDeleteRequest, o
 
 func (c *userServiceClient) Renew(ctx context.Context, in *UserRenewRequest, opts ...grpc.CallOption) (*UserResponse, error) {
 	out := new(UserResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/Renew", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/Renew", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -693,15 +694,14 @@ func (c *userServiceClient) Renew(ctx context.Context, in *UserRenewRequest, opt
 
 func (c *userServiceClient) GenConfig(ctx context.Context, in *UserGenConfigRequest, opts ...grpc.CallOption) (*UserGenConfigResponse, error) {
 	out := new(UserGenConfigResponse)
-	err := grpc.Invoke(ctx, "/pb.UserService/GenConfig", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.UserService/GenConfig", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for UserService service
-
+// UserServiceServer is the server API for UserService service.
 type UserServiceServer interface {
 	List(context.Context, *UserListRequest) (*UserResponse, error)
 	Create(context.Context, *UserCreateRequest) (*UserResponse, error)

+ 8 - 8
api/pb/vpn.pb.go

@@ -470,8 +470,9 @@ var _ grpc.ClientConn
 // is compatible with the grpc package it is being compiled against.
 const _ = grpc.SupportPackageIsVersion4
 
-// Client API for VPNService service
-
+// VPNServiceClient is the client API for VPNService service.
+//
+// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream.
 type VPNServiceClient interface {
 	Status(ctx context.Context, in *VPNStatusRequest, opts ...grpc.CallOption) (*VPNStatusResponse, error)
 	Init(ctx context.Context, in *VPNInitRequest, opts ...grpc.CallOption) (*VPNInitResponse, error)
@@ -489,7 +490,7 @@ func NewVPNServiceClient(cc *grpc.ClientConn) VPNServiceClient {
 
 func (c *vPNServiceClient) Status(ctx context.Context, in *VPNStatusRequest, opts ...grpc.CallOption) (*VPNStatusResponse, error) {
 	out := new(VPNStatusResponse)
-	err := grpc.Invoke(ctx, "/pb.VPNService/Status", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.VPNService/Status", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -498,7 +499,7 @@ func (c *vPNServiceClient) Status(ctx context.Context, in *VPNStatusRequest, opt
 
 func (c *vPNServiceClient) Init(ctx context.Context, in *VPNInitRequest, opts ...grpc.CallOption) (*VPNInitResponse, error) {
 	out := new(VPNInitResponse)
-	err := grpc.Invoke(ctx, "/pb.VPNService/Init", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.VPNService/Init", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -507,7 +508,7 @@ func (c *vPNServiceClient) Init(ctx context.Context, in *VPNInitRequest, opts ..
 
 func (c *vPNServiceClient) Update(ctx context.Context, in *VPNUpdateRequest, opts ...grpc.CallOption) (*VPNUpdateResponse, error) {
 	out := new(VPNUpdateResponse)
-	err := grpc.Invoke(ctx, "/pb.VPNService/Update", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.VPNService/Update", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -516,15 +517,14 @@ func (c *vPNServiceClient) Update(ctx context.Context, in *VPNUpdateRequest, opt
 
 func (c *vPNServiceClient) Restart(ctx context.Context, in *VPNRestartRequest, opts ...grpc.CallOption) (*VPNRestartResponse, error) {
 	out := new(VPNRestartResponse)
-	err := grpc.Invoke(ctx, "/pb.VPNService/Restart", in, out, c.cc, opts...)
+	err := c.cc.Invoke(ctx, "/pb.VPNService/Restart", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
 	return out, nil
 }
 
-// Server API for VPNService service
-
+// VPNServiceServer is the server API for VPNService service.
 type VPNServiceServer interface {
 	Status(context.Context, *VPNStatusRequest) (*VPNStatusResponse, error)
 	Init(context.Context, *VPNInitRequest) (*VPNInitResponse, error)

Разлика између датотеке није приказан због своје велике величине
+ 2 - 2
bindata/bindata.go


+ 1 - 1
const.go

@@ -2,7 +2,7 @@ package ovpm
 
 const (
 	// Version defines the version of ovpm.
-	Version = "0.2.7-beta"
+	Version = "0.2.7-beta-r3"
 
 	// DefaultVPNPort is the default OpenVPN port to listen.
 	DefaultVPNPort = "1197"

Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
template/bundle.js


Разлика између датотеке није приказан због своје велике величине
+ 0 - 0
webui/ovpm/public/bundle.js


Неке датотеке нису приказане због велике количине промена