bmc: port id compare made architecture independent

Since the portnumber is a 16bit value, memcp is not given to be correct on all architectures depending on the endines

bmc: port id compare made architecture independent
Since the portnumber is a 16bit value, memcp is not given to be correct on all architectures depending on the endines
2b038cd3 · Sven Meier · 8249256f · 2b038cd3 · 2b038cd3 · 2b038cd3
Commit 2b038cd3 authored Aug 15, 2017 by Sven Meier
Showing with 15 additions and 13 deletions

bmc.c proto-standard/bmc.c +7 -1

common-fun.c proto-standard/common-fun.c +4 -6

state-passive.c proto-standard/state-passive.c +2 -3

state-slave.c proto-standard/state-slave.c +2 -3

No files found.
--- a/proto-standard/bmc.c
+++ b/proto-standard/bmc.c
@@ -312,7 +312,13 @@ int bmc_idcmp(struct ClockIdentity *a, struct ClockIdentity *b)
 int bmc_pidcmp(struct PortIdentity *a, struct PortIdentity *b)
 {
-	return memcmp(a, b, sizeof(*a));
+	int ret;
+	ret = bmc_idcmp(&a->clockIdentity, &b->clockIdentity);
+	if (ret != 0)
+		return ret;
+	return a->portNumber - b->portNumber;
 }
 /* compare part2 of the datasets which is the topology, fig 27, page 89 */

--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -133,9 +133,8 @@ int st_com_peer_handle_pres(struct pp_instance *ppi, void *buf,
 	msg_unpack_pdelay_resp(buf, &resp);
-	if ((memcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
+	if ((bmc_idcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
-		    &resp.requestingPortIdentity.clockIdentity,
+		    &resp.requestingPortIdentity.clockIdentity) == 0) &&
-		    PP_CLOCK_IDENTITY_LENGTH) == 0) &&
 	    ((ppi->sent_seq[PPM_PDELAY_REQ]) ==
 	     hdr->sequenceId) &&
 	    (DSPOR(ppi)->portIdentity.portNumber ==
@@ -179,9 +178,8 @@ int st_com_peer_handle_pres_followup(struct pp_instance *ppi,
 	msg_unpack_pdelay_resp_follow_up(buf, &respFllw);
-	if ((memcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
+	if ((bmc_idcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
-		    &respFllw.requestingPortIdentity.clockIdentity,
+		    &respFllw.requestingPortIdentity.clockIdentity) == 0) &&
-		    PP_CLOCK_IDENTITY_LENGTH) == 0) &&
 	    ((ppi->sent_seq[PPM_PDELAY_REQ]) ==
 	     hdr->sequenceId) &&
 	    (DSPOR(ppi)->portIdentity.portNumber ==

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -35,9 +35,8 @@ static int passive_handle_announce(struct pp_instance *ppi, void *buf, int len)
 	if (ret)
 		return ret;
-	if (!memcmp(&hdr->sourcePortIdentity,
+	if (!bmc_pidcmp(&hdr->sourcePortIdentity,
-		&erbest->sourcePortIdentity,
+		&erbest->sourcePortIdentity)) {
-		sizeof(PortIdentity))) {
 		/* 
 		 * 9.2.6.11 d) reset timeout when an announce
 		 * is received from the clock putting it into passive (erbest)

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -123,9 +123,8 @@ static int slave_handle_response(struct pp_instance *ppi, void *buf,
 	msg_unpack_delay_resp(buf, &resp);
-	if ((memcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
+	if ((bmc_idcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
-		    &resp.requestingPortIdentity.clockIdentity,
+		    &resp.requestingPortIdentity.clockIdentity) != 0) ||
-		    PP_CLOCK_IDENTITY_LENGTH) != 0) ||
 	    ((ppi->sent_seq[PPM_DELAY_REQ]) !=
 	     hdr->sequenceId) ||
 	    (DSPOR(ppi)->portIdentity.portNumber !=