moved connection manager to its own package

master
Jordan Orelli 12 years ago
parent a4f3b6f178
commit e9264923d0

@ -1,19 +1,17 @@
package main
package cm
import (
"net"
)
var manager = newConnectionManager()
type connectionManager struct {
type Manager struct {
active []net.Conn
connect chan net.Conn
disconnect chan net.Conn
}
func newConnectionManager() *connectionManager {
m := &connectionManager{
func New() *Manager {
m := &Manager{
active: make([]net.Conn, 0, 10),
connect: make(chan net.Conn),
disconnect: make(chan net.Conn),
@ -22,7 +20,7 @@ func newConnectionManager() *connectionManager {
return m
}
func (m *connectionManager) run() {
func (m *Manager) run() {
for {
select {
case conn := <-m.connect:
@ -33,15 +31,15 @@ func (m *connectionManager) run() {
}
}
func (m *connectionManager) Add(conn net.Conn) {
func (m *Manager) Add(conn net.Conn) {
m.connect <- conn
}
func (m *connectionManager) Remove(conn net.Conn) {
func (m *Manager) Remove(conn net.Conn) {
m.disconnect <- conn
}
func (m *connectionManager) removeConnection(conn net.Conn) {
func (m *Manager) removeConnection(conn net.Conn) {
for i, other := range m.active {
if conn.RemoteAddr() == other.RemoteAddr() {
m.active = append(m.active[:i], m.active[i+1:]...)

@ -1,12 +1,15 @@
package main
import (
"./cm"
"bufio"
"fmt"
"io"
"net"
)
var manager = cm.New()
func tcpInterpreter(conn net.Conn, userinput chan string, out chan interface{}, errors chan error) {
prompt := func() {
io.WriteString(conn, "> ")
@ -42,7 +45,7 @@ func runTCPServer() {
}
}
func startConnection(conn net.Conn, m *connectionManager) {
func startConnection(conn net.Conn, m *cm.Manager) {
m.Add(conn)
defer m.Remove(conn)

Loading…
Cancel
Save