veyron/services/wsprd: Fix a bug where the server id wasn't passed in
the auth request.
Change-Id: Iba5c3eaee9793d739d5926641473af8944e2b0b8
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index ff4e3d4..ae62d84 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -561,7 +561,8 @@
expectedWebsocketMessage = append(expectedWebsocketMessage, testwriter.Response{
Type: lib.ResponseAuthRequest,
Message: map[string]interface{}{
- "handle": 0.0,
+ "serverID": 0.0,
+ "handle": 0.0,
"context": map[string]interface{}{
"method": lib.LowercaseFirstCharacter(test.method),
"name": "adder",
@@ -616,7 +617,8 @@
expectedWebsocketMessage = append(expectedWebsocketMessage, testwriter.Response{
Type: lib.ResponseAuthRequest,
Message: map[string]interface{}{
- "handle": 0.0,
+ "serverID": 0.0,
+ "handle": 0.0,
"context": map[string]interface{}{
"method": lib.LowercaseFirstCharacter(test.method),
"name": "adder",
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 86068fa..cc2c287 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -86,8 +86,9 @@
}
type authRequest struct {
- Handle int64 `json:"handle"`
- Context context `json:"context"`
+ ServerID uint64 `json:"serverID"`
+ Handle int64 `json:"handle"`
+ Context context `json:"context"`
}
type Server struct {
@@ -213,7 +214,8 @@
s.outstandingAuthRequests[flow.ID] = replyChan
s.mu.Unlock()
message := authRequest{
- Handle: handle,
+ ServerID: s.id,
+ Handle: handle,
Context: context{
Method: lib.LowercaseFirstCharacter(ctx.Method()),
Name: ctx.Name(),
