ffhb/yanic
ffhb
/
yanic
mirror of https://github.com/FreifunkBremen/yanic.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'breminale-corny' into breminale

This commit is contained in:
Martin Geno 2017-07-06 13:13:32 +02:00
parent 511327ca10 b17d018dba
commit 890a2d6043
No known key found for this signature in database
GPG Key ID: F0D39A37E925E941
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
respond/collector.go
View File

@ -34,7 +34,7 @@ func NewCollector(db database.Connection, nodes *runtime.Nodes, ifaceListen stri
log.Panic(err) log.Panic(err)
} }
// Open socket // Open link local socket
conn, err := net.ListenUDP("udp", &net.UDPAddr{ conn, err := net.ListenUDP("udp", &net.UDPAddr{
IP: linkLocalAddr, IP: linkLocalAddr,
Port: port, Port: port,
@ -55,8 +55,9 @@ func NewCollector(db database.Connection, nodes *runtime.Nodes, ifaceListen stri
stop: make(chan interface{}), stop: make(chan interface{}),
} }
go collector.receiver() go collector.receiver(conn)
go collector.parser() go collector.parser()
collector.listenPublic()
if collector.db != nil { if collector.db != nil {
go collector.globalStatsWorker() go collector.globalStatsWorker()
@ -85,6 +86,18 @@ func getLinkLocalAddr(ifname string) (net.IP, error) {
return nil, fmt.Errorf("unable to find link local unicast address for %s", ifname) return nil, fmt.Errorf("unable to find link local unicast address for %s", ifname)
} }
func (coll *Collector) listenPublic() {
conn, err := net.ListenUDP("udp", &net.UDPAddr{
IP: net.ParseIP("::"),
Port: 12345,
})
if err != nil {
log.Panic(err)
}
conn.SetReadBuffer(maxDataGramSize)
go coll.receiver(conn)
}
// Start Collector // Start Collector
func (coll *Collector) Start(interval time.Duration) { func (coll *Collector) Start(interval time.Duration) {
if coll.interval != 0 { if coll.interval != 0 {
@ -170,6 +183,7 @@ func (coll *Collector) sender() {
func (coll *Collector) parser() { func (coll *Collector) parser() {
for obj := range coll.queue { for obj := range coll.queue {
if data, err := obj.parse(); err != nil { if data, err := obj.parse(); err != nil {
log.Println("unable to decode response from", obj.Address.String(), err, "\n", string(obj.Raw)) log.Println("unable to decode response from", obj.Address.String(), err, "\n", string(obj.Raw))
} else { } else {
@ -218,10 +232,10 @@ func (coll *Collector) saveResponse(addr net.UDPAddr, res *data.ResponseData) {
} }
} }
func (coll *Collector) receiver() { func (coll *Collector) receiver(conn *net.UDPConn) {
buf := make([]byte, maxDataGramSize) buf := make([]byte, maxDataGramSize)
for { for {
n, src, err := coll.connection.ReadFromUDP(buf) n, src, err := conn.ReadFromUDP(buf)
if err != nil { if err != nil {
log.Println("ReadFromUDP failed:", err) log.Println("ReadFromUDP failed:", err)