Skip to content

Change APIs to accept input according to spec #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AniruddhaKanhere wants to merge 1 commit into from
Closed

Change APIs to accept input according to spec #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions source/core_mqtt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,8 +1734,8 @@ static MQTTStatus_t sendPublishAcksWithProperty( MQTTContext_t * pContext,
* Reason Code + 1 = 8
*/
uint8_t pubAckHeader[ 8U ];
size_t remainingLength = 0U;
size_t packetSize = 0U;
uint32_t remainingLength = 0U;
uint32_t packetSize = 0U;

/* The maximum vectors required to encode and send a publish ack.
* Ack Header 0 + 1 = 1
Expand Down Expand Up @@ -1846,7 +1846,7 @@ static MQTTStatus_t sendPublishAcksWithProperty( MQTTContext_t * pContext,
if( bytesSentOrError != ( int32_t ) totalMessageLength )
{
LogError( ( "Failed to send ACK packet: PacketType=%02x, "
"PacketSize=%lu.",
"PacketSize=%" PRIu32,
( unsigned int ) packetTypeByte,
packetSize ) );
status = MQTTSendFailed;
Expand Down Expand Up @@ -4335,7 +4335,8 @@ MQTTStatus_t MQTT_Subscribe( MQTTContext_t * pContext,
const MQTTPropBuilder_t * pPropertyBuilder )
{
MQTTConnectionStatus_t connectStatus;
size_t remainingLength = 0UL, packetSize = 0UL;
uint32_t remainingLength = 0UL;
uint32_t packetSize = 0UL;
MQTTStatus_t status = MQTTSuccess;

status = validateSubscribeUnsubscribeParams( pContext,
Expand Down Expand Up @@ -4401,8 +4402,8 @@ MQTTStatus_t MQTT_Publish( MQTTContext_t * pContext,
const MQTTPropBuilder_t * pPropertyBuilder )
{
size_t headerSize = 0UL;
size_t remainingLength = 0UL;
size_t packetSize = 0UL;
uint32_t remainingLength = 0UL;
uint32_t packetSize = 0UL;
MQTTPublishState_t publishStatus = MQTTStateNull;
MQTTConnectionStatus_t connectStatus;
uint16_t topicAlias = 0U;
Expand Down Expand Up @@ -4542,7 +4543,7 @@ MQTTStatus_t MQTT_Ping( MQTTContext_t * pContext )
{
int32_t sendResult = 0;
MQTTStatus_t status = MQTTSuccess;
size_t packetSize = 0U;
uint32_t packetSize = 0U;
/* MQTT ping packets are of fixed length. */
uint8_t pingreqPacket[ 2U ];
MQTTFixedBuffer_t localBuffer;
Expand Down Expand Up @@ -4634,7 +4635,8 @@ MQTTStatus_t MQTT_Unsubscribe( MQTTContext_t * pContext,
const MQTTPropBuilder_t * pPropertyBuilder )
{
MQTTConnectionStatus_t connectStatus;
size_t remainingLength = 0UL, packetSize = 0UL;
uint32_t remainingLength = 0UL;
uint32_t packetSize = 0UL;
MQTTStatus_t status = MQTTSuccess;

/* Validate arguments. */
Expand Down Expand Up @@ -4697,8 +4699,8 @@ MQTTStatus_t MQTT_Disconnect( MQTTContext_t * pContext,
const MQTTPropBuilder_t * pPropertyBuilder,
MQTTSuccessFailReasonCode_t * pReasonCode )
{
size_t packetSize = 0U;
size_t remainingLength = 0U;
uint32_t packetSize = 0U;
uint32_t remainingLength = 0U;
MQTTStatus_t status = MQTTSuccess;
MQTTConnectionStatus_t connectStatus;

Expand Down
54 changes: 27 additions & 27 deletions source/core_mqtt_serializer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ static void serializePublishCommon( const MQTTPublishInfo_t * pPublishInfo,
* MQTT spec; MQTTSuccess otherwise.
*/
static MQTTStatus_t calculatePublishPacketSize( const MQTTPublishInfo_t * pPublishInfo,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize,
size_t publishPropertyLength );

Expand All @@ -162,8 +162,8 @@ static MQTTStatus_t calculatePublishPacketSize( const MQTTPublishInfo_t * pPubli

static MQTTStatus_t calculateSubscriptionPacketSize( const MQTTSubscribeInfo_t * pSubscriptionList,
size_t subscriptionCount,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
size_t subscribePropLen,
uint32_t maxPacketSize,
MQTTSubscriptionType_t subscriptionType );
Expand Down Expand Up @@ -689,14 +689,14 @@ static size_t remainingLengthEncodedSize( size_t length )
/*-----------------------------------------------------------*/

static MQTTStatus_t calculatePublishPacketSize( const MQTTPublishInfo_t * pPublishInfo,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize,
size_t publishPropertyLength )
{
MQTTStatus_t status = MQTTSuccess;
size_t packetSize = 0, propertyAndPayloadLimit = 0;

uint32_t packetSize = 0;
uint32_t propertyAndPayloadLimit = 0;

assert( pPublishInfo != NULL );
assert( pRemainingLength != NULL );
Expand Down Expand Up @@ -848,7 +848,7 @@ static MQTTStatus_t deserializePubAcks( const MQTTPacketInfo_t * pAck,
/*-----------------------------------------------------------*/

MQTTStatus_t MQTT_SerializePublishHeaderWithoutTopic( const MQTTPublishInfo_t * pPublishInfo,
size_t remainingLength,
uint32_t remainingLength,
uint8_t * pBuffer,
size_t * headerSize )
{
Expand Down Expand Up @@ -1583,8 +1583,8 @@ static MQTTStatus_t deserializeConnack( MQTTConnectionProperties_t * pConnackPro

static MQTTStatus_t calculateSubscriptionPacketSize( const MQTTSubscribeInfo_t * pSubscriptionList,
size_t subscriptionCount,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
size_t subscribePropLen,
uint32_t maxPacketSize,
MQTTSubscriptionType_t subscriptionType )
Expand Down Expand Up @@ -3266,8 +3266,8 @@ MQTTStatus_t MQTT_SerializeConnect( const MQTTConnectInfo_t * pConnectInfo,
MQTTStatus_t MQTT_GetSubscribePacketSize( const MQTTSubscribeInfo_t * pSubscriptionList,
size_t subscriptionCount,
const MQTTPropBuilder_t * pSubscribeProperties,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -3309,7 +3309,7 @@ MQTTStatus_t MQTT_SerializeSubscribe( const MQTTSubscribeInfo_t * pSubscriptionL
size_t subscriptionCount,
const MQTTPropBuilder_t * pSubscribeProperties,
uint16_t packetId,
size_t remainingLength,
uint32_t remainingLength,
const MQTTFixedBuffer_t * pFixedBuffer )
{
size_t i = 0;
Expand Down Expand Up @@ -3420,8 +3420,8 @@ MQTTStatus_t MQTT_SerializeSubscribe( const MQTTSubscribeInfo_t * pSubscriptionL
MQTTStatus_t MQTT_GetUnsubscribePacketSize( const MQTTSubscribeInfo_t * pSubscriptionList,
size_t subscriptionCount,
const MQTTPropBuilder_t * pUnsubscribeProperties,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -3516,7 +3516,7 @@ MQTTStatus_t MQTT_SerializeUnsubscribe( const MQTTSubscribeInfo_t * pSubscriptio
size_t subscriptionCount,
const MQTTPropBuilder_t * pUnsubscribeProperties,
uint16_t packetId,
size_t remainingLength,
uint32_t remainingLength,
const MQTTFixedBuffer_t * pFixedBuffer )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -3571,8 +3571,8 @@ MQTTStatus_t MQTT_SerializeUnsubscribe( const MQTTSubscribeInfo_t * pSubscriptio

MQTTStatus_t MQTT_GetPublishPacketSize( const MQTTPublishInfo_t * pPublishInfo,
const MQTTPropBuilder_t * pPublishProperties,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -3606,7 +3606,7 @@ MQTTStatus_t MQTT_GetPublishPacketSize( const MQTTPublishInfo_t * pPublishInfo,
MQTTStatus_t MQTT_SerializePublish( const MQTTPublishInfo_t * pPublishInfo,
const MQTTPropBuilder_t * pPublishProperties,
uint16_t packetId,
size_t remainingLength,
uint32_t remainingLength,
const MQTTFixedBuffer_t * pFixedBuffer )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -3693,7 +3693,7 @@ MQTTStatus_t MQTT_SerializePublish( const MQTTPublishInfo_t * pPublishInfo,
MQTTStatus_t MQTT_SerializePublishHeader( const MQTTPublishInfo_t * pPublishInfo,
const MQTTPropBuilder_t * pPublishProperties,
uint16_t packetId,
size_t remainingLength,
uint32_t remainingLength,
const MQTTFixedBuffer_t * pFixedBuffer,
size_t * pHeaderSize )
{
Expand Down Expand Up @@ -3873,8 +3873,8 @@ MQTTStatus_t MQTT_SerializeAck( const MQTTFixedBuffer_t * pFixedBuffer,
/*-----------------------------------------------------------*/

MQTTStatus_t MQTT_GetDisconnectPacketSize( const MQTTPropBuilder_t * pDisconnectProperties,
size_t * pRemainingLength,
size_t * pPacketSize,
uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize,
MQTTSuccessFailReasonCode_t * pReasonCode )
{
Expand Down Expand Up @@ -3970,7 +3970,7 @@ MQTTStatus_t MQTT_GetDisconnectPacketSize( const MQTTPropBuilder_t * pDisconnect

MQTTStatus_t MQTT_SerializeDisconnect( const MQTTPropBuilder_t * pDisconnectProperties,
MQTTSuccessFailReasonCode_t * pReasonCode,
size_t remainingLength,
uint32_t remainingLength,
const MQTTFixedBuffer_t * pFixedBuffer )
{
MQTTStatus_t status = MQTTSuccess;
Expand Down Expand Up @@ -4040,7 +4040,7 @@ MQTTStatus_t MQTT_SerializeDisconnect( const MQTTPropBuilder_t * pDisconnectProp

/*-----------------------------------------------------------*/

MQTTStatus_t MQTT_GetPingreqPacketSize( size_t * pPacketSize )
MQTTStatus_t MQTT_GetPingreqPacketSize( uint32_t * pPacketSize )
{
MQTTStatus_t status = MQTTSuccess;

Expand Down Expand Up @@ -5228,8 +5228,8 @@ MQTTStatus_t MQTT_ValidatePublishAckProperties( const MQTTPropBuilder_t * pPrope

/*-----------------------------------------------------------*/

MQTTStatus_t MQTT_GetAckPacketSize( size_t * pRemainingLength,
size_t * pPacketSize,
MQTTStatus_t MQTT_GetAckPacketSize( uint32_t * pRemainingLength,
uint32_t * pPacketSize,
uint32_t maxPacketSize,
size_t ackPropertyLength )
{
Expand Down
8 changes: 4 additions & 4 deletions source/core_mqtt_serializer_private.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ uint8_t * encodeVariableLength( uint8_t * pDestination,
uint8_t * serializeAckFixed( uint8_t * pIndex,
uint8_t packetType,
uint16_t packetId,
size_t remainingLength,
uint32_t remainingLength,
MQTTSuccessFailReasonCode_t reasonCode )
{
uint8_t * pIndexLocal = pIndex;
Expand Down Expand Up @@ -538,7 +538,7 @@ uint8_t * serializeConnectFixedHeader( uint8_t * pIndex,

/*-----------------------------------------------------------*/

uint8_t * serializeSubscribeHeader( size_t remainingLength,
uint8_t * serializeSubscribeHeader( uint32_t remainingLength,
uint8_t * pIndex,
uint16_t packetId )
{
Expand All @@ -562,7 +562,7 @@ uint8_t * serializeSubscribeHeader( size_t remainingLength,

/*-----------------------------------------------------------*/

uint8_t * serializeUnsubscribeHeader( size_t remainingLength,
uint8_t * serializeUnsubscribeHeader( uint32_t remainingLength,
uint8_t * pIndex,
uint16_t packetId )
{
Expand All @@ -588,7 +588,7 @@ uint8_t * serializeUnsubscribeHeader( size_t remainingLength,

uint8_t * serializeDisconnectFixed( uint8_t * pIndex,
MQTTSuccessFailReasonCode_t * pReasonCode,
size_t remainingLength )
uint32_t remainingLength )
{
uint8_t * pIndexLocal = pIndex;

Expand Down
8 changes: 4 additions & 4 deletions source/include/core_mqtt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,10 @@ typedef bool ( * MQTTStorePacketForRetransmit)( struct MQTTContext * pContext,
* @return True if the retreive is successful else false.
*/
/* @[define_mqtt_retransmitretrievepacket] */
typedef bool ( * MQTTRetrievePacketForRetransmit)( struct MQTTContext * pContext,
uint16_t packetId,
uint8_t ** pSerializedMqttVec,
size_t * pSerializedMqttVecLen );
typedef bool ( * MQTTRetrievePacketForRetransmit )( struct MQTTContext * pContext,
uint16_t packetId,
uint8_t ** pSerializedMqttVec,
size_t * pSerializedMqttVecLen );
/* @[define_mqtt_retransmitretrievepacket] */

/**
Expand Down
Loading
Loading