Skip to content

Commit 0c16e7e

Browse files
committed
refactor(mbedTLS): fix warnings emitted when compiling mbedTLS
Fix the code for which compiler emitted warnings during the build for `mbedTLS` and `ESP_PLATFORM=1` Closes #213
1 parent 6c93eb5 commit 0c16e7e

File tree

5 files changed

+21
-12
lines changed

5 files changed

+21
-12
lines changed

core/pubnub_sync_subscribe_loop.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ struct pubnub_subloop_descriptor pubnub_subloop_define(pubnub_t *p, char const *
1313
struct pubnub_subloop_descriptor pubnub_sync_subloop_define(pubnub_t *p, char const *channel)
1414
#endif
1515
{
16-
struct pubnub_subloop_descriptor rslt = { p, channel };
16+
struct pubnub_subloop_descriptor rslt;
17+
rslt.pbp = p;
18+
rslt.channel = channel;
1719
rslt.options = pubnub_subscribe_defopts();
1820

1921
return rslt;

freertos/pbpal_resolv_and_connect_freertos_tcp.c

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
enum pbpal_resolv_n_connect_result pbpal_resolv_and_connect(pubnub_t *pb)
1818
{
19-
struct sockaddr addr;
2019

2120
PUBNUB_ASSERT(pb_valid_ctx_ptr(pb));
2221
PUBNUB_ASSERT_OPT((pb->state == PBS_READY) || (pb->state == PBS_WAIT_DNS_SEND) || (pb->state == PBS_WAIT_DNS_RCV));
23-
24-
addr.sin_port = htons(HTTP_PORT);
2522

2623
#if ESP_PLATFORM
24+
struct sockaddr_in addr;
25+
addr.sin_port = htons(HTTP_PORT);
26+
2727
PUBNUB_LOG_TRACE("pbpal_resolv_and_connect: gethostbyname(%s)\n",
2828
PUBNUB_ORIGIN_SETTABLE ? pb->origin : PUBNUB_ORIGIN);
2929

@@ -39,12 +39,23 @@ enum pbpal_resolv_n_connect_result pbpal_resolv_and_connect(pubnub_t *pb)
3939
PUBNUB_LOG_ERROR("pbpal_resolv_and_connect: no address found!\n");
4040
return pbpal_resolv_failed_processing;
4141
}
42+
43+
pb->pal.socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
44+
if (pb->pal.socket == SOCKET_INVALID) {
45+
return pbpal_connect_resource_failure;
46+
}
47+
if (connect(pb->pal.socket, (const struct sockaddr*) &addr, sizeof addr) != 0) {
48+
closesocket(pb->pal.socket);
49+
pb->pal.socket = SOCKET_INVALID;
50+
return pbpal_connect_failed;
51+
}
4252
#else
53+
struct sockaddr addr;
54+
addr.sin_port = htons(HTTP_PORT);
4355
addr.sin_addr = gethostbyname(PUBNUB_ORIGIN_SETTABLE ? pb->origin : PUBNUB_ORIGIN);
4456
if (addr.sin_addr == 0) {
4557
return pbpal_resolv_failed_processing;
4658
}
47-
#endif
4859

4960
pb->pal.socket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
5061
if (pb->pal.socket == SOCKET_INVALID) {
@@ -55,6 +66,7 @@ enum pbpal_resolv_n_connect_result pbpal_resolv_and_connect(pubnub_t *pb)
5566
pb->pal.socket = SOCKET_INVALID;
5667
return pbpal_connect_failed;
5768
}
69+
#endif
5870

5971
{
6072
TickType_t tmval = pdMS_TO_TICKS(pb->transaction_timeout_ms);

freertos/pubnub_assert_freertos.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,7 @@ void pubnub_assert_handler_abort(char const *s, char const *file, long line)
5959
*/
6060
taskDISABLE_INTERRUPTS();
6161
{
62-
/** In the debugger, user can change the value of this
63-
variable to get out of the loop and continue processing.
64-
*/
65-
volatile int stay_blocked = 1;
66-
while (stay_blocked) {
62+
for (;;) {
6763
#if INCLUDE_vTaskDelay
6864
vTaskDelay(pdMS_TO_TICKS(1000));
6965
#endif

freertos/pubnub_internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ typedef Socket_t pb_socket_t;
4545
#define socket(family, type, protocol) lwip_socket((family), (type), (protocol))
4646
#define socket_connect(socket, addr, addrlen) lwip_connect((socket), (addr), (addrlen))
4747
#define socket_setsockopt(socket, level, optname, optval, optlen) lwip_setsockopt((socket), (level), (optname), (optval), (optlen))
48-
#define sockaddr sockaddr_in
4948

5049
typedef int pb_socket_t;
5150

mbedtls/pbpal_mbedtls.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#endif
2727

2828

29-
static void pbntf_setup(void);
29+
static void pbntf_setup(pubnub_t* pb);
3030
static void options_setup(pubnub_t* pb);
3131
static void buffer_setup(pubnub_t* pb);
3232

0 commit comments

Comments
 (0)