mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
00a22891ee
Support IPv6 address for ETCD_ADDR and ETCD_PEER_ADDR pkg/flags: Support IPv6 address for ETCD_ADDR and ETCD_PEER_ADDR pkg/flags: tests for IPv6 addr and bind-addr flags pkg/flags: IPAddressPort.Host: do not enclose IPv6 address in square brackets pkg/flags: set default bind address to [::] instead of 0.0.0.0 pkg/flags: we don't need fmt any more also, one minor fix: net.JoinHostPort takes string as a port value pkg/flags: fix ipv6 tests pkg/flags: test both IPv4 and IPv6 addresses in TestIPAddressPortString etcdmain: test: use [::] instead of 0.0.0.0
57 lines
1.3 KiB
Go
57 lines
1.3 KiB
Go
// Copyright 2015 CoreOS, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package flags
|
|
|
|
import (
|
|
"errors"
|
|
"net"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// IPAddressPort implements the flag.Value interface. The argument
|
|
// is validated as "ip:port".
|
|
type IPAddressPort struct {
|
|
IP string
|
|
Port int
|
|
}
|
|
|
|
func (a *IPAddressPort) Set(arg string) error {
|
|
arg = strings.TrimSpace(arg)
|
|
|
|
host, portStr, err := net.SplitHostPort(arg)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if net.ParseIP(host) == nil {
|
|
return errors.New("bad IP in address specification")
|
|
}
|
|
|
|
port, err := strconv.Atoi(portStr)
|
|
if err != nil {
|
|
return errors.New("bad port in address specification")
|
|
}
|
|
|
|
a.IP = host
|
|
a.Port = port
|
|
|
|
return nil
|
|
}
|
|
|
|
func (a *IPAddressPort) String() string {
|
|
return net.JoinHostPort(a.IP, strconv.Itoa(a.Port))
|
|
}
|