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

lte/alt1250: Fix some bugs in alt1250 daemon #2185

Merged
merged 1 commit into from
Nov 9, 2023
Merged

lte/alt1250: Fix some bugs in alt1250 daemon #2185

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
15 changes: 15 additions & 0 deletions lte/alt1250/alt1250_netdev.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

#include "alt1250_netdev.h"

#define ALT1250_SUBNET_MASK 0xFFFFFF00 /* 255.255.255.0 this is dummy */

/****************************************************************************
* Public Functions
****************************************************************************/
Expand Down Expand Up @@ -61,6 +63,8 @@ void alt1250_netdev_ifdown(FAR struct alt1250_s *dev)
dev->net_dev.d_flags = IFF_DOWN;
#ifdef CONFIG_NET_IPv4
memset(&dev->net_dev.d_ipaddr, 0, sizeof(dev->net_dev.d_ipaddr));
memset(&dev->net_dev.d_draddr, 0, sizeof(dev->net_dev.d_draddr));
memset(&dev->net_dev.d_netmask, 0, sizeof(dev->net_dev.d_netmask));
#endif
#ifdef CONFIG_NET_IPv6
memset(&dev->net_dev.d_ipv6addr, 0, sizeof(dev->net_dev.d_ipv6addr));
Expand All @@ -85,6 +89,17 @@ void alt1250_netdev_ifup(FAR struct alt1250_s *dev, FAR lte_pdn_t *pdn)
inet_pton(AF_INET,
(FAR const char *)pdn->address[i].address,
(FAR void *)&dev->net_dev.d_ipaddr);
inet_pton(AF_INET,
(FAR const char *)pdn->address[i].address,
(FAR void *)&dev->net_dev.d_draddr);

/* The following parameters are dummy values because
* they cannot be obtained from alt1250.
*/

dev->net_dev.d_draddr = htonl((ntohl(dev->net_dev.d_draddr) &
ALT1250_SUBNET_MASK) | 1);
dev->net_dev.d_netmask = htonl(ALT1250_SUBNET_MASK);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion lte/alt1250/alt1250_usockif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ int usockif_readreqioctl(int fd, FAR struct usrsock_request_buff_s *buf)
break;
default:
dbg_alt1250("Unsupported command:0x%08lx\n", req->cmd);
return -EINVAL;
return -ENOTTY;
break;
}

Expand Down
6 changes: 5 additions & 1 deletion lte/alt1250/usock_handlers/alt1250_ioctl_ifreq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,11 @@ int usockreq_ioctl_ifreq(FAR struct alt1250_s *dev,
*usock_result = OK;
*usock_xid = request->head.xid;

if (if_req->ifr_flags & IFF_UP)
if (!dev->usock_enable)
{
*usock_result = -ENOTTY;
}
else if (if_req->ifr_flags & IFF_UP)
{
ret = do_ifup(dev, req, usock_result, usock_xid, ackinfo);
}
Expand Down
4 changes: 2 additions & 2 deletions lte/alt1250/usock_handlers/alt1250_sockethdlr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,11 +393,11 @@ int usockreq_socket(FAR struct alt1250_s *dev,
request->type != SOCK_CTRL)
{
/* If domain is AF_INET while usock_enable is false,
* set usockid to -EPROTONOSUPPORT to fallback kernel
* set usockid to -ENOTSUP to fallback kernel
* network stack.
*/

*usock_result = -EPROTONOSUPPORT;
*usock_result = -ENOTSUP;
return REP_SEND_ACK_WOFREE;
}

Expand Down