michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net/mqtt: combine mqtt_parser for PUBLISHER and SUBSCRIBER

Browse source 
Currently, app type MQTT_APP_PUBLISHER_SUBSCRIBER is not supported.
mqtt_init() will return EINVAL because the context rcv function is
either mqtt_publisher_parser or mqtt_subscriber_parser (not both).

Let's combine these functions into mqtt_parser and remove the app
type check from mqtt_init().

Change-Id: I60460e011395864706e293c997e9f8a65681b368
Signed-off-by: Michael Scott <michael.scott@linaro.org>
This commit is contained in:
Michael Scott 2017-02-18 10:58:14 -08:00 • committed by Jukka Rissanen
commit e5f1112b07
1 changed files with 5 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

77
subsys/net/lib/mqtt/mqtt.c
View file

@ -688,11 +688,12 @@ exit_error:
* @retval 0 on success
* @retval -EINVAL if an unknown message is received
* @retval -ENOMEM if no data buffer is available
* @retval mqtt_rx_connack, mqtt_rx_puback, mqtt_rx_pubrec, mqtt_rx_pubcomp
* and mqtt_rx_pingresp return codes
* @retval mqtt_rx_connack, mqtt_rx_pingresp, mqtt_rx_puback, mqtt_rx_pubcomp,
* mqtt_rx_publish, mqtt_rx_pubrec, mqtt_rx_pubrel and mqtt_rx_suback
* return codes
*/
static
int mqtt_publisher_parser(struct mqtt_ctx *ctx, struct net_pkt *rx)
int mqtt_parser(struct mqtt_ctx *ctx, struct net_pkt *rx)
{
u16_t pkt_type = MQTT_INVALID;
struct net_buf *data = NULL;
@ -725,61 +726,6 @@ int mqtt_publisher_parser(struct mqtt_ctx *ctx, struct net_pkt *rx)
break;
case MQTT_PINGRESP:
rc = mqtt_rx_pingresp(ctx, data);
break;
default:
rc = -EINVAL;
break;
}
exit_parser:
if (rc != 0 && ctx->malformed) {
ctx->malformed(ctx, pkt_type);
}
net_pkt_frag_unref(data);
return rc;
}
/**
* Calls the appropriate rx routine for the MQTT message contained in rx
*
* @details On error, this routine will execute the 'ctx->malformed' callback
* (if defined)
*
* @param ctx MQTT context
* @param rx RX packet
*
* @retval 0 on success
* @retval -EINVAL if an unknown message is received
* @retval -ENOMEM if no data buffer is available
* @retval mqtt_rx_publish, mqtt_rx_pubrel, mqtt_rx_pubrel and mqtt_rx_suback
* return codes
*/
static
int mqtt_subscriber_parser(struct mqtt_ctx *ctx, struct net_pkt *rx)
{
u16_t pkt_type = MQTT_INVALID;
struct net_buf *data = NULL;
int rc = 0;
data = mqtt_linearize_packet(ctx, rx, MQTT_PUBLISHER_MIN_MSG_SIZE);
if (!data) {
rc = -EINVAL;
goto exit_parser;
}
pkt_type = MQTT_PACKET_TYPE(data->data[0]);
switch (pkt_type) {
case MQTT_CONNACK:
if (!ctx->connected) {
rc = mqtt_rx_connack(ctx, data, ctx->clean_session);
} else {
rc = -EINVAL;
}
break;
case MQTT_PUBLISH:
rc = mqtt_rx_publish(ctx, data);
@ -787,9 +733,6 @@ int mqtt_subscriber_parser(struct mqtt_ctx *ctx, struct net_pkt *rx)
case MQTT_PUBREL:
rc = mqtt_rx_pubrel(ctx, data);
break;
case MQTT_PINGRESP:
rc = mqtt_rx_pubrel(ctx, data);
break;
case MQTT_SUBACK:
rc = mqtt_rx_suback(ctx, data);
break;
@ -838,17 +781,7 @@ int mqtt_init(struct mqtt_ctx *ctx, enum mqtt_app app_type)
ctx->connected = 0;
ctx->app_type = app_type;
switch (ctx->app_type) {
case MQTT_APP_PUBLISHER:
ctx->rcv = mqtt_publisher_parser;
break;
case MQTT_APP_SUBSCRIBER:
ctx->rcv = mqtt_subscriber_parser;
break;
default:
return -EINVAL;
}
ctx->rcv = mqtt_parser;
/* Install the receiver callback, timeout is set to K_NO_WAIT.
* In this case, no return code is evaluated.