Server feature: Update

1. Add InnerIpPort and OuterIpPort functions
2. Add ListenPort, InnerIpPort and OuterIpPort methods to SrvConfig structure

Author: andeya

common.go

@@ -15,11 +15,33 @@
 package ant
 
 import (
+	"net"
 	"sync"
 
+	"github.com/henrylee2cn/goutil"
 	tp "github.com/henrylee2cn/teleport"
 )
 
+// InnerIpPort returns the service's intranet address, such as '192.168.1.120:8080'.
+func InnerIpPort(port string) (string, error) {
+	host, err := goutil.IntranetIP()
+	if err != nil {
+		return "", err
+	}
+	hostPort := net.JoinHostPort(host, port)
+	return hostPort, nil
+}
+
+// OuterIpPort returns the service's extranet address, such as '113.116.141.121:8080'.
+func OuterIpPort(port string) (string, error) {
+	host, err := goutil.ExtranetIP()
+	if err != nil {
+		return "", err
+	}
+	hostPort := net.JoinHostPort(host, port)
+	return hostPort, nil
+}
+
 var initOnce sync.Once
 
 func doInit() {

samples/discovery/server.go

@@ -24,17 +24,16 @@ func (p *P) Divide(args *Args) (int, *tp.Rerror) {
 }
 
 func main() {
-	srv := ant.NewServer(ant.SrvConfig{
+	cfg := ant.SrvConfig{
 		ListenAddress: ":9090",
 		// EnableHeartbeat: true,
-	},
-		discovery.ServicePlugin(
-			"localhost:9090",
-			etcd.EasyConfig{
-				Endpoints: []string{"http://127.0.0.1:2379"},
-			},
-		),
-	)
+	}
+	srv := ant.NewServer(cfg, discovery.ServicePlugin(
+		cfg.InnerIpPort(),
+		etcd.EasyConfig{
+			Endpoints: []string{"http://127.0.0.1:2379"},
+		},
+	))
 	srv.RoutePull(new(P))
 	srv.Listen()
 }

server.go

@@ -48,6 +48,33 @@ func (s *SrvConfig) Reload(bind cfgo.BindFunc) error {
 	return bind()
 }
 
+// ListenPort returns the listened port, such as '8080'.
+func (s *SrvConfig) ListenPort() string {
+	_, port, err := net.SplitHostPort(s.ListenAddress)
+	if err != nil {
+		Fatalf("%v", err)
+	}
+	return port
+}
+
+// InnerIpPort returns the service's intranet address, such as '192.168.1.120:8080'.
+func (s *SrvConfig) InnerIpPort() string {
+	hostPort, err := InnerIpPort(s.ListenPort())
+	if err != nil {
+		Fatalf("%v", err)
+	}
+	return hostPort
+}
+
+// OuterIpPort returns the service's extranet address, such as '113.116.141.121:8080'.
+func (s *SrvConfig) OuterIpPort() string {
+	hostPort, err := OuterIpPort(s.ListenPort())
+	if err != nil {
+		Fatalf("%v", err)
+	}
+	return hostPort
+}
+
 func (s *SrvConfig) peerConfig() tp.PeerConfig {
 	return tp.PeerConfig{
 		DefaultSessionAge: s.DefaultSessionAge,