Add mdns and dht command line options

Author: dennis-tra

cmd/pcp/pcp.go

@@ -53,6 +53,14 @@ func main() {
 				Name:  "debug",
 				Usage: "enables debug log output",
 			},
+			&cli.BoolFlag{
+				Name:  "dht",
+				Usage: "if set only advertises via the DHT",
+			},
+			&cli.BoolFlag{
+				Name:  "mdns",
+				Usage: "if set only advertises via mDNS",
+			},
 		},
 	}
 

pkg/receive/node.go

@@ -53,14 +53,26 @@ func (n *Node) Shutdown() {
 	n.Node.Shutdown()
 }
 
-func (n *Node) StartDiscovering() {
+func (n *Node) StartDiscovering(c *cli.Context) {
 	n.SetState(pcpnode.Discovering)
 
-	n.discoverers = []Discoverer{
-		dht.NewDiscoverer(n, n.DHT),
-		dht.NewDiscoverer(n, n.DHT).SetOffset(-dht.TruncateDuration),
-		mdns.NewDiscoverer(n.Node),
-		mdns.NewDiscoverer(n.Node).SetOffset(-dht.TruncateDuration),
+	if c.Bool("mdns") == c.Bool("dht") {
+		n.discoverers = []Discoverer{
+			dht.NewDiscoverer(n, n.DHT),
+			dht.NewDiscoverer(n, n.DHT).SetOffset(-dht.TruncateDuration),
+			mdns.NewDiscoverer(n.Node),
+			mdns.NewDiscoverer(n.Node).SetOffset(-dht.TruncateDuration),
+		}
+	} else if c.Bool("mdns") {
+		n.discoverers = []Discoverer{
+			mdns.NewDiscoverer(n.Node),
+			mdns.NewDiscoverer(n.Node).SetOffset(-dht.TruncateDuration),
+		}
+	} else if c.Bool("dht") {
+		n.discoverers = []Discoverer{
+			dht.NewDiscoverer(n, n.DHT),
+			dht.NewDiscoverer(n, n.DHT).SetOffset(-dht.TruncateDuration),
+		}
 	}
 
 	for _, discoverer := range n.discoverers {

pkg/send/node.go

@@ -63,12 +63,22 @@ func (n *Node) Shutdown() {
 
 // StartAdvertising asynchronously advertises the given code through the means of all
 // registered advertisers. Currently these are multicast DNS and DHT.
-func (n *Node) StartAdvertising() {
+func (n *Node) StartAdvertising(c *cli.Context) {
 	n.SetState(pcpnode.Advertising)
 
-	n.advertisers = []Advertiser{
-		dht.NewAdvertiser(n, n.DHT),
-		mdns.NewAdvertiser(n.Node),
+	if c.Bool("mdns") == c.Bool("dht") {
+		n.advertisers = []Advertiser{
+			dht.NewAdvertiser(n, n.DHT),
+			mdns.NewAdvertiser(n.Node),
+		}
+	} else if c.Bool("mdns") {
+		n.advertisers = []Advertiser{
+			mdns.NewAdvertiser(n.Node),
+		}
+	} else if c.Bool("dht") {
+		n.advertisers = []Advertiser{
+			dht.NewAdvertiser(n, n.DHT),
+		}
 	}
 
 	for _, advertiser := range n.advertisers {