Skip to content
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

Jump to bottom

isisd: always link fragments to fragment #0, even when learned by CSNP #961

Merged
merged 1 commit into from
Aug 11, 2017
Merged

isisd: always link fragments to fragment #0, even when learned by CSNP #961

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
42 changes: 20 additions & 22 deletions isisd/isis_lsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,19 @@ void lsp_update(struct isis_lsp *lsp, struct isis_lsp_hdr *hdr,
lsp_insert(lsp, area->lspdb[level - 1]);
}

static void lsp_link_fragment(struct isis_lsp *lsp, struct isis_lsp *lsp0)
{
if (!LSP_FRAGMENT(lsp->hdr.lsp_id)) {
/* zero lsp -> create list to store fragments */
lsp->lspu.frags = list_new();
} else {
/* fragment -> set backpointer and add to zero lsps list */
assert(lsp0);
lsp->lspu.zero_lsp = lsp0;
listnode_add(lsp0->lspu.frags, lsp);
}
}

/* creation of LSP directly from what we received */
struct isis_lsp *lsp_new_from_recv(struct isis_lsp_hdr *hdr,
struct isis_tlvs *tlvs,
Expand All @@ -483,36 +496,22 @@ struct isis_lsp *lsp_new_from_recv(struct isis_lsp_hdr *hdr,

lsp = XCALLOC(MTYPE_ISIS_LSP, sizeof(struct isis_lsp));
lsp_update_data(lsp, hdr, tlvs, stream, area, level);

if (lsp0 == NULL) {
/*
* zero lsp -> create the list for fragments
*/
lsp->lspu.frags = list_new();
} else {
/*
* a fragment -> set the backpointer and add this to zero lsps
* frag list
*/
lsp->lspu.zero_lsp = lsp0;
listnode_add(lsp0->lspu.frags, lsp);
}
lsp_link_fragment(lsp, lsp0);

return lsp;
}

struct isis_lsp *lsp_new(struct isis_area *area, u_char *lsp_id,
uint16_t rem_lifetime, uint32_t seqno,
uint8_t lsp_bits, uint16_t checksum, int level)
uint8_t lsp_bits, uint16_t checksum,
struct isis_lsp *lsp0, int level)
{
struct isis_lsp *lsp;

lsp = XCALLOC(MTYPE_ISIS_LSP, sizeof(struct isis_lsp));
lsp->area = area;

lsp->pdu = stream_new(LLC_LEN + area->lsp_mtu);
if (LSP_FRAGMENT(lsp_id) == 0)
lsp->lspu.frags = list_new();

/* Minimal LSP PDU size */
lsp->hdr.pdu_len = ISIS_FIXED_HDR_LEN + ISIS_LSP_HDR_LEN;
Expand All @@ -523,6 +522,7 @@ struct isis_lsp *lsp_new(struct isis_area *area, u_char *lsp_id,
lsp->hdr.lsp_bits = lsp_bits;
lsp->level = level;
lsp->age_out = ZERO_AGE_LIFETIME;
lsp_link_fragment(lsp, lsp0);
put_lsp_hdr(lsp, NULL);

if (isis->debugs & DEBUG_EVENTS)
Expand Down Expand Up @@ -808,11 +808,9 @@ static struct isis_lsp *lsp_next_frag(uint8_t frag_num, struct isis_lsp *lsp0,
lsp = lsp_new(area, frag_id, lsp0->hdr.rem_lifetime, 0,
lsp_bits_generate(level, area->overload_bit,
area->attached_bit),
0, level);
0, lsp0, level);
lsp->own_lsp = 1;
lsp_insert(lsp, area->lspdb[level - 1]);
listnode_add(lsp0->lspu.frags, lsp);
lsp->lspu.zero_lsp = lsp0;
return lsp;
}

Expand Down Expand Up @@ -1158,7 +1156,7 @@ int lsp_generate(struct isis_area *area, int level)
newlsp =
lsp_new(area, lspid, rem_lifetime, seq_num,
area->is_type | area->overload_bit | area->attached_bit,
0, level);
0, NULL, level);
newlsp->area = area;
newlsp->own_lsp = 1;

Expand Down Expand Up @@ -1532,7 +1530,7 @@ int lsp_generate_pseudo(struct isis_circuit *circuit, int level)
/* RFC3787 section 4 SHOULD not set overload bit in pseudo LSPs */
lsp = lsp_new(circuit->area, lsp_id, rem_lifetime, 1,
circuit->area->is_type | circuit->area->attached_bit, 0,
level);
NULL, level);
lsp->area = circuit->area;

lsp_build_pseudo(lsp, circuit, level);
Expand Down
3 changes: 2 additions & 1 deletion isisd/isis_lsp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ int lsp_regenerate_schedule_pseudo(struct isis_circuit *circuit, int level);

struct isis_lsp *lsp_new(struct isis_area *area, uint8_t *lsp_id,
uint16_t rem_lifetime, uint32_t seq_num,
uint8_t lsp_bits, uint16_t checksum, int level);
uint8_t lsp_bits, uint16_t checksum,
struct isis_lsp *lsp0, int level);
struct isis_lsp *lsp_new_from_recv(struct isis_lsp_hdr *hdr,
struct isis_tlvs *tlvs,
struct stream *stream, struct isis_lsp *lsp0,
Expand Down
18 changes: 17 additions & 1 deletion isisd/isis_pdu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,10 +1235,26 @@ static int process_snp(uint8_t pdu_type, struct isis_circuit *circuit,
if (entry->rem_lifetime && entry->checksum
&& entry->seqno && memcmp(entry->id, isis->sysid,
ISIS_SYS_ID_LEN)) {
struct isis_lsp *lsp0 = NULL;

if (LSP_FRAGMENT(entry->id)) {
uint8_t lspid[ISIS_SYS_ID_LEN + 2];

memcpy(lspid, entry->id,
ISIS_SYS_ID_LEN + 1);
LSP_FRAGMENT(lspid) = 0;
lsp0 = lsp_search(
lspid,
circuit->area->lspdb[level - 1]);
if (!lsp0) {
zlog_debug("Got lsp frag in snp, while zero not in database");
continue;
}
}
struct isis_lsp *lsp =
lsp_new(circuit->area, entry->id,
entry->rem_lifetime, 0, 0,
entry->checksum, level);
entry->checksum, lsp0, level);
lsp_insert(lsp,
circuit->area->lspdb[level - 1]);
ISIS_FLAGS_CLEAR_ALL(lsp->SRMflags);
Expand Down