Browse Source

add two getters

tags/v0.10.0
Shivaram Lingamneni 6 years ago
parent
commit
7ccb485b50
2 changed files with 14 additions and 6 deletions
  1. 2
    6
      irc/gateways.go
  2. 12
    0
      irc/getters.go

+ 2
- 6
irc/gateways.go View File

@@ -67,9 +67,7 @@ func webircHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
67 67
 
68 68
 	clientAddress := utils.IPString(client.socket.conn.RemoteAddr())
69 69
 	clientHostname := client.hostname
70
-	server.configurableStateMutex.RLock()
71
-	defer server.configurableStateMutex.RUnlock()
72
-	for _, info := range server.webirc {
70
+	for _, info := range server.WebIRCConfig() {
73 71
 		for _, address := range info.Hosts {
74 72
 			if clientHostname == address || clientAddress == address {
75 73
 				// confirm password and/or fingerprint
@@ -101,9 +99,7 @@ func proxyHandler(server *Server, client *Client, msg ircmsg.IrcMessage) bool {
101 99
 
102 100
 	clientAddress := utils.IPString(client.socket.conn.RemoteAddr())
103 101
 	clientHostname := client.hostname
104
-	server.configurableStateMutex.RLock()
105
-	defer server.configurableStateMutex.RUnlock()
106
-	for _, address := range server.proxyAllowedFrom {
102
+	for _, address := range server.ProxyAllowedFrom() {
107 103
 		if clientHostname == address || clientAddress == address {
108 104
 			proxiedIP := msg.Params[1]
109 105
 

+ 12
- 0
irc/getters.go View File

@@ -23,6 +23,18 @@ func (server *Server) getPassword() []byte {
23 23
 	return server.password
24 24
 }
25 25
 
26
+func (server *Server) ProxyAllowedFrom() []string {
27
+	server.configurableStateMutex.RLock()
28
+	defer server.configurableStateMutex.RUnlock()
29
+	return server.proxyAllowedFrom
30
+}
31
+
32
+func (server *Server) WebIRCConfig() []webircConfig {
33
+	server.configurableStateMutex.RLock()
34
+	defer server.configurableStateMutex.RUnlock()
35
+	return server.webirc
36
+}
37
+
26 38
 func (client *Client) getNick() string {
27 39
 	client.stateMutex.RLock()
28 40
 	defer client.stateMutex.RUnlock()

Loading…
Cancel
Save