Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New port number for new format global discovery

This commit is contained in:
Jakob Borg 2014-07-13 09:33:44 +02:00
parent 6415d1a6a5
commit 1f62247c7e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/discosrv/main.go
View File

@ -53,7 +53,7 @@ func main() {
var statsIntv int var statsIntv int
var statsFile string var statsFile string
flag.StringVar(&listen, "listen", ":22025", "Listen address") flag.StringVar(&listen, "listen", ":22026", "Listen address")
flag.BoolVar(&debug, "debug", false, "Enable debug output") flag.BoolVar(&debug, "debug", false, "Enable debug output")
flag.BoolVar(&timestamp, "timestamp", true, "Timestamp the log output") flag.BoolVar(&timestamp, "timestamp", true, "Timestamp the log output")
flag.IntVar(&statsIntv, "stats-intv", 0, "Statistics output interval (s)") flag.IntVar(&statsIntv, "stats-intv", 0, "Statistics output interval (s)")
@ -103,10 +103,10 @@ func main() {
magic := binary.BigEndian.Uint32(buf) magic := binary.BigEndian.Uint32(buf)
switch magic { switch magic {
case discover.AnnouncementMagicV2: case discover.AnnouncementMagic:
handleAnnounceV2(addr, buf) handleAnnounceV2(addr, buf)
case discover.QueryMagicV2: case discover.QueryMagic:
handleQueryV2(conn, addr, buf) handleQueryV2(conn, addr, buf)
default: default:
@ -146,7 +146,7 @@ func limit(addr *net.UDPAddr) bool {
} }
func handleAnnounceV2(addr *net.UDPAddr, buf []byte) { func handleAnnounceV2(addr *net.UDPAddr, buf []byte) {
var pkt discover.AnnounceV2 var pkt discover.Announce
err := pkt.UnmarshalXDR(buf) err := pkt.UnmarshalXDR(buf)
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
log.Println("AnnounceV2 Unmarshal:", err) log.Println("AnnounceV2 Unmarshal:", err)
@ -197,7 +197,7 @@ func handleAnnounceV2(addr *net.UDPAddr, buf []byte) {
} }
func handleQueryV2(conn *net.UDPConn, addr *net.UDPAddr, buf []byte) { func handleQueryV2(conn *net.UDPConn, addr *net.UDPAddr, buf []byte) {
var pkt discover.QueryV2 var pkt discover.Query
err := pkt.UnmarshalXDR(buf) err := pkt.UnmarshalXDR(buf)
if err != nil { if err != nil {
log.Println("QueryV2 Unmarshal:", err) log.Println("QueryV2 Unmarshal:", err)
@ -222,8 +222,8 @@ func handleQueryV2(conn *net.UDPConn, addr *net.UDPAddr, buf []byte) {
lock.Unlock() lock.Unlock()
if ok && len(node.addresses) > 0 { if ok && len(node.addresses) > 0 {
ann := discover.AnnounceV2{ ann := discover.Announce{
Magic: discover.AnnouncementMagicV2, Magic: discover.AnnouncementMagic,
This: discover.Node{ This: discover.Node{
ID: pkt.NodeID, ID: pkt.NodeID,
}, },