fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Netman:Data in network order

Browse Source
This commit is contained in:
David Sidrane 2020-10-15 09:29:41 -07:00 committed by Lorenz Meier
parent d22eb76187
commit 39c6229c37
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/systemcmds/netman/netman.cpp
View File

@ -56,7 +56,7 @@ constexpr char DEFAULT_NETMAN_CONFIG[] = "/fs/microsd/net.cfg";
# define DEFAULT_PROTO IPv4PROTO_FALLBACK
# define DEFAULT_IP 0XC0A80003 // 192.168.0.3
#else
# define DEFAULT_PROTO IPv4PROTO_STATIC
# define DEFAULT_PROTO IPv4PROTO_STATIC
# define DEFAULT_IP CONFIG_NETINIT_IPADDR
#endif
#define DEFAULT_NETMASK CONFIG_NETINIT_NETMASK
@ -206,23 +206,21 @@ public:
if (rv == -EINVAL ||
(rv == OK && (ipcfg.proto > IPv4PROTO_FALLBACK || ipcfg.ipaddr == 0xffffffff))) {
// Build a default
ipcfg.ipaddr = DEFAULT_IP;
ipcfg.netmask = DEFAULT_NETMASK;
ipcfg.router = DEFAULT_ROUTER;
ipcfg.dnsaddr = DEFAULT_DNS;
ipcfg.ipaddr = HTONL(DEFAULT_IP);
ipcfg.netmask = HTONL(DEFAULT_NETMASK);
ipcfg.router = HTONL(DEFAULT_ROUTER);
ipcfg.dnsaddr = HTONL(DEFAULT_DNS);
ipcfg.proto = DEFAULT_PROTO;
rv = ENOENT;
}
device.set_name(netdev);
*this = ipcfg;
hton();
return rv;
}
int write()
{
ntoh();
struct ipv4cfg_s ipcfg;
ipcfg.proto = proto.e;
ipcfg.ipaddr = ipaddr.u;
@ -231,28 +229,6 @@ public:
ipcfg.dnsaddr = dnsaddr.u;
return ipcfg_write(device.name(), (FAR struct ipcfg_s *) &ipcfg, AF_INET);
}
void hton()
{
/* Store them in network order */
netmask.l = htonl(netmask.l);
ipaddr.l = htonl(ipaddr.l);
router.l = htonl(router.l);
dnsaddr.l = htonl(dnsaddr.l);
}
void ntoh()
{
/* Store them in host order */
netmask.l = ntohl(netmask.l);
ipaddr.l = ntohl(ipaddr.l);
router.l = ntohl(router.l);
dnsaddr.l = ntohl(dnsaddr.l);
}
};
int save(const char *path, const char *netdev)