Review corrections

-Check pointer before writing to it. It allows application to ask
 only some of the  stagger values.
-Change type of data_amount in get_stagger_estimate_to_address to be
 uint16_t.

Author: Arto Kinnunen

features/netsocket/InternetSocket.cpp

@@ -120,6 +120,10 @@ int InternetSocket::get_latency_estimate_to_address(const SocketAddress &address
     nsapi_latency_req_t ns_api_latency_req;
     unsigned opt_len = sizeof(nsapi_latency_req_t);
 
+    if (!latency) {
+        return NSAPI_ERROR_PARAMETER;
+    }
+
     // Set up address
     memcpy(ns_api_latency_req.addr, address.get_ip_bytes(), 16);
 
@@ -132,7 +136,7 @@ int InternetSocket::get_latency_estimate_to_address(const SocketAddress &address
     return ret;
 }
 
-int InternetSocket::get_stagger_estimate_to_address(const SocketAddress &address, uint32_t data_amount, uint16_t *stagger_min, uint16_t *stagger_max, uint16_t *stagger_rand)
+int InternetSocket::get_stagger_estimate_to_address(const SocketAddress &address, uint16_t data_amount, uint16_t *stagger_min, uint16_t *stagger_max, uint16_t *stagger_rand)
 {
     nsapi_error_t ret;
     nsapi_stagger_req_t nsapi_stagger;
@@ -145,9 +149,15 @@ int InternetSocket::get_stagger_estimate_to_address(const SocketAddress &address
     ret = this->getsockopt(NSAPI_SOCKET, NSAPI_STAGGER, (void *)&nsapi_stagger, &opt_len);
     if (ret == NSAPI_ERROR_OK) {
         // success, stagger found
-        *stagger_min = nsapi_stagger.stagger_min;
-        *stagger_max = nsapi_stagger.stagger_max;
-        *stagger_rand = nsapi_stagger.stagger_rand;
+        if (stagger_min) {
+            *stagger_min = nsapi_stagger.stagger_min;
+        }
+        if (stagger_max) {
+            *stagger_max = nsapi_stagger.stagger_max;
+        }
+        if (stagger_rand) {
+            *stagger_rand = nsapi_stagger.stagger_rand;
+        }
     }
 
     return ret;

features/netsocket/InternetSocket.h

@@ -90,7 +90,9 @@ class InternetSocket : public Socket {
      *
      * @param address   Destination address to estimate latency.
      * @param latency   Returned latency value in milliseconds.
-     *  @return         NSAPI_ERROR_OK on success, negative error code on failure (@see InternetSocket::getsockopt).
+     *  @return         NSAPI_ERROR_OK on success.
+     *  @return         NSAPI_ERROR_PARAMETER if the provided pointer is invalid.
+     *  @return         negative error code on other failures (@see InternetSocket::getsockopt).
      */
     int get_latency_estimate_to_address(const SocketAddress &address, uint32_t *latency);
 
@@ -101,9 +103,10 @@ class InternetSocket : public Socket {
      * @param stagger_min   Minimum stagger value in seconds.
      * @param stagger_max   Maximum stagger value in seconds.
      * @param stagger_rand  Randomized stagger value in seconds.
-     * @return              NSAPI_ERROR_OK on success, negative error code on failure (@see InternetSocket::getsockopt).
+     * @return              NSAPI_ERROR_OK on success.
+     * @return              negative error code on other failures (@see InternetSocket::getsockopt).
      */
-    int get_stagger_estimate_to_address(const SocketAddress &address, uint32_t data_amount, uint16_t *stagger_min, uint16_t *stagger_max, uint16_t *stagger_rand);
+    int get_stagger_estimate_to_address(const SocketAddress &address, uint16_t data_amount, uint16_t *stagger_min, uint16_t *stagger_max, uint16_t *stagger_rand);
 
     /** Bind the socket to a port on which to receive data.
      *