Merge 51426e477b340950d7614ce6b1a7857b6a9b544f on remote branch

Change-Id: Ie0841c01a79e9247fa6ae7d2b04bb2a66d3d8dad

12 files changed, 118 insertions, 100 deletions

diff --git a/android/2.0/GnssConfiguration.cpp b/android/2.0/GnssConfiguration.cpp
index 671b6e7..d2a8763 100644
--- a/android/2.0/GnssConfiguration.cpp
+++ b/android/2.0/GnssConfiguration.cpp
@@ -255,7 +255,7 @@ bool GnssConfiguration::setBlacklistedSource(
         break;
     default:
         copyToSource.constellation = GNSS_SV_TYPE_UNKNOWN;
-        LOC_LOGe("Invalid constellation %u", copyFromSource.constellation);
+        LOC_LOGe("Invalid constellation %hhu", copyFromSource.constellation);
         retVal = false;
         break;
     }
diff --git a/android/2.0/location_api/GeofenceAPIClient.cpp b/android/2.0/location_api/GeofenceAPIClient.cpp
index fabf8bb..a93c988 100644
--- a/android/2.0/location_api/GeofenceAPIClient.cpp
+++ b/android/2.0/location_api/GeofenceAPIClient.cpp
@@ -141,7 +141,7 @@ void GeofenceAPIClient::geofenceRemoveAll()
 // callbacks
 void GeofenceAPIClient::onGeofenceBreachCb(GeofenceBreachNotification geofenceBreachNotification)
 {
-    LOC_LOGD("%s]: (%zu)", __FUNCTION__, geofenceBreachNotification.count);
+    LOC_LOGD("%s]: (%d)", __FUNCTION__, geofenceBreachNotification.count);
     if (mGnssGeofencingCbIface != nullptr) {
         for (size_t i = 0; i < geofenceBreachNotification.count; i++) {
             GnssLocation gnssLocation;
diff --git a/android/2.0/location_api/GnssAPIClient.cpp b/android/2.0/location_api/GnssAPIClient.cpp
index 68cf395..15245e3 100644
--- a/android/2.0/location_api/GnssAPIClient.cpp
+++ b/android/2.0/location_api/GnssAPIClient.cpp
@@ -517,7 +517,7 @@ void GnssAPIClient::onGnssNiCb(uint32_t id, GnssNiNotification gnssNiNotificatio
 
 void GnssAPIClient::onGnssSvCb(GnssSvNotification gnssSvNotification)
 {
-    LOC_LOGD("%s]: (count: %zu)", __FUNCTION__, gnssSvNotification.count);
+    LOC_LOGD("%s]: (count: %u)", __FUNCTION__, gnssSvNotification.count);
     mMutex.lock();
     auto gnssCbIface(mGnssCbIface);
     auto gnssCbIface_2_0(mGnssCbIface_2_0);
@@ -561,7 +561,7 @@ void GnssAPIClient::onGnssNmeaCb(GnssNmeaNotification gnssNmeaNotification)
                 auto r = gnssCbIface_2_0->gnssNmeaCb(
                         static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString);
                 if (!r.isOk()) {
-                    LOC_LOGE("%s] Error from gnssCbIface_2_0 nmea=%s length=%zu description=%s",
+                    LOC_LOGE("%s] Error from gnssCbIface_2_0 nmea=%s length=%u description=%s",
                              __func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length,
                              r.description().c_str());
                 }
@@ -569,7 +569,7 @@ void GnssAPIClient::onGnssNmeaCb(GnssNmeaNotification gnssNmeaNotification)
                 auto r = gnssCbIface->gnssNmeaCb(
                         static_cast<V1_0::GnssUtcTime>(gnssNmeaNotification.timestamp), nmeaString);
                 if (!r.isOk()) {
-                    LOC_LOGE("%s] Error from gnssNmeaCb nmea=%s length=%zu description=%s",
+                    LOC_LOGE("%s] Error from gnssNmeaCb nmea=%s length=%u description=%s",
                              __func__, gnssNmeaNotification.nmea, gnssNmeaNotification.length,
                              r.description().c_str());
                 }
diff --git a/android/2.0/location_api/MeasurementAPIClient.cpp b/android/2.0/location_api/MeasurementAPIClient.cpp
index 23c3b16..eb0c7d1 100644
--- a/android/2.0/location_api/MeasurementAPIClient.cpp
+++ b/android/2.0/location_api/MeasurementAPIClient.cpp
@@ -170,7 +170,7 @@ void MeasurementAPIClient::measurementClose() {
 void MeasurementAPIClient::onGnssMeasurementsCb(
         GnssMeasurementsNotification gnssMeasurementsNotification)
 {
-    LOC_LOGD("%s]: (count: %zu active: %d)",
+    LOC_LOGD("%s]: (count: %u active: %d)",
             __FUNCTION__, gnssMeasurementsNotification.count, mTracking);
     if (mTracking) {
         mMutex.lock();
diff --git a/build/target_specific_features.mk b/build/target_specific_features.mk
index ad7f7e1..ca6eb79 100644
--- a/build/target_specific_features.mk
+++ b/build/target_specific_features.mk
@@ -1,7 +1,6 @@
 GNSS_CFLAGS := \
     -Werror \
     -Wno-error=unused-parameter \
-    -Wno-error=format \
     -Wno-error=macro-redefined \
     -Wno-error=reorder \
     -Wno-error=missing-braces \
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index c172376..a521ceb 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -404,7 +404,7 @@ void LocApiBase::reportSv(GnssSvNotification& svNotify)
         "QZSS", "BEIDOU", "GALILEO" };
 
     // print the SV info before delivering
-    LOC_LOGV("num sv: %zu\n"
+    LOC_LOGV("num sv: %u\n"
         "      sv: constellation svid         cN0"
         "    elevation    azimuth    flags",
         svNotify.count);
diff --git a/core/data-items/DataItemConcreteTypesBase.h b/core/data-items/DataItemConcreteTypesBase.h
index 552d46a..a6e68f1 100644
--- a/core/data-items/DataItemConcreteTypesBase.h
+++ b/core/data-items/DataItemConcreteTypesBase.h
@@ -249,7 +249,7 @@ public:
             mId(NETWORKINFO_DATA_ITEM_ID) {
                 memset (&mAllNetworkHandles, NETWORK_HANDLE_UNKNOWN,
                         sizeof (mAllNetworkHandles));
-                mAllNetworkHandles[type] = networkHandle;
+                mAllNetworkHandles[initialType] = networkHandle;
             }
     virtual ~NetworkInfoDataItemBase() {}
     inline virtual DataItemId getId() { return mId; }
diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp
index eaf8878..535f6de 100644
--- a/gnss/GnssAdapter.cpp
+++ b/gnss/GnssAdapter.cpp
@@ -714,90 +714,91 @@ GnssAdapter::setConfigCommand()
            loc_gps_cfg_s gpsConf = ContextBase::mGps_conf;
            loc_sap_cfg_s_type sapConf = ContextBase::mSap_conf;
 
-            mApi.sendMsg(new LocApiMsg(
-                    [&adapter, gpsConf, sapConf, oldServerUrl, oldMoServerUrl] () {
-                //cache the injected configuration with GnssConfigRequested struct
-                GnssConfig gnssConfigRequested = {};
-                gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT |
-                        GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT |
-                        GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT |
-                        GNSS_CONFIG_FLAGS_BLACKLISTED_SV_IDS_BIT;
-                gnssConfigRequested.gpsLock = GNSS_CONFIG_GPS_LOCK_NONE;
-                if (0 == adapter.getAfwControlId() || NULL != adapter.mNfwCb) {
-                    gnssConfigRequested.gpsLock = gpsConf.GPS_LOCK;
-                }
-
-                if (gpsConf.AGPS_CONFIG_INJECT) {
-                    gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_SET_ASSISTANCE_DATA_VALID_BIT |
-                            GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT |
-                            GNSS_CONFIG_FLAGS_AGLONASS_POSITION_PROTOCOL_VALID_BIT |
-                            GNSS_CONFIG_FLAGS_LPP_PROFILE_VALID_BIT;
-                    gnssConfigRequested.suplVersion =
-                            adapter.mLocApi->convertSuplVersion(gpsConf.SUPL_VER);
-                    gnssConfigRequested.lppProfile =
-                            adapter.mLocApi->convertLppProfile(gpsConf.LPP_PROFILE);
-                    gnssConfigRequested.aGlonassPositionProtocolMask =
-                            gpsConf.A_GLONASS_POS_PROTOCOL_SELECT;
-                }
-                gnssConfigRequested.lppeControlPlaneMask =
-                        adapter.mLocApi->convertLppeCp(gpsConf.LPPE_CP_TECHNOLOGY);
-                gnssConfigRequested.lppeUserPlaneMask =
-                        adapter.mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY);
-                gnssConfigRequested.blacklistedSvIds.assign(adapter.mBlacklistedSvIds.begin(),
-                        adapter.mBlacklistedSvIds.end());
-                adapter.gnssUpdateConfig(oldServerUrl, oldMoServerUrl, gnssConfigRequested,
-                        gnssConfigRequested);
-
-                // set nmea mask type
-                uint32_t mask = 0;
-                if (NMEA_PROVIDER_MP == gpsConf.NMEA_PROVIDER) {
-                    mask |= LOC_NMEA_ALL_GENERAL_SUPPORTED_MASK;
-                }
-                if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_DEBUG_NMEA_V02)) {
-                    mask |= LOC_NMEA_MASK_DEBUG_V02;
-                }
-
-                if (mask != 0) {
-                    adapter.mLocApi->setNMEATypesSync(mask);
-                }
-
-                adapter.mLocApi->setXtraVersionCheckSync(gpsConf.XTRA_VERSION_CHECK);
-
-                adapter.mLocApi->setConstrainedTuncMode(
-                        gpsConf.CONSTRAINED_TIME_UNCERTAINTY_ENABLED == 1,
-                        (float)gpsConf.CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD,
-                        gpsConf.CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET);
-                adapter.mLocApi->setPositionAssistedClockEstimatorMode(
-                        gpsConf.POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED == 1);
-
-                if (sapConf.GYRO_BIAS_RANDOM_WALK_VALID ||
-                    sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
-                    sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
-                    sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
-                    sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID ) {
-                    adapter.mLocApi->setSensorPropertiesSync(
-                        sapConf.GYRO_BIAS_RANDOM_WALK_VALID,
-                        sapConf.GYRO_BIAS_RANDOM_WALK,
-                        sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
-                        sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY,
-                        sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
-                        sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY,
-                        sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
-                        sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY,
-                        sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
-                        sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY);
-                }
-                adapter.mLocApi->setSensorPerfControlConfigSync(
-                    sapConf.SENSOR_CONTROL_MODE,
-                    sapConf.SENSOR_ACCEL_SAMPLES_PER_BATCH,
-                    sapConf.SENSOR_ACCEL_BATCHES_PER_SEC,
-                    sapConf.SENSOR_GYRO_SAMPLES_PER_BATCH,
-                    sapConf.SENSOR_GYRO_BATCHES_PER_SEC,
-                    sapConf.SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH,
-                    sapConf.SENSOR_ACCEL_BATCHES_PER_SEC_HIGH,
-                    sapConf.SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH,
-                    sapConf.SENSOR_GYRO_BATCHES_PER_SEC_HIGH,
-                    sapConf.SENSOR_ALGORITHM_CONFIG_MASK);
+           //cache the injected configuration with GnssConfigRequested struct
+           GnssConfig gnssConfigRequested = {};
+           gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT |
+                   GNSS_CONFIG_FLAGS_LPPE_CONTROL_PLANE_VALID_BIT |
+                   GNSS_CONFIG_FLAGS_LPPE_USER_PLANE_VALID_BIT |
+                   GNSS_CONFIG_FLAGS_BLACKLISTED_SV_IDS_BIT;
+           gnssConfigRequested.gpsLock = GNSS_CONFIG_GPS_LOCK_NONE;
+           if (0 == adapter.getAfwControlId() || NULL != adapter.mNfwCb) {
+               gnssConfigRequested.gpsLock = gpsConf.GPS_LOCK;
+           }
+
+           if (gpsConf.AGPS_CONFIG_INJECT) {
+               gnssConfigRequested.flags |= GNSS_CONFIG_FLAGS_SET_ASSISTANCE_DATA_VALID_BIT |
+                       GNSS_CONFIG_FLAGS_SUPL_VERSION_VALID_BIT |
+                       GNSS_CONFIG_FLAGS_AGLONASS_POSITION_PROTOCOL_VALID_BIT |
+                       GNSS_CONFIG_FLAGS_LPP_PROFILE_VALID_BIT;
+               gnssConfigRequested.suplVersion =
+                       adapter.mLocApi->convertSuplVersion(gpsConf.SUPL_VER);
+               gnssConfigRequested.lppProfile =
+                       adapter.mLocApi->convertLppProfile(gpsConf.LPP_PROFILE);
+               gnssConfigRequested.aGlonassPositionProtocolMask =
+                       gpsConf.A_GLONASS_POS_PROTOCOL_SELECT;
+           }
+           gnssConfigRequested.lppeControlPlaneMask =
+                   adapter.mLocApi->convertLppeCp(gpsConf.LPPE_CP_TECHNOLOGY);
+           gnssConfigRequested.lppeUserPlaneMask =
+                   adapter.mLocApi->convertLppeUp(gpsConf.LPPE_UP_TECHNOLOGY);
+           gnssConfigRequested.blacklistedSvIds.assign(adapter.mBlacklistedSvIds.begin(),
+                                                       adapter.mBlacklistedSvIds.end());
+           mApi.sendMsg(new LocApiMsg(
+                   [&adapter, gpsConf, sapConf, oldServerUrl,
+                    oldMoServerUrl, gnssConfigRequested] () {
+               adapter.gnssUpdateConfig(oldServerUrl, oldMoServerUrl, gnssConfigRequested,
+                       gnssConfigRequested);
+
+               // set nmea mask type
+               uint32_t mask = 0;
+               if (NMEA_PROVIDER_MP == gpsConf.NMEA_PROVIDER) {
+                   mask |= LOC_NMEA_ALL_GENERAL_SUPPORTED_MASK;
+               }
+               if (ContextBase::isFeatureSupported(LOC_SUPPORTED_FEATURE_DEBUG_NMEA_V02)) {
+                   mask |= LOC_NMEA_MASK_DEBUG_V02;
+               }
+
+               if (mask != 0) {
+                   adapter.mLocApi->setNMEATypesSync(mask);
+               }
+
+               adapter.mLocApi->setXtraVersionCheckSync(gpsConf.XTRA_VERSION_CHECK);
+
+               adapter.mLocApi->setConstrainedTuncMode(
+                       gpsConf.CONSTRAINED_TIME_UNCERTAINTY_ENABLED == 1,
+                       (float)gpsConf.CONSTRAINED_TIME_UNCERTAINTY_THRESHOLD,
+                       gpsConf.CONSTRAINED_TIME_UNCERTAINTY_ENERGY_BUDGET);
+               adapter.mLocApi->setPositionAssistedClockEstimatorMode(
+                       gpsConf.POSITION_ASSISTED_CLOCK_ESTIMATOR_ENABLED == 1);
+
+               if (sapConf.GYRO_BIAS_RANDOM_WALK_VALID ||
+                   sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
+                   sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
+                   sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY_VALID ||
+                   sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID ) {
+                   adapter.mLocApi->setSensorPropertiesSync(
+                       sapConf.GYRO_BIAS_RANDOM_WALK_VALID,
+                       sapConf.GYRO_BIAS_RANDOM_WALK,
+                       sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
+                       sapConf.ACCEL_RANDOM_WALK_SPECTRAL_DENSITY,
+                       sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
+                       sapConf.ANGLE_RANDOM_WALK_SPECTRAL_DENSITY,
+                       sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
+                       sapConf.RATE_RANDOM_WALK_SPECTRAL_DENSITY,
+                       sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY_VALID,
+                       sapConf.VELOCITY_RANDOM_WALK_SPECTRAL_DENSITY);
+               }
+               adapter.mLocApi->setSensorPerfControlConfigSync(
+                       sapConf.SENSOR_CONTROL_MODE,
+                       sapConf.SENSOR_ACCEL_SAMPLES_PER_BATCH,
+                       sapConf.SENSOR_ACCEL_BATCHES_PER_SEC,
+                       sapConf.SENSOR_GYRO_SAMPLES_PER_BATCH,
+                       sapConf.SENSOR_GYRO_BATCHES_PER_SEC,
+                       sapConf.SENSOR_ACCEL_SAMPLES_PER_BATCH_HIGH,
+                       sapConf.SENSOR_ACCEL_BATCHES_PER_SEC_HIGH,
+                       sapConf.SENSOR_GYRO_SAMPLES_PER_BATCH_HIGH,
+                       sapConf.SENSOR_GYRO_BATCHES_PER_SEC_HIGH,
+                       sapConf.SENSOR_ALGORITHM_CONFIG_MASK);
             } ));
         }
     };
@@ -1039,9 +1040,18 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
             mConfig(config),
             mCount(count),
             mIds(ids) {}
+        inline MsgGnssUpdateConfig(const MsgGnssUpdateConfig& obj) :
+                MsgGnssUpdateConfig(obj.mAdapter, obj.mApi, obj.mConfig,
+                        new uint32_t[obj.mCount], obj.mCount) {
+            if (mIds != nullptr) {
+                for (int i = 0; i < mCount; ++i) {
+                    mIds[i] = obj.mIds[i];
+                }
+            }
+        }
         inline virtual ~MsgGnssUpdateConfig()
         {
-            delete [] mIds;
+            delete[] mIds;
         }
 
         inline virtual void proc() const {
@@ -1066,7 +1076,7 @@ GnssAdapter::gnssUpdateConfigCommand(GnssConfig config)
                     newGpsLock = GNSS_CONFIG_GPS_LOCK_MO;
                 }
                 if (newGpsLock == ContextBase::mGps_conf.GPS_LOCK ||
-                    0 != mAdapter.getAfwControlId()) {
+                    0 != mAdapter.getAfwControlId() || NULL != adapter.mNfwCb) {
                     gnssConfigNeedEngineUpdate.flags &= ~(GNSS_CONFIG_FLAGS_GPS_LOCK_VALID_BIT);
                 }
                 ContextBase::mGps_conf.GPS_LOCK = newGpsLock;
@@ -1299,6 +1309,16 @@ GnssAdapter::gnssGetConfigCommand(GnssConfigFlagsMask configMask) {
             mConfigMask(configMask),
             mIds(ids),
             mCount(count) {}
+
+        inline MsgGnssGetConfig(const MsgGnssGetConfig& obj) :
+                MsgGnssGetConfig(obj.mAdapter, obj.mApi, obj.mConfigMask,
+                        new uint32_t[obj.mCount], obj.mCount) {
+            if (mIds != nullptr) {
+                for (int i = 0; i < mCount; ++i) {
+                    mIds[i] = obj.mIds[i];
+                }
+            }
+        }
         inline virtual ~MsgGnssGetConfig()
         {
             delete[] mIds;
diff --git a/gnss/XtraSystemStatusObserver.cpp b/gnss/XtraSystemStatusObserver.cpp
index 4cb6f5f..af593fb 100644
--- a/gnss/XtraSystemStatusObserver.cpp
+++ b/gnss/XtraSystemStatusObserver.cpp
@@ -123,7 +123,7 @@ bool XtraSystemStatusObserver::updateLockStatus(GnssConfigGpsLock lock) {
 
     stringstream ss;
     ss <<  "gpslock";
-    ss << " " << lock;
+    ss << " " << mGpsLock;
     string s = ss.str();
     return ( LocIpc::send(*mSender, (const uint8_t*)s.data(), s.size()) );
 }
diff --git a/pla/Android.mk b/pla/Android.mk
index ce062bb..a57861d 100644
--- a/pla/Android.mk
+++ b/pla/Android.mk
@@ -1,7 +1,6 @@
 GNSS_CFLAGS := \
     -Werror \
     -Wno-error=unused-parameter \
-    -Wno-error=format \
     -Wno-error=macro-redefined \
     -Wno-error=reorder \
     -Wno-error=missing-braces \
diff --git a/utils/LocIpc.cpp b/utils/LocIpc.cpp
index ecaff01..9496895 100644
--- a/utils/LocIpc.cpp
+++ b/utils/LocIpc.cpp
@@ -48,7 +48,7 @@ namespace loc_util {
 
 #define SOCK_OP_AND_LOG(buf, length, opable, rtv, exe)  \
     if (nullptr == (buf) || 0 == (length)) { \
-        LOC_LOGe("Invalid inputs: buf - %p, length - %d", (buf), (length)); \
+        LOC_LOGe("Invalid inputs: buf - %p, length - %u", (buf), (length)); \
     } else if (!(opable)) {                                             \
         LOC_LOGe("Invalid object: operable - %d", (opable));            \
     } else { \
@@ -60,7 +60,7 @@ namespace loc_util {
 
 const char Sock::MSG_ABORT[] = "LocIpc::Sock::ABORT";
 const char Sock::LOC_IPC_HEAD[] = "$MSGLEN$";
-ssize_t Sock::send(const void *buf, size_t len, int flags, const struct sockaddr *destAddr,
+ssize_t Sock::send(const void *buf, uint32_t len, int flags, const struct sockaddr *destAddr,
                           socklen_t addrlen) const {
     ssize_t rtv = -1;
     SOCK_OP_AND_LOG(buf, len, isValid(), rtv, sendto(buf, len, flags, destAddr, addrlen));
diff --git a/utils/LocIpc.h b/utils/LocIpc.h
index 20a1c8f..c71c4e0 100644
--- a/utils/LocIpc.h
+++ b/utils/LocIpc.h
@@ -164,7 +164,7 @@ public:
     inline Sock(int sid, const uint32_t maxTxSize = 8192) : mMaxTxSize(maxTxSize), mSid(sid) {}
     inline ~Sock() { close(); }
     inline bool isValid() const { return -1 != mSid; }
-    ssize_t send(const void *buf, size_t len, int flags, const struct sockaddr *destAddr,
+    ssize_t send(const void *buf, uint32_t len, int flags, const struct sockaddr *destAddr,
                  socklen_t addrlen) const;
     ssize_t recv(const shared_ptr<ILocIpcListener>& dataCb, int flags, struct sockaddr *srcAddr,
                  socklen_t *addrlen, int sid = -1) const;