Skip to content

lldp: Tolerate multiple management address TLVs #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thwalsh wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −17
Open

lldp: Tolerate multiple management address TLVs #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lldp/agent.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ typedef struct rxmanifest{
struct unpacked_tlv *sysname;
struct unpacked_tlv *sysdesc;
struct unpacked_tlv *syscap;
struct unpacked_tlv *mgmtadd;
} rxmanifest;

struct agentrx {
Expand Down
21 changes: 5 additions & 16 deletions lldp/rx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent)
bool msap_compare_1 = false;
bool msap_compare_2 = false;
bool good_neighbor = false;
bool tlv_stored = false;
bool tlv_stored;
int err;
struct lldp_module *np;

Expand Down Expand Up @@ -164,6 +164,7 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent)
tlv_offset = sizeof(struct l2_ethhdr); /* Points to 1st TLV */

do {
tlv_stored = false;
tlv_cnt++;
if (tlv_offset > agent->rx.sizein) {
LLDPAD_INFO("ERROR: Frame overrun!\n");
Expand Down Expand Up @@ -394,17 +395,9 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent)
}
}
if (tlv->type == TYPE_8) { /* mgmt address */
if (agent->lldpdu & RCVD_LLDP_TLV_TYPE8) {
LLDPAD_INFO("Received multiple mgmt address"
" TLVs in this LLDPDU\n");
frame_error++;
free_unpkd_tlv(tlv);
goto out;
} else {
agent->lldpdu |= RCVD_LLDP_TLV_TYPE8;
agent->rx.manifest->mgmtadd = tlv;
tlv_stored = true;
}
agent->lldpdu |= RCVD_LLDP_TLV_TYPE8;
free_unpkd_tlv(tlv);
continue;
}

/* rx per lldp module */
Expand All @@ -429,8 +422,6 @@ void rxProcessFrame(struct port *port, struct lldp_agent *agent)
free_unpkd_tlv(tlv);
agent->stats.statsTLVsUnrecognizedTotal++;
}
tlv = NULL;
tlv_stored = false;
} while(tlv_type != 0);

out:
Expand Down Expand Up @@ -687,8 +678,6 @@ void rx_change_state(struct lldp_agent *agent, u8 newstate)

void clear_manifest(struct lldp_agent *agent)
{
if (agent->rx.manifest->mgmtadd)
free_unpkd_tlv(agent->rx.manifest->mgmtadd);
if (agent->rx.manifest->syscap)
free_unpkd_tlv(agent->rx.manifest->syscap);
if (agent->rx.manifest->sysdesc)
Expand Down