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

pkg/paho-mqtt: add support for gnrc #17004

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
+718 −27
Open

pkg/paho-mqtt: add support for gnrc #17004

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
72a4370
tests: add tests for pkg/paho-mqtt
vera Oct 15, 2021
67f9c7f
pkg/paho-mqtt: add support for gnrc
vera Oct 18, 2021
3e93d65
fixup! pkg/paho-mqtt: add support for gnrc
vera Oct 19, 2021
2dc9f10
fixup! tests: add tests for pkg/paho-mqtt
vera Oct 19, 2021
3ceb415
fixup! pkg/paho-mqtt: add support for gnrc
vera Dec 7, 2021
cae67df
fixup! pkg/paho-mqtt: add support for gnrc
vera Dec 7, 2021
5e35cb3
fixup! pkg/paho-mqtt: add support for gnrc
vera Dec 7, 2021
a0d0f64
fixup! pkg/paho-mqtt: add support for gnrc
vera Dec 16, 2021
51c0a1b
fixup! tests: add tests for pkg/paho-mqtt
vera Dec 16, 2021
c0dbef1
fixup! tests: add tests for pkg/paho-mqtt
vera Dec 16, 2021
ad3b13e
fixup! pkg/paho-mqtt: add support for gnrc
vera Dec 16, 2021
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
Prev Previous commit
fixup! pkg/paho-mqtt: add support for gnrc
  • Loading branch information
@vera
vera committed Dec 16, 2021
commit ad3b13e8d7f8fdac9eea73263d9066326196355a
13 changes: 3 additions & 10 deletions pkg/paho-mqtt/contrib/riot_iface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
#define ENABLE_DEBUG 0
#include "debug.h"

#define IP_MAX_LEN_ADDRESS (39) /*IPv6 max length */

#ifndef TSRB_MAX_SIZE
#define TSRB_MAX_SIZE (1024)
#endif
Expand Down Expand Up @@ -127,19 +125,14 @@ int NetworkConnect(Network *n, char *addr_ip, int port)
{
int ret =-1;
sock_tcp_ep_t remote = SOCK_IPV4_EP_ANY;
char _local_ip[IP_MAX_LEN_ADDRESS];

strncpy(_local_ip, addr_ip, sizeof(_local_ip));
if (IS_USED(MODULE_IPV4_ADDR) &&
ipv4_addr_from_str((ipv4_addr_t *)&remote.addr, _local_ip)) {
ipv4_addr_from_str((ipv4_addr_t *)&remote.addr, addr_ip)) {
remote.port = port;
}
else if (IS_USED(MODULE_IPV6_ADDR)) {
/* ipvN_addr_from_str modifies input buffer */
strncpy(_local_ip, addr_ip, sizeof(_local_ip));

if (IS_USED(MODULE_GNRC)) {
char *iface = ipv6_addr_split_iface(_local_ip);
char *iface = ipv6_addr_split_iface(addr_ip);
if ((!iface) && (gnrc_netif_numof() == 1)) {
remote.netif = gnrc_netif_iter(NULL)->pid;
}
Expand All @@ -148,7 +141,7 @@ int NetworkConnect(Network *n, char *addr_ip, int port)
}
}

if (ipv6_addr_from_str((ipv6_addr_t *)&remote.addr, _local_ip)) {
if (ipv6_addr_from_str((ipv6_addr_t *)&remote.addr, addr_ip)) {
remote.port = port;
remote.family = AF_INET6;
}
Expand Down