veyron/profiles/static: add a profile for static IP servers.
Change-Id: I3df2f544cb1ecd93f70b3e272b55ff2584f81cec
diff --git a/profiles/roaming/roaming.go b/profiles/roaming/roaming.go
index dab60d0..eee9b2c 100644
--- a/profiles/roaming/roaming.go
+++ b/profiles/roaming/roaming.go
@@ -42,7 +42,7 @@
func init() {
flag.Var(&listenProtocolFlag, "veyron.tcp.protocol", "protocol to listen with")
flag.Var(&listenAddressFlag, "veyron.tcp.address", "address to listen on")
- flag.StringVar(&listenProxyFlag, "veyron.proxy", "", "proxy to use")
+ flag.StringVar(&listenProxyFlag, "veyron.proxy", "", "object name of proxy service to use to export services across network boundaries")
rt.RegisterProfile(New())
}
diff --git a/profiles/static/static.go b/profiles/static/static.go
new file mode 100644
index 0000000..830934f
--- /dev/null
+++ b/profiles/static/static.go
@@ -0,0 +1,87 @@
+// Package static provides a network-aware Profile that provides appropriate
+// options and configuration for a variety of network configurations, including
+// being behind 1-1 NATs, but without the ability to respond to dhcp changes.
+package profiles
+
+import (
+ "flag"
+
+ "veyron.io/veyron/veyron2"
+ "veyron.io/veyron/veyron2/config"
+ "veyron.io/veyron/veyron2/ipc"
+ "veyron.io/veyron/veyron2/rt"
+
+ "veyron.io/veyron/veyron/lib/flags"
+ "veyron.io/veyron/veyron/lib/netstate"
+ "veyron.io/veyron/veyron/profiles"
+ "veyron.io/veyron/veyron/profiles/internal"
+)
+
+var (
+ listenProtocolFlag = flags.TCPProtocolFlag{"tcp"}
+ listenAddressFlag = flags.IPHostPortFlag{Port: "0"}
+ listenProxyFlag string
+
+ // ListenSpec is an initialized instance of ipc.ListenSpec that can
+ // be used with ipc.Listen.
+ ListenSpec *ipc.ListenSpec
+)
+
+func init() {
+ flag.Var(&listenProtocolFlag, "veyron.tcp.protocol", "protocol to listen with")
+ flag.Var(&listenAddressFlag, "veyron.tcp.address", "address to listen on")
+ flag.StringVar(&listenProxyFlag, "veyron.proxy", "", "object name of proxy service to use to export services across network boundaries")
+ rt.RegisterProfile(New())
+}
+
+type static struct {
+ gce string
+}
+
+// New returns a new instance of a very static Profile. It can be used
+// as a default by Runtime implementations, in unit tests etc.
+func New() veyron2.Profile {
+ return &static{}
+}
+
+func (p *static) Name() string {
+ return "static" + p.gce
+}
+
+func (p *static) Runtime() string {
+ return ""
+}
+
+func (*static) Platform() *veyron2.Platform {
+ p, _ := profiles.Platform()
+ return p
+}
+
+func (p *static) Init(rt veyron2.Runtime, _ *config.Publisher) error {
+ log := rt.Logger()
+
+ ListenSpec = &ipc.ListenSpec{
+ Protocol: listenProtocolFlag.Protocol,
+ Address: listenAddressFlag.String(),
+ Proxy: listenProxyFlag,
+ }
+
+ // Our address is private, so we test for running on GCE and for its
+ // 1:1 NAT configuration. GCEPublicAddress returns a non-nil addr
+ // if we are indeed running on GCE.
+ if !internal.HasPublicIP(log) {
+ if addr := internal.GCEPublicAddress(log); addr != nil {
+ ListenSpec.AddressChooser = func(string, []ipc.Address) ([]ipc.Address, error) {
+ return []ipc.Address{&netstate.AddrIfc{addr, "nat", nil}}, nil
+ }
+ p.gce = "+gce"
+ return nil
+ }
+ }
+ ListenSpec.AddressChooser = internal.IPAddressChooser
+ return nil
+}
+
+func (p *static) String() string {
+ return "static profile on " + p.Platform().String()
+}
