diff --git a/README.md b/README.md index 542130c..02289a2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,46 @@ # RVPN Server +Branch: restructured +-------------------- +* restructure into various packages, removing items from package "main" +* used caddy source as a guide +* weird debugging issue introduced, will not halt, break point unverified. +* although a test project debugs just fin + +listener_client — the WSS client +- removed support for anything admin +- injected the domains from the claim +- domains are now included as initialDomains +- registration performans as normal but includes adding the domains to a map of domains, and a collection of domains on the connection. +- the system now supports look up fast in either direction, not sure if it will be needed. +- reads a chan during registration before allowing traffic, making sure all is well. +- registration returns a true on the channel if all is well. If it is not, false. Likely will add some text to pass back. + +Connection +- added support for boolean channel +- support for initial domains in a slice, these are brought back from the JWT as a interface and then are type asserted into the map +- removed all the old timer sender dwell stuff as a POC for traffic counts. + +ConnectionTable +- added support for domain announcement after the WSS is connection. Not sure if we will need these. They have not been implemented. +- I assume all domains are registered with JWT unless I hear differently which would require a new WSS session +- expanded NewTable constructor +- populating domains into the domain map, and into the connection slice. +- added support for removing domains when a connection is removed. + +Packer +- added support for a PackerHeader type and PackerData type +- these are connected in a Packer type +- support for calculated address family based on ip address property +- service field is set to "na" + +Logging +- unified package logging based on a package init. Will likely need to remove this + +Tests +- stared to structure project for tests. + + Build Instructions ------------------ diff --git a/rvpn/connection/connection_table.go b/rvpn/connection/connection_table.go index 13dca92..0b1449f 100755 --- a/rvpn/connection/connection_table.go +++ b/rvpn/connection/connection_table.go @@ -36,7 +36,7 @@ func (c *Table) Run() { select { case connection := <-c.register: loginfo.Println("register fired") - c.connections[connection] = make([]string, incrementDomains) + c.connections[connection] = make([]string, initialDomains) connection.commCh <- true // handle initial domain additions @@ -52,9 +52,6 @@ func (c *Table) Run() { c.connections[connection] = append(s, newDomain) } - fmt.Println(c.domains) - fmt.Println(c.connections) - loginfo.Println("register exiting") case connection := <-c.unregister: @@ -69,10 +66,6 @@ func (c *Table) Run() { delete(c.connections, connection) close(connection.send) - - fmt.Println(c.domains) - fmt.Println(c.connections) - } case domainMapping := <-c.domainAnnounce: @@ -85,6 +78,8 @@ func (c *Table) Run() { //} } + fmt.Println("domain ", c.domains) + fmt.Println("connections ", c.connections) } } diff --git a/rvpn/rvpn b/rvpn/rvpn deleted file mode 100755 index 64d3de4..0000000 Binary files a/rvpn/rvpn and /dev/null differ