Mirrors/yggmail
1
0
Fork 0
mirror of https://github.com/neilalexander/yggmail.git synced 2026-04-27 04:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for more than one -peer (fixes #4)

Browse Source
This commit is contained in:
Neil Alexander
2021-07-10 13:13:21 +01:00
parent 90b02ba0d6
commit 2f8a2e4163
2 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/yggmail/main.go
View File

@@ -24,20 +24,32 @@ import (
"github.com/neilalexander/yggmail/internal/utils"
)
var database = flag.String("database", "yggmail.db", "SQLite database file")
var smtpaddr = flag.String("smtp", "localhost:1025", "SMTP listen address")
var imapaddr = flag.String("imap", "localhost:1143", "IMAP listen address")
var peeraddr = flag.String("peer", "", "Connect to a specific Yggdrasil static peer")
var multicast = flag.Bool("multicast", false, "Connect to Yggdrasil peers on your LAN")
var password = flag.Bool("password", false, "Set a new IMAP/SMTP password")
type peerAddrList []string
func (i *peerAddrList) String() string {
return strings.Join(*i, ", ")
}
func (i *peerAddrList) Set(value string) error {
*i = append(*i, value)
return nil
}
func main() {
rawlog := log.New(os.Stdout, "", 0)
log := log.New(rawlog.Writer(), "[ \033[32mYggmail\033[0m ] ", 0)
var peerAddrs peerAddrList
database := flag.String("database", "yggmail.db", "SQLite database file")
smtpaddr := flag.String("smtp", "localhost:1025", "SMTP listen address")
imapaddr := flag.String("imap", "localhost:1143", "IMAP listen address")
multicast := flag.Bool("multicast", false, "Connect to Yggdrasil peers on your LAN")
password := flag.Bool("password", false, "Set a new IMAP/SMTP password")
flag.Var(&peerAddrs, "peer", "Connect to a specific Yggdrasil static peer (this option can be given more than once)")
flag.Parse()
if flag.NFlag() == 0 {
fmt.Println("Yggmail must be started with either an Yggdrasil peer")
fmt.Println("Yggmail must be started with either one or more Yggdrasil peers")
fmt.Println("specified, multicast enabled, or both.")
fmt.Println()
fmt.Println("Available options:")
@@ -108,7 +120,7 @@ func main() {
log.Println("Password for IMAP and SMTP has been updated!")
os.Exit(0)
case (multicast == nil || !*multicast) && (peeraddr == nil || *peeraddr == ""):
case (multicast == nil || !*multicast) && len(peerAddrs) == 0:
log.Printf("You must specify either -peer, -multicast or both!")
os.Exit(0)
}
@@ -120,7 +132,7 @@ func main() {
wg := &sync.WaitGroup{}
wg.Add(2)
transport, err := transport.NewYggdrasilTransport(rawlog, sk, pk, *peeraddr, *multicast)
transport, err := transport.NewYggdrasilTransport(rawlog, sk, pk, peerAddrs, *multicast)
if err != nil {
panic(err)
}

6
internal/transport/yggdrasil.go
View File

@@ -19,10 +19,11 @@ type YggdrasilTransport struct {
Sessions *utp.Socket
}
func NewYggdrasilTransport(log *log.Logger, sk ed25519.PrivateKey, pk ed25519.PublicKey, peer string, mcast bool) (*YggdrasilTransport, error) {
func NewYggdrasilTransport(log *log.Logger, sk ed25519.PrivateKey, pk ed25519.PublicKey, peers []string, mcast bool) (*YggdrasilTransport, error) {
config := &config.NodeConfig{
PublicKey: hex.EncodeToString(pk),
PrivateKey: hex.EncodeToString(sk),
Peers: peers,
MulticastInterfaces: []config.MulticastInterfaceConfig{
{
Regex: ".*",
@@ -35,9 +36,6 @@ func NewYggdrasilTransport(log *log.Logger, sk ed25519.PrivateKey, pk ed25519.Pu
},
NodeInfoPrivacy: true,
}
if peer != "" {
config.Peers = append(config.Peers, peer)
}
glog := gologme.New(log.Writer(), "[ \033[33mYggdrasil\033[0m ] ", 0)
glog.EnableLevel("warn")
glog.EnableLevel("error")