From 58ea422ea287196758d8d9e4ac206520401a45f5 Mon Sep 17 00:00:00 2001
From: Adam Harrison <harrisonadamw@gmail.com>
Date: Tue, 1 Sep 2015 12:21:28 +0100
Subject: [PATCH] Optional address argument to dns-add/dns-remove

---
 weave | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/weave b/weave
index 7d093c66..a1c4039b 100755
--- a/weave
+++ b/weave
@@ -67,8 +67,8 @@ weave run           [--with-dns | --without-dns] [<addr> ...]
 weave start         [<addr> ...] <container_id>
 weave attach        [<addr> ...] <container_id>
 weave detach        [<addr> ...] <container_id>
-weave dns-add       <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]
-weave dns-remove    <ip_address> [<ip_address> ...] <container_id> [-h <fqdn>]
+weave dns-add       [<ip_address> ...] <container_id> [-h <fqdn>]
+weave dns-remove    [<ip_address> ...] <container_id> [-h <fqdn>]
 weave dns-lookup    <unqualified_name>
 weave expose        [<addr> ...] [-h <fqdn>]
 weave hide          [<addr> ...]
@@ -735,6 +735,12 @@ echo_addresses() {
     echo $1 $2 $3
 }
 
+echo_ips() {
+    for CIDR in $3; do
+        echo ${3%/*}
+    done
+}
+
 peer_args() {
   res=''
   sep=''
@@ -1502,9 +1508,12 @@ case "$COMMAND" in
     dns-add)
         collect_ip_args "$@"
         shift $IP_COUNT
-        [ $IP_COUNT -gt 0 -a \( $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) \) ] || usage
+        [ $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) ] || usage
         check_running $CONTAINER_NAME
         CONTAINER=$(container_id $1)
+        if [ $IP_COUNT -eq 0 ] ; then
+            IP_ARGS=$(with_container_addresses echo_ips $CONTAINER)
+        fi
         if [ $# -eq 1 ] ; then
             with_container_fqdn $CONTAINER put_dns_fqdn $IP_ARGS
         else
@@ -1514,9 +1523,12 @@ case "$COMMAND" in
     dns-remove)
         collect_ip_args "$@"
         shift $IP_COUNT
-        [ $IP_COUNT -gt 0 -a \( $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) \) ] || usage
+        [ $# -eq 1 -o \( $# -eq 3 -a "$2" = "-h" \) ] || usage
         check_running $CONTAINER_NAME
         CONTAINER=$(container_id $1)
+        if [ $IP_COUNT -eq 0 ] ; then
+            IP_ARGS=$(with_container_addresses echo_ips $CONTAINER)
+        fi
         if [ $# -eq 1 ] ; then
             delete_dns $CONTAINER $IP_ARGS
         else