Skip to content

os/: Add IPv6 multicast support and fix BLE callback #7273

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

Open
abhinav-s235 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

os/: Add IPv6 multicast support and fix BLE callback #7273

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
2 changes: 1 addition & 1 deletion os/board/rtl8730e/src/component/bluetooth/example/ble_peripheral/ble_tizenrt_service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ T_APP_RESULT ble_tizenrt_srv_callback(uint8_t event, void *p_data)

if (p_cha_info->cb)
{
p_cha_info->cb(TRBLE_ATTR_CB_CCCD, p_cccd_ind->conn_handle, p_cha_info->abs_handle, p_cha_info->arg, p_cccd_ind->value, 0);
p_cha_info->cb(TRBLE_ATTR_CB_CCCD, p_cccd_ind->conn_handle, p_cha_info->abs_handle, p_cccd_ind->value, 0, 0);
} else {
debug_print("NULL read callback abs_handle 0x%x \n", p_cha_info->abs_handle);
}
Expand Down
1 change: 1 addition & 0 deletions os/include/tinyara/preference.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

/* Error Type of Result Value returned from Preference */
enum preference_result_error_e {
PREFERENCE_ERROR_NONE = 0,
PREFERENCE_IO_ERROR = -1,
PREFERENCE_INVALID_PARAMETER = -2,
PREFERENCE_PATH_NOT_FOUND = -3,
Expand Down
18 changes: 18 additions & 0 deletions os/net/lwip/src/api/sockets.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2743,6 +2743,24 @@ static u8_t lwip_setsockopt_impl(int s, int level, int optname, const void *optv
}
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IPV6, IPV6_V6ONLY, ..) -> %d\n", s, (netconn_get_ipv6only(sock->conn) ? 1 : 0)));
break;
case IPV6_JOIN_GROUP:
case IPV6_LEAVE_GROUP: {
err_t err_ret;
const struct ipv6_mreq *imr = (const struct ipv6_mreq *)optval;

//LWIP_SOCKOPT_CHECK_OPTLEN_CONN_PCB_TYPE(sock, optlen, struct ipv6_mreq, NETCONN_UDP_IPV6);

if (optname == IPV6_JOIN_GROUP) {
err_ret = mld6_joingroup(IP6_ADDR_ANY6, &imr->ipv6mr_multiaddr);
} else {
err_ret = mld6_leavegroup(IP6_ADDR_ANY6, &imr->ipv6mr_multiaddr);
}

if (err_ret != ERR_OK) {
err = EADDRNOTAVAIL;
}
}
break;
default:
LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_setsockopt(%d, IPPROTO_IPV6, UNIMPL: optname=0x%x, ..)\n", s, optname));
err = ENOPROTOOPT;
Expand Down
10 changes: 10 additions & 0 deletions os/net/lwip/src/include/lwip/sockets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ struct linger {
*/
#define IPV6_CHECKSUM 7 /* RFC3542: calculate and insert the ICMPv6 checksum for raw sockets. */
#define IPV6_V6ONLY 27 /* RFC3493: boolean control to restrict AF_INET6 sockets to IPv6 communications only. */
#define IPV6_JOIN_GROUP 20
#define IPV6_LEAVE_GROUP 21
#endif /* LWIP_IPV6 */

#if LWIP_UDP && LWIP_UDPLITE
Expand Down Expand Up @@ -343,6 +345,14 @@ typedef struct ip_mreq {
struct in_addr imr_multiaddr; /* IP multicast address of group */
struct in_addr imr_interface; /* local IP address of interface */
} ip_mreq;

/* Used with certain IPv6 socket options */
struct ipv6_mreq
{
struct in6_addr ipv6mr_multiaddr; /* IPv6 multicast address of group */
unsigned int ipv6mr_interface; /* Local interface index */
};

#endif /* LWIP_IGMP */

/*
Expand Down
2 changes: 1 addition & 1 deletion os/net/netmgr/netmgr_ioctl_netdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static int _netdev_getname(struct netdev *dev, void *arg)
uint8_t flag;
struct ifreq *req = (struct ifreq *)arg;
ND_NETOPS(dev, get_flag)(dev, &flag);
if ((flag & IFF_RUNNING) && req->ifr_name[0] == 0) {
if ((flag & IFF_RUNNING)) { //&& req->ifr_name[0] == 0) {/*This will provide latest running interface*/
strncpy(req->ifr_name, dev->ifname, IFNAMSIZ);
}
return 0;
Expand Down