diff options
| author | Dinesh Dutt <5016467+ddutt@users.noreply.github.com> | 2019-08-12 06:19:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 06:19:54 -0700 |
| commit | 642b081be34f151a6d1bf7bf5c1586bc8561702c (patch) | |
| tree | e0705cd29d73db5e3df71a57d03ec350af936905 /lib/stream.c | |
| parent | dcc1615e1b5f8f439f01fd9e61845f377d28a07a (diff) | |
| parent | 595ad74b772ef1e32a1c238e6bc8ae7eb447cd27 (diff) | |
Merge pull request #1 from FRRouting/master
Merging from upstream tree
Diffstat (limited to 'lib/stream.c')
| -rw-r--r-- | lib/stream.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/stream.c b/lib/stream.c index 6c187bd359..c67bc3c993 100644 --- a/lib/stream.c +++ b/lib/stream.c @@ -904,20 +904,30 @@ int stream_put_prefix(struct stream *s, struct prefix *p) /* Put NLRI with label */ int stream_put_labeled_prefix(struct stream *s, struct prefix *p, - mpls_label_t *label) + mpls_label_t *label, int addpath_encode, + uint32_t addpath_tx_id) { size_t psize; + size_t psize_with_addpath; uint8_t *label_pnt = (uint8_t *)label; STREAM_VERIFY_SANE(s); psize = PSIZE(p->prefixlen); + psize_with_addpath = psize + (addpath_encode ? 4 : 0); - if (STREAM_WRITEABLE(s) < (psize + 3)) { + if (STREAM_WRITEABLE(s) < (psize_with_addpath + 3)) { STREAM_BOUND_WARN(s, "put"); return 0; } + if (addpath_encode) { + s->data[s->endp++] = (uint8_t)(addpath_tx_id >> 24); + s->data[s->endp++] = (uint8_t)(addpath_tx_id >> 16); + s->data[s->endp++] = (uint8_t)(addpath_tx_id >> 8); + s->data[s->endp++] = (uint8_t)addpath_tx_id; + } + stream_putc(s, (p->prefixlen + 24)); stream_putc(s, label_pnt[0]); stream_putc(s, label_pnt[1]); |