foreign-master: rename a field, fix uses

I renamed port_identity to port_id so the compiler helped me. Then, since both fields are used at the same time, compare/copy them in a single shot. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

foreign-master: rename a field, fix uses
I renamed port_identity to port_id so the compiler helped me. Then, since both fields are used at the same time, compare/copy them in a single shot. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
5e11be67 · Alessandro Rubini · 8d253456 · 5e11be67 · 5e11be67
Commit 5e11be67 authored Mar 07, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 14 deletions

pp-instance.h include/ppsi/pp-instance.h +1 -1

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

No files found.
--- a/include/ppsi/pp-instance.h
+++ b/include/ppsi/pp-instance.h
@@ -59,7 +59,7 @@ struct pp_channel {
 * Foreign master record. Used to manage Foreign masters
 */
 struct pp_frgn_master {
-	PortIdentity port_identity;
+	PortIdentity port_id;	/* used to identify old/new masters */
 	//This one is not in the spec
 	MsgAnnounce ann;
 	MsgHeader hdr;

--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -84,14 +84,10 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)

 	/* Check if foreign master is already known */
 	for (i = 0; i < ppi->number_foreign_records; i++) {
-		if (!memcmp(&hdr->sourcePortIdentity.clockIdentity,
-			    &ppi->frgn_master[j].port_identity.
-			    clockIdentity,
-			    PP_CLOCK_IDENTITY_LENGTH) &&
-		    (hdr->sourcePortIdentity.portNumber ==
-		     ppi->frgn_master[j].port_identity.portNumber)) {
-			/* Foreign Master is already in Foreign master data set
-			 */
+		if (!memcmp(&hdr->sourcePortIdentity,
+			    &ppi->frgn_master[j].port_id,
+			    sizeof(hdr->sourcePortIdentity))) {
+			/* already in Foreign master data set */
 			found = 1;
 			msg_copy_header(&ppi->frgn_master[j].hdr, hdr);
 			msg_unpack_announce(buf, &ppi->frgn_master[j].ann);
@@ -112,11 +108,8 @@ static void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
 	j = ppi->foreign_record_i;

 	/* Copy new foreign master data set from announce message */
-	memcpy(&ppi->frgn_master[j].port_identity.clockIdentity,
-		&hdr->sourcePortIdentity.clockIdentity,
-		PP_CLOCK_IDENTITY_LENGTH);
-	ppi->frgn_master[j].port_identity.portNumber =
-		hdr->sourcePortIdentity.portNumber;
+	memcpy(&ppi->frgn_master[j].port_id,
+	       &hdr->sourcePortIdentity, sizeof(hdr->sourcePortIdentity));

 	/*
 	 * header and announce field of each Foreign Master are