This is the first change to get rid of //.
- StartCall option to avoid resolution
- an option parameter to Mount calls to indicate that the mounted
server is another mount table.
- an option parameter to Mount calls to indicate this server is
replacing what's there rather than adding to it.
// still works. This is just the beginning of getting rid of it.
Change-Id: I29175587420249504a37b5e025bf5e9c8565e9e3
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 57d90dc..aa1eeb5 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -204,7 +204,7 @@
}(ln, ep)
}
s.Unlock()
- s.publisher.AddServer(s.publishEP(ep))
+ s.publisher.AddServer(s.publishEP(ep), s.servesMountTable)
return ep, nil
}
@@ -340,9 +340,9 @@
s.proxyListenLoop(ln, ep, proxy)
s.active.Done()
}(pln, pep, listenSpec.Proxy)
- s.publisher.AddServer(s.publishEP(pep))
+ s.publisher.AddServer(s.publishEP(pep), s.servesMountTable)
} else {
- s.publisher.AddServer(s.publishEP(ep))
+ s.publisher.AddServer(s.publishEP(ep), s.servesMountTable)
}
s.Unlock()
return ep, nil
@@ -393,7 +393,7 @@
}
}
// (3) reconnected, publish new address
- s.publisher.AddServer(s.publishEP(ep))
+ s.publisher.AddServer(s.publishEP(ep), s.servesMountTable)
s.Lock()
s.listeners[ln] = nil
s.Unlock()
@@ -459,7 +459,7 @@
switch setting.Name() {
case ipc.NewAddrsSetting:
vlog.Infof("Added some addresses: %q", v)
- s.applyChange(dhcpl, v, publisher.AddServer)
+ s.applyChange(dhcpl, v, func(name string) { publisher.AddServer(name, s.servesMountTable) })
case ipc.RmAddrsSetting:
vlog.Infof("Removed some addresses: %q", v)
s.applyChange(dhcpl, v, publisher.RemoveServer)
