[gentoo-commits] proj/openrc:master commit in: net/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/openrc:master commit in: net/
Date: Mon, 18 Jul 2011 23:57:10 +0000 (UTC)	[thread overview]
Message-ID: <6fa6f9523f80b2fcb49728b349f3eefc3e45a769.robbat2@gentoo> (raw)

commit:     6fa6f9523f80b2fcb49728b349f3eefc3e45a769
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 07:09:28 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 23:55:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6fa6f952

Rewrite iproute2 addr argument parsing.

This was originally to fix the fact that our code did not handle certain
orders of arguments in conversion, but it was easier to rewrite the
entire argument handling to support more options at the same time.

Now supports all options documented in the ip manpage, including the
IPv6-specific options that must be passed after the interface argument.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Reported-by: Tony Vroon <chainsaw <AT> gentoo.org>
X-Gentoo-Bug: 366905
X-Gentoo-Bug-URL: https://bugs.gentoo.org/366905

---
 net/iproute2.sh |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index d76e60f..2e02fbe 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -111,38 +111,32 @@ _add_address()
 		return 0
 	fi
 
-	# Convert an ifconfig line to iproute2
-	if [ "$2" = "netmask" ]; then
-		local one="$1" three="$3"
-		shift; shift; shift
-		set -- "${one}/$(_netmask2cidr "${three}")" "$@"
-	fi
-
-	# tunnel keyword is 'peer' in iproute2, but 'pointopoint' in ifconfig.
-	if [ "$2" = "pointopoint" ]; then
-		local one="$1"
-		shift; shift
-		set -- "${one}" "peer" "$@"
-	fi
+	local address netmask broadcast peer anycast label scope
+	local valid_lft preferred_lft home nodad
+	address="$1" ; shift
+	while [ -n "$*" ]; do
+		case "$1" in
+			netmask)
+				netmask="/$(_netmask2cidr "$2")" ; shift ; shift ;;
+			broadcast|brd)
+				broadcast="broadcast $2" ; shift ; shift ;;
+			pointopoint|pointtopoint|peer)
+				peer="peer $2" ; shift ; shift ;;
+			anycast|label|scope|valid_lft|preferred_lft)
+				eval "$1=$2" ; shift ; shift ;;
+			home|nodad)
+				eval "$1=$1" ; shift ;;
+		esac
+	done
 
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
-		set -- "$@" "scope" "host"
+		[ -z "$scope" ] && scope="scope host"
 	fi
 
-	# IPv4 specifics
-	case "$1" in
-		*.*.*.*)
-			case "$@" in
-				*" brd "*);;
-				*" broadcast "*);;
-				*) set -- "$@" brd +;;
-			esac
-			;;
-	esac
-
-	veinfo ip addr add "$@" dev "${IFACE}"
-	ip addr add "$@" dev "${IFACE}"
+	set -- "${address}${netmask}" $peer $broadcast $anycast $label $scope dev "${IFACE}" $valid_lft $preferred_lft $home $nodad
+	veinfo ip addr add "$@"
+	ip addr add "$@"
 }
 
 _add_route()

next             reply	other threads:[~2011-07-18 23:57 UTC|newest]

Thread overview: 69+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-18 23:57 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-02-17 21:39 [gentoo-commits] proj/openrc:master commit in: net/ William Hubbs
2012-12-21 22:45 William Hubbs
2012-12-20 21:28 Robin H. Johnson
2012-11-10 20:58 William Hubbs
2012-11-07  1:45 Robin H. Johnson
2012-11-07  1:45 Robin H. Johnson
2012-11-06 23:23 Robin H. Johnson
2012-11-06 23:19 Robin H. Johnson
2012-11-06 23:19 Robin H. Johnson
2012-10-17 18:51 William Hubbs
2012-10-11  3:57 Robin H. Johnson
2012-10-11  3:57 Robin H. Johnson
2012-10-10  0:11 Robin H. Johnson
2012-09-07 19:57 William Hubbs
2012-07-04 14:20 William Hubbs
2012-06-07  5:36 William Hubbs
2012-05-03 20:43 Robin H. Johnson
2012-04-24  3:32 Christian Ruppert
2012-04-03 21:31 Robin H. Johnson
2012-04-02  4:28 William Hubbs
2012-03-11 19:55 Robin H. Johnson
2012-03-02 19:55 Robin H. Johnson
2012-02-09  9:43 Robin H. Johnson
2012-02-09  9:40 Robin H. Johnson
2012-01-25 18:47 Robin H. Johnson
2012-01-16 17:33 Robin H. Johnson
2012-01-13  4:39 Robin H. Johnson
2012-01-07 21:56 William Hubbs
2012-01-07 21:56 William Hubbs
2012-01-06 21:08 William Hubbs
2012-01-04 21:38 Mike Frysinger
2011-12-30  1:22 William Hubbs
2011-12-30  0:11 William Hubbs
2011-12-28 20:32 Robin H. Johnson
2011-12-27  2:01 Robin H. Johnson
2011-12-27  1:51 Robin H. Johnson
2011-12-27  1:24 Robin H. Johnson
2011-12-27  1:09 Robin H. Johnson
2011-12-21  8:11 Robin H. Johnson
2011-12-21  8:11 Robin H. Johnson
2011-12-21  8:11 Robin H. Johnson
2011-12-13  8:43 Robin H. Johnson
2011-12-13  6:53 Robin H. Johnson
2011-12-13  6:38 William Hubbs
2011-12-13  3:20 Robin H. Johnson
2011-12-13  3:20 Robin H. Johnson
2011-12-10  4:12 William Hubbs
2011-12-10  2:59 William Hubbs
2011-11-23 14:26 William Hubbs
2011-11-22 15:14 William Hubbs
2011-10-07 21:47 Robin H. Johnson
2011-09-21 11:29 Christian Ruppert
2011-09-21  1:58 Christian Ruppert
2011-09-18 22:04 Christian Ruppert
2011-09-18 12:45 Christian Ruppert
2011-09-16 23:14 Christian Ruppert
2011-09-16 22:18 Christian Ruppert
2011-09-16 21:48 Christian Ruppert
2011-06-28  4:08 Mike Frysinger
2011-05-16 19:58 William Hubbs
2011-05-16 13:23 Anthony G. Basile
2011-05-16  5:22 Mike Frysinger
2011-04-07 12:51 William Hubbs
2011-03-27 20:46 William Hubbs
2011-03-18 18:25 Mike Frysinger
2011-02-21  9:56 Robin H. Johnson
2011-02-12 19:37 William Hubbs
2011-02-05 13:28 William Hubbs

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:d76e60f dfblob:2e02fbe )
 OR (
bs:"[gentoo-commits] proj/openrc:master commit in: net/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6fa6f9523f80b2fcb49728b349f3eefc3e45a769.robbat2@gentoo \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox