Browse Source

Support network name

tags/v0.1.0
Daniel Oaks 8 years ago
parent
commit
a013205fd1
3 changed files with 20 additions and 6 deletions
  1. 8
    1
      irc/config.go
  2. 5
    5
      irc/server.go
  3. 7
    0
      oragono.yaml

+ 8
- 1
irc/config.go View File

21
 }
21
 }
22
 
22
 
23
 type Config struct {
23
 type Config struct {
24
+	Network struct {
25
+		Name string
26
+	}
27
+
24
 	Server struct {
28
 	Server struct {
25
 		PassConfig
29
 		PassConfig
30
+		Name     string
26
 		Database string
31
 		Database string
27
 		Listen   []string
32
 		Listen   []string
28
 		Wslisten string
33
 		Wslisten string
29
 		Log      string
34
 		Log      string
30
 		MOTD     string
35
 		MOTD     string
31
-		Name     string
32
 	}
36
 	}
33
 
37
 
34
 	Operator map[string]*PassConfig
38
 	Operator map[string]*PassConfig
67
 		return nil, err
71
 		return nil, err
68
 	}
72
 	}
69
 
73
 
74
+	if config.Network.Name == "" {
75
+		return nil, errors.New("Network name missing")
76
+	}
70
 	if config.Server.Name == "" {
77
 	if config.Server.Name == "" {
71
 		return nil, errors.New("Server name missing")
78
 		return nil, errors.New("Server name missing")
72
 	}
79
 	}

+ 5
- 5
irc/server.go View File

88
 	server.isupport.Add("CHANTYPES", "#")
88
 	server.isupport.Add("CHANTYPES", "#")
89
 	server.isupport.Add("EXCEPTS", "")
89
 	server.isupport.Add("EXCEPTS", "")
90
 	server.isupport.Add("INVEX", "")
90
 	server.isupport.Add("INVEX", "")
91
-	server.isupport.Add("KICKLEN", "")            //TODO(dan): Support kick length?
92
-	server.isupport.Add("MAXLIST", "")            //TODO(dan): Support max list length?
93
-	server.isupport.Add("MODES", "")              //TODO(dan): Support max modes?
94
-	server.isupport.Add("NETWORK", "NetNameHere") //TODO(dan): Support network name
95
-	server.isupport.Add("NICKLEN", "")            //TODO(dan): Support nick length
91
+	server.isupport.Add("KICKLEN", "") //TODO(dan): Support kick length?
92
+	server.isupport.Add("MAXLIST", "") //TODO(dan): Support max list length?
93
+	server.isupport.Add("MODES", "")   //TODO(dan): Support max modes?
94
+	server.isupport.Add("NETWORK", config.Network.Name)
95
+	server.isupport.Add("NICKLEN", "") //TODO(dan): Support nick length
96
 	server.isupport.Add("PREFIX", "(ov)@+")
96
 	server.isupport.Add("PREFIX", "(ov)@+")
97
 	server.isupport.Add("STATUSMSG", "@+") //TODO(dan): Autogenerate based on PREFIXes, make sure it's actually supported
97
 	server.isupport.Add("STATUSMSG", "@+") //TODO(dan): Autogenerate based on PREFIXes, make sure it's actually supported
98
 	server.isupport.Add("TARGMAX", "")     //TODO(dan): Support this
98
 	server.isupport.Add("TARGMAX", "")     //TODO(dan): Support this

+ 7
- 0
oragono.yaml View File

1
 # oragono IRCd config
1
 # oragono IRCd config
2
+
3
+# network configuration
4
+network:
5
+    # name of the network
6
+    name: OragonoTest
7
+
8
+# server configuration
2
 server:
9
 server:
3
     # server name
10
     # server name
4
     name: oragono.test
11
     name: oragono.test

Loading…
Cancel
Save