We always put braces around 'if' blocks. 😉 + if (0 == memcmp(&ptt->cid[i], &cid, sizeof(cid))) + return 1;
/Anders -----Ursprungligt meddelande----- Från: Richard Cochran [mailto:richardcoch...@gmail.com] Skickat: den 1 mars 2018 20:35 Till: linuxptp-devel@lists.sourceforge.net Ämne: [Linuxptp-devel] [PATCH RFC V2 10/10] port: Accept multiple TLVs on receive. Path trace TLVs and Follow-Up info TLVs might be mixed in among other random TLVs. This patch fixes the parsing code to find these TLVs even when multiple other TLVs are present. Signed-off-by: Richard Cochran <richardcoch...@gmail.com> --- port.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/port.c b/port.c index c9f9c91..606f471 100644 --- a/port.c +++ b/port.c @@ -452,16 +452,18 @@ static int follow_up_info_append(struct port *p, struct ptp_message *m) static struct follow_up_info_tlv *follow_up_info_extract(struct ptp_message *m) { struct follow_up_info_tlv *f; - f = (struct follow_up_info_tlv *) m->follow_up.suffix; + struct tlv_extra *extra; - if (m->tlv_count != 1 || - f->type != TLV_ORGANIZATION_EXTENSION || - f->length != sizeof(*f) - sizeof(f->type) - sizeof(f->length) || -// memcmp(f->id, ieee8021_id, sizeof(ieee8021_id)) || - f->subtype[0] || f->subtype[1] || f->subtype[2] != 1) { - return NULL; + TAILQ_FOREACH(extra, &m->tlv_list, list) { + f = (struct follow_up_info_tlv *) extra->tlv; + if (f->type == TLV_ORGANIZATION_EXTENSION && + f->length == sizeof(*f) - sizeof(f->type) - sizeof(f->length) && +// memcmp(f->id, ieee8021_id, sizeof(ieee8021_id)) && + !f->subtype[0] && !f->subtype[1] && f->subtype[2] == 1) { + return f; + } } - return f; + return NULL; } static void free_foreign_masters(struct port *p) @@ -529,8 +531,9 @@ static int path_trace_append(struct port *p, struct ptp_message *m, static int path_trace_ignore(struct port *p, struct ptp_message *m) { - struct ClockIdentity cid; struct path_trace_tlv *ptt; + struct ClockIdentity cid; + struct tlv_extra *extra; int i, cnt; if (!p->path_trace_enabled) { @@ -539,18 +542,17 @@ static int path_trace_ignore(struct port *p, struct ptp_message *m) if (msg_type(m) != ANNOUNCE) { return 0; } - if (m->tlv_count != 1) { - return 1; - } - ptt = (struct path_trace_tlv *) m->announce.suffix; - if (ptt->type != TLV_PATH_TRACE) { - return 1; - } - cnt = path_length(ptt); - cid = clock_identity(p->clock); - for (i = 0; i < cnt; i++) { - if (0 == memcmp(&ptt->cid[i], &cid, sizeof(cid))) - return 1; + TAILQ_FOREACH(extra, &m->tlv_list, list) { + ptt = (struct path_trace_tlv *) extra->tlv; + if (ptt->type != TLV_PATH_TRACE) { + continue; + } + cnt = path_length(ptt); + cid = clock_identity(p->clock); + for (i = 0; i < cnt; i++) { + if (0 == memcmp(&ptt->cid[i], &cid, sizeof(cid))) + return 1; + } } return 0; } -- 2.11.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxptp-devel mailing list Linuxptp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxptp-devel ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Linuxptp-devel mailing list Linuxptp-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxptp-devel
