colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lldp: drop _access* macros

Browse Source 
Use unaligned access functions instead where needed.
This commit is contained in:
Beniamino Galvani
2019-03-26 18:34:53 +01:00
parent 579373a5df
commit a66ab735b6
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/nm-lldp-listener.c
View File

@@ -25,6 +25,7 @@
#include <net/ethernet.h> #include <net/ethernet.h>
#include "platform/nm-platform.h" #include "platform/nm-platform.h"
#include "nm-utils/unaligned.h"
#include "nm-utils.h" #include "nm-utils.h"
#include "systemd/nm-sd.h" #include "systemd/nm-sd.h"
@@ -155,21 +156,6 @@ ether_addr_equal (const struct ether_addr *a1, const struct ether_addr *a2)
return memcmp (a1, a2, ETH_ALEN) == 0; return memcmp (a1, a2, ETH_ALEN) == 0;
} }
static guint32
_access_uint8 (const void *data)
{
return *((const guint8 *) data);
}
static guint32
_access_uint16 (const void *data)
{
guint16 v;
memcpy (&v, data, sizeof (v));
return ntohs (v);
}
/*****************************************************************************/ /*****************************************************************************/
NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_lldp_attr_id_to_name, LldpAttrId, NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_lldp_attr_id_to_name, LldpAttrId,
@@ -514,15 +500,15 @@ lldp_neighbor_new (sd_lldp_neighbor *neighbor_sd, GError **error)
if (len != 2) if (len != 2)
continue; continue;
_lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PVID, _lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PVID,
_access_uint16 (data8)); unaligned_read_be16 (data8));
break; break;
case SD_LLDP_OUI_802_1_SUBTYPE_PORT_PROTOCOL_VLAN_ID: case SD_LLDP_OUI_802_1_SUBTYPE_PORT_PROTOCOL_VLAN_ID:
if (len != 3) if (len != 3)
continue; continue;
_lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS, _lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PPVID_FLAGS,
_access_uint8 (&data8[0])); data8[0]);
_lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PPVID, _lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_PPVID,
_access_uint16 (&data8[1])); unaligned_read_be16 (&data8[1]));
break; break;
case SD_LLDP_OUI_802_1_SUBTYPE_VLAN_NAME: { case SD_LLDP_OUI_802_1_SUBTYPE_VLAN_NAME: {
int l; int l;
@@ -537,7 +523,7 @@ lldp_neighbor_new (sd_lldp_neighbor *neighbor_sd, GError **error)
continue; continue;
_lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VID, _lldp_attr_set_uint32 (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VID,
_access_uint16 (&data8[0])); unaligned_read_be16 (&data8[0]));
_lldp_attr_set_str_ptr (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME, _lldp_attr_set_str_ptr (neigh->attrs, LLDP_ATTR_ID_IEEE_802_1_VLAN_NAME,
&data8[3], l); &data8[3], l);
break; break;