From c5f391bd6cc812a308d2aaa285995ce0b9bb4452 Mon Sep 17 00:00:00 2001
From: dfawley <dfawley@google.com>
Date: Wed, 25 Oct 2017 10:31:00 -0700
Subject: [PATCH] Revert "cap max msg size to min(max_int, max_uint32) (#1598)"
 (#1619)

This reverts commit 5856538706dc3abc44dd5ba1a8bb19a0dfb1ab25.
---
 rpc_util.go       |  2 --
 server.go         | 14 ++------------
 service_config.go | 28 ++++++----------------------
 3 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/rpc_util.go b/rpc_util.go
index f5978c19..e006b7e6 100644
--- a/rpc_util.go
+++ b/rpc_util.go
@@ -206,7 +206,6 @@ func FailFast(failFast bool) CallOption {
 }
 
 // MaxCallRecvMsgSize returns a CallOption which sets the maximum message size the client can receive.
-// Note that the maximum effective value is MaxUint32 due to protocol limitations.
 func MaxCallRecvMsgSize(s int) CallOption {
 	return beforeCall(func(o *callInfo) error {
 		o.maxReceiveMessageSize = &s
@@ -215,7 +214,6 @@ func MaxCallRecvMsgSize(s int) CallOption {
 }
 
 // MaxCallSendMsgSize returns a CallOption which sets the maximum message size the client can send.
-// Note that the maximum effective value is MaxUint32 due to protocol limitations.
 func MaxCallSendMsgSize(s int) CallOption {
 	return beforeCall(func(o *callInfo) error {
 		o.maxSendMessageSize = &s
diff --git a/server.go b/server.go
index 70311854..def301a1 100644
--- a/server.go
+++ b/server.go
@@ -208,27 +208,17 @@ func MaxMsgSize(m int) ServerOption {
 
 // MaxRecvMsgSize returns a ServerOption to set the max message size in bytes the server can receive.
 // If this is not set, gRPC uses the default 4MB.
-// Note that the maximum effective value is MaxUint32 due to protocol limitations.
 func MaxRecvMsgSize(m int) ServerOption {
 	return func(o *options) {
-		if int64(m) > int64(math.MaxUint32) {
-			o.maxReceiveMessageSize = math.MaxUint32
-		} else {
-			o.maxReceiveMessageSize = m
-		}
+		o.maxReceiveMessageSize = m
 	}
 }
 
 // MaxSendMsgSize returns a ServerOption to set the max message size in bytes the server can send.
 // If this is not set, gRPC uses the default 4MB.
-// Note that the maximum effective value is MaxUint32 due to protocol limitations.
 func MaxSendMsgSize(m int) ServerOption {
 	return func(o *options) {
-		if int64(m) > int64(math.MaxUint32) {
-			o.maxSendMessageSize = math.MaxUint32
-		} else {
-			o.maxSendMessageSize = m
-		}
+		o.maxSendMessageSize = m
 	}
 }
 
diff --git a/service_config.go b/service_config.go
index 719d725e..0631e7d2 100644
--- a/service_config.go
+++ b/service_config.go
@@ -20,7 +20,6 @@ package grpc
 
 import (
 	"encoding/json"
-	"math"
 	"time"
 
 	"google.golang.org/grpc/grpclog"
@@ -149,39 +148,24 @@ func parseServiceConfig(js string) (ServiceConfig, error) {
 	return sc, nil
 }
 
-func min(a, b int) int {
-	if a < b {
+func min(a, b *int) *int {
+	if *a < *b {
 		return a
 	}
 	return b
 }
 
-const maxInt = int(^uint(0) >> 1)
-
 func getMaxSize(mcMax, doptMax *int, defaultVal int) *int {
-	res := getRawMaxSize(mcMax, doptMax, defaultVal)
-
-	// Cap the max size to maxInt of current machine due to slice length limit.
-	res = min(res, maxInt)
-	if int64(res) > int64(math.MaxUint32) {
-		// Only reach here on 64-bit machine, where we need to cap the max size
-		// to MaxUint32.
-		res = math.MaxUint32
-	}
-	return &res
-}
-
-func getRawMaxSize(mcMax, doptMax *int, defaultVal int) int {
 	if mcMax == nil && doptMax == nil {
-		return defaultVal
+		return &defaultVal
 	}
 	if mcMax != nil && doptMax != nil {
-		return min(*mcMax, *doptMax)
+		return min(mcMax, doptMax)
 	}
 	if mcMax != nil {
-		return *mcMax
+		return mcMax
 	}
-	return *doptMax
+	return doptMax
 }
 
 func newBool(b bool) *bool {