Skip to content

P
PPSi
Commit 33a26719 authored by Aurelio Colosimo's avatar Aurelio Colosimo
Browse files
Options

st_com_add_foreign function rewritten without empty if branches

parent ae289632
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 23 deletions
proto-standard/common-fun.c
View file @ 33a26719
...@@ -92,36 +92,38 @@ void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf) ...@@ -92,36 +92,38 @@ void st_com_add_foreign(struct pp_instance *ppi, unsigned char *buf)
j = (j + 1) % ppi->number_foreign_records; j = (j + 1) % ppi->number_foreign_records;
} }
/* Old foreign master */
if (found)
return;
/* New foreign master */ /* New foreign master */
if (!found) { if (ppi->number_foreign_records <
if (ppi->number_foreign_records < ppi->max_foreign_records) {
ppi->max_foreign_records) { ppi->number_foreign_records++;
ppi->number_foreign_records++; }
}
j = ppi->foreign_record_i; j = ppi->foreign_record_i;
/* Copy new foreign master data set from announce message */ /* Copy new foreign master data set from announce message */
pp_memcpy(ppi->frgn_master[j].port_identity.clockIdentity, pp_memcpy(ppi->frgn_master[j].port_identity.clockIdentity,
hdr->sourcePortIdentity.clockIdentity, hdr->sourcePortIdentity.clockIdentity,
PP_CLOCK_IDENTITY_LENGTH); PP_CLOCK_IDENTITY_LENGTH);
ppi->frgn_master[j].port_identity.portNumber = ppi->frgn_master[j].port_identity.portNumber =
hdr->sourcePortIdentity.portNumber; hdr->sourcePortIdentity.portNumber;
ppi->frgn_master[j].ann_messages = 0; ppi->frgn_master[j].ann_messages = 0;
/* /*
* header and announce field of each Foreign Master are * header and announce field of each Foreign Master are
* usefull to run Best Master Clock Algorithm * usefull to run Best Master Clock Algorithm
*/ */
msg_copy_header(&ppi->frgn_master[j].hdr, hdr); msg_copy_header(&ppi->frgn_master[j].hdr, hdr);
msg_unpack_announce(buf, &ppi->frgn_master[j].ann); msg_unpack_announce(buf, &ppi->frgn_master[j].ann);
DBGV("New foreign Master added \n"); DBGV("New foreign Master added \n");
ppi->foreign_record_i = (ppi->foreign_record_i+1) % ppi->foreign_record_i = (ppi->foreign_record_i+1) %
ppi->max_foreign_records; ppi->max_foreign_records;
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment