mandatoryHttpHeaderCount fix

bebo-dot-dev · bebo-dot-dev · commit 7e5c64a5735b · 2016-06-09T19:48:38.000+01:00
diff --git a/examples/WebSocketServer/WebSocketServerHttpHeaderValidation.ino b/examples/WebSocketServer/WebSocketServerHttpHeaderValidation.ino
@@ -75,7 +75,8 @@ void setup() {
 
     //connecting clients must supply a valid session cookie at websocket upgrade handshake negotiation time
     const char * headerkeys[] = { "Cookie" };
-    webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys);
+    size_t headerKeyCount = sizeof(headerkeys) / sizeof(char*);
+    webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys, headerKeyCount);
     webSocket.begin();
 }
 
diff --git a/src/WebSocketsServer.cpp b/src/WebSocketsServer.cpp
@@ -129,18 +129,20 @@ void WebSocketsServer::onEvent(WebSocketServerEvent cbEvent) {
 /*
  * Sets the custom http header validator function
  * @param httpHeaderValidationFunc WebSocketServerHttpHeaderValFunc ///< pointer to the custom http header validation function
- * @param mandatoryHttpHeaders const char* ///< the array of named http headers considered to be mandatory / must be present in order for websocket upgrade to succeed
+ * @param mandatoryHttpHeaders[] const char* ///< the array of named http headers considered to be mandatory / must be present in order for websocket upgrade to succeed
+ * @param mandatoryHttpHeaderCount size_t ///< the number of items in the mandatoryHttpHeaders array
  */
 void WebSocketsServer::onValidateHttpHeader(
 	WebSocketServerHttpHeaderValFunc validationFunc,
-	const char* mandatoryHttpHeaders[])
+	const char* mandatoryHttpHeaders[],
+	size_t mandatoryHttpHeaderCount)
 {
 	_httpHeaderValidationFunc = validationFunc;
 
 	if (_mandatoryHttpHeaders)
 		delete[] _mandatoryHttpHeaders;
 
-	_mandatoryHttpHeaderCount = (sizeof(mandatoryHttpHeaders) / sizeof(char*));
+	_mandatoryHttpHeaderCount = mandatoryHttpHeaderCount;
 	_mandatoryHttpHeaders = new String[_mandatoryHttpHeaderCount];
 
 	for (size_t i = 0; i < _mandatoryHttpHeaderCount; i++) {
diff --git a/src/WebSocketsServer.h b/src/WebSocketsServer.h
@@ -57,7 +57,10 @@ class WebSocketsServer: private WebSockets {
 #endif
 
         void onEvent(WebSocketServerEvent cbEvent);
-        void onValidateHttpHeader(WebSocketServerHttpHeaderValFunc validationFunc, const char* mandatoryHttpHeaders[]);
+        void onValidateHttpHeader(
+			WebSocketServerHttpHeaderValFunc validationFunc,
+			const char* mandatoryHttpHeaders[],
+			size_t mandatoryHttpHeaderCount);
 
 
         bool sendTXT(uint8_t num, uint8_t * payload, size_t length = 0, bool headerToPayload = false);

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ void setup() {`
`75`	`75`
`76`	`76`	`//connecting clients must supply a valid session cookie at websocket upgrade handshake negotiation time`
`77`	`77`	`const char * headerkeys[] = { "Cookie" };`
`78`		`- webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys);`
	`78`	`+ size_t headerKeyCount = sizeof(headerkeys) / sizeof(char*);`
	`79`	`+ webSocket.onValidateHttpHeader(validateHttpHeader, headerkeys, headerKeyCount);`
`79`	`80`	`webSocket.begin();`
`80`	`81`	`}`
`81`	`82`