Skip to content
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

Fix stat reset for ping response #414

Merged
merged 3 commits into from
Jan 29, 2025
Merged

Fix stat reset for ping response #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0941d6a
Fix stat reset for ping response
embhorn Jan 21, 2025
d478495
Fix Zephyr test build issue
embhorn Jan 21, 2025
595f202
Set workflow tests to use ubuntu-22.04
embhorn Jan 21, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CIFuzz
on: [pull_request]
jobs:
Fuzzing:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 10
steps:
- name: Build Fuzzers
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cmake-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
# Install cmake
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-Espressif.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
espressif_latest:
name: latest Docker container
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# This should be a safe limit for the tests to run.
timeout-minutes: 12
container:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fsanitize-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 5
env:
WOLFMQTT_NO_EXTERNAL_BROKER_TESTS: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mqtt-sn-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-check-curl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 5

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
config:
- zephyr-ref: v3.4.0
zephyr-sdk: 0.16.1
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 20
steps:

Expand All @@ -37,7 +37,7 @@ jobs:
libglib2.0-dev libgtk2.0-0 liblocale-gettext-perl libncurses5-dev libpcap-dev \
libpopt0 libsdl1.2-dev libsdl2-dev libssl-dev libtool libtool-bin locales make \
net-tools ninja-build openssh-client parallel pkg-config python3-dev python3-pip \
python3-ply python3-setuptools python-is-python3 qemu rsync socat srecord sudo \
python3-ply python3-setuptools python-is-python3 qemu-kvm rsync socat srecord sudo \
texinfo unzip wget ovmf xz-utils

- name: Install west
Expand Down
22 changes: 14 additions & 8 deletions src/mqtt_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,7 +1209,13 @@ static int MqttClient_WaitType(MqttClient *client, void *packet_obj,
client->packet.buf_len, packet_type, packet_id);
#endif

mms_stat->read = MQTT_MSG_PAYLOAD;
/* Ping response is special case, no payload */
if (packet_type != MQTT_PACKET_TYPE_PING_RESP) {
mms_stat->read = MQTT_MSG_PAYLOAD;
}
else {
mms_stat->read = MQTT_MSG_WAIT;
}
}
FALL_THROUGH;

Expand Down Expand Up @@ -1446,13 +1452,6 @@ static int MqttClient_WaitType(MqttClient *client, void *packet_obj,
break;
} /* switch (mms_stat->ack) */

#ifdef WOLFMQTT_DEBUG_CLIENT
if (rc != MQTT_CODE_CONTINUE) {
PRINTF("MqttClient_WaitType: rc %d, state %d-%d-%d",
rc, mms_stat->read, mms_stat->write, mms_stat->ack);
}
#endif

/* no data read or ack done, then reset state */
if (mms_stat->read == MQTT_MSG_WAIT) {
mms_stat->read = MQTT_MSG_BEGIN;
Expand Down Expand Up @@ -1507,6 +1506,13 @@ static int MqttClient_WaitType(MqttClient *client, void *packet_obj,
MQTT_TRACE_MSG("Wait Again");
goto wait_again;
}
#ifdef WOLFMQTT_DEBUG_CLIENT
if (rc != MQTT_CODE_CONTINUE) {
PRINTF("MqttClient_WaitType: rc %d, state %d-%d-%d",
rc, mms_stat->read, mms_stat->write, mms_stat->ack);
}
#endif


return rc;
}
Expand Down