idk/Jumble
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Surprising me only a tiny bit, websockets aren't playing nice yet but otherwise it works

Browse Source
This commit is contained in:
idk
2021-01-03 22:58:08 -05:00
parent a9aa5c9726
commit 407047c60c
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
grumble.go
View File

@ -191,7 +191,7 @@ func main() {
// If no servers were found, create the default virtual server.
if len(servers) == 0 {
s, err := grumble.NewServer(1, Args.DataDir)
s, err := grumble.NewAnonServer(1, Args.DataDir)
if err != nil {
log.Fatalf("Couldn't start server: %s", err.Error())
}

8
pkg/server/server.go
View File

@ -1497,8 +1497,12 @@ func (server *Server) HostAddress() string {
func (server *Server) ListenDatagram(addr net.Addr) (net.PacketConn, error) {
switch addr.(type) {
case i2pkeys.I2PKeys:
case i2pkeys.I2PAddr:
return server.SAM.NewDatagramSession("mumble-i2p", addr.(i2pkeys.I2PKeys), sam3.Options_Humongous, 0)
case *i2pkeys.I2PKeys:
keys := addr.(*i2pkeys.I2PKeys)
newkeys := i2pkeys.NewKeys(keys.Addr(), keys.String())
return server.SAM.NewDatagramSession("mumble-i2p", newkeys, sam3.Options_Humongous, 0)
default:
return net.ListenUDP("udp", addr.(*net.UDPAddr))
}
@ -1506,7 +1510,7 @@ func (server *Server) ListenDatagram(addr net.Addr) (net.PacketConn, error) {
func (server *Server) ListenStream(addr net.Addr) (net.Listener, error) {
switch addr.(type) {
case i2pkeys.I2PKeys:
case *i2pkeys.I2PKeys:
return sam.I2PListener("mumble-web", "127.0.0.1:7656", "mumble-i2p")
default:
return net.ListenTCP("tcp", addr.(*net.TCPAddr))