Renaming to server.

rvpn/genericlistener/api_collect_connections.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //ConnectionStatsAPI --
 type ConnectionStatsAPI struct {

rvpn/genericlistener/api_collect_domains.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //DomainsAPI -- A collections of all the domains
 //List of Domains -> DomainAPI

rvpn/genericlistener/api_collect_server.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import "time"
 

rvpn/genericlistener/api_collect_server_domains.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //ServerDomainsAPI -- Structure to support the server API
 type ServerDomainsAPI struct {

rvpn/genericlistener/api_collect_servers.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import "time"
 

rvpn/genericlistener/api_collect_status.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"time"

rvpn/genericlistener/api_collect_status_dead time.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //StatusDeadTimeAPI -- structure for deadtime configuration
 type StatusDeadTimeAPI struct {

rvpn/genericlistener/api_collect_status_traffic.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //TrafficStats --
 type TrafficAPI struct {

rvpn/genericlistener/api_interface.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"

rvpn/genericlistener/conn_tracking.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"

rvpn/genericlistener/conn_wedge.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"bufio"

rvpn/genericlistener/connection.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"

rvpn/genericlistener/connection_registration.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"github.com/gorilla/websocket"

rvpn/genericlistener/connection_table.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"

rvpn/genericlistener/domain_loadbalance.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"fmt"

rvpn/genericlistener/domain_mapping.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //DomainMapping --
 type DomainMapping struct {

rvpn/genericlistener/domain_track.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //DomainTrack -- Tracking specifics for domains
 type DomainTrack struct {

rvpn/genericlistener/listener_generic.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"bufio"

rvpn/genericlistener/manager.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"
@@ -43,8 +43,8 @@ func NewListenerRegistration(port int) (p *ListenerRegistration) {
 	return
 }
 
-//GenericListeners -
+//servers -
-type GenericListeners struct {
+type servers struct {
 	listeners          map[*net.Listener]int
 	ctx                context.Context
 	connnectionTable   *Table
@@ -52,7 +52,7 @@ type GenericListeners struct {
 	secretKey          string
 	certbundle         tls.Certificate
 	register           chan *ListenerRegistration
-	genericListeners   *GenericListeners
+	servers   *servers
 	wssHostName        string
 	adminHostName      string
 	cancelCheck        int
@@ -61,8 +61,8 @@ type GenericListeners struct {
 }
 
 //NewGenerListeners --
-func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Certificate, serverStatus *Status) (p *GenericListeners) {
+func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Certificate, serverStatus *Status) (p *servers) {
-	p = new(GenericListeners)
+	p = new(servers)
 	p.listeners = make(map[*net.Listener]int)
 	p.ctx = ctx
 	p.connnectionTable = serverStatus.ConnectionTable
@@ -81,7 +81,7 @@ func NewGenerListeners(ctx context.Context, secretKey string, certbundle tls.Cer
 //Run -- Execute
 // - execute the GenericLister
 // - pass initial port, we'll announce that
-func (gl *GenericListeners) Run(ctx context.Context, initialPort int) {
+func (gl *servers) Run(ctx context.Context, initialPort int) {
 	loginfo.Println("ConnectionTable starting")
 
 	config := &tls.Config{Certificates: []tls.Certificate{gl.certbundle}}

rvpn/genericlistener/one_conn.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"io"

rvpn/genericlistener/send_track.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //SendTrack -- Used as a channel communication to id domain asssociated to domain for outbound WSS
 type SendTrack struct {

rvpn/genericlistener/setup.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"io"
@@ -15,8 +15,8 @@ var (
 )
 
 func init() {
-	loginfo = log.New(os.Stdout, "INFO: genericlistener: ", logFlags)
+	loginfo = log.New(os.Stdout, "INFO: server: ", logFlags)
-	logdebug = log.New(os.Stdout, "DEBUG: genericlistener:", logFlags)
+	logdebug = log.New(os.Stdout, "DEBUG: server:", logFlags)
 	connectionID = 0
 }
 

rvpn/genericlistener/status.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"context"
@@ -15,7 +15,7 @@ type Status struct {
 	DeadTime                 *StatusDeadTime
 	ConnectionTracking       *Tracking
 	ConnectionTable          *Table
-	GenericListeners         *GenericListeners
+	servers         *servers
 	LoadbalanceDefaultMethod string
 	AdminStats               *TrafficStats
 	AdminReqTyoe             *AdminReqType

rvpn/genericlistener/status_dead_time.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //StatusDeadTime -- structure for deadtime configuration
 type StatusDeadTime struct {

rvpn/genericlistener/status_req_type.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import "sync"
 

rvpn/genericlistener/status_traffic_connections.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //ConnectionStats --
 type ConnectionStats struct {

rvpn/genericlistener/status_traffic_stats.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 //TrafficStats --
 type TrafficStats struct {

rvpn/genericlistener/tls_get_hello.go

@@ -1,4 +1,4 @@
-package genericlistener
+package server
 
 import (
 	"errors"