add two getters

irc/gateways.go

@@ -67,9 +67,7 @@ func webircHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
 
 	clientAddress := utils.IPString(client.socket.conn.RemoteAddr())
 	clientHostname := client.hostname
-	server.configurableStateMutex.RLock()
+	for _, info := range server.WebIRCConfig() {
-	defer server.configurableStateMutex.RUnlock()
-	for _, info := range server.webirc {
 		for _, address := range info.Hosts {
 			if clientHostname == address || clientAddress == address {
 				// confirm password and/or fingerprint
@@ -101,9 +99,7 @@ func proxyHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
 
 	clientAddress := utils.IPString(client.socket.conn.RemoteAddr())
 	clientHostname := client.hostname
-	server.configurableStateMutex.RLock()
+	for _, address := range server.ProxyAllowedFrom() {
-	defer server.configurableStateMutex.RUnlock()
-	for _, address := range server.proxyAllowedFrom {
 		if clientHostname == address || clientAddress == address {
 			proxiedIP := msg.Params[1]
 

irc/getters.go

@@ -23,6 +23,18 @@ func (server *Server) getPassword() []byte {
 	return server.password
 }
 
+func (server *Server) ProxyAllowedFrom() []string {
+	server.configurableStateMutex.RLock()
+	defer server.configurableStateMutex.RUnlock()
+	return server.proxyAllowedFrom
+}
+
+func (server *Server) WebIRCConfig() []webircConfig {
+	server.configurableStateMutex.RLock()
+	defer server.configurableStateMutex.RUnlock()
+	return server.webirc
+}
+
 func (client *Client) getNick() string {
 	client.stateMutex.RLock()
 	defer client.stateMutex.RUnlock()