diff options
| author | paul <paul> | 2005-02-09 15:51:56 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-02-09 15:51:56 +0000 |
| commit | 9985f83ce7102f64b15f744b60320f8d14a8a5ff (patch) | |
| tree | 344629bdc2b4a7d53b8d7ca1705c9be2ca282d18 /isisd/isis_tlv.c | |
| parent | 083ee9d9cdbf72a452b9af96e62d0625ea712cd9 (diff) | |
| download | quagga-9985f83ce7102f64b15f744b60320f8d14a8a5ff.tar.bz2 quagga-9985f83ce7102f64b15f744b60320f8d14a8a5ff.tar.xz | |
2005-02-09 Paul Jakma <paul.jakma@sun.com>
* (global) Update code to match stream.h changes.
stream_get_putp effectively replaced with stream_get_endp.
stream_forward renamed to stream_forward_getp.
stream_forward_endp introduced to replace some previous
setting/manual twiddling of putp by daemons.
* lib/stream.h: Remove putp. Update reference to putp with endp.
Add stream_forward_endp, which daemons were doing manually.
Rename stream_forward to stream_forward_getp.
lib/stream.c: Remove/update references to putp.
introduce stream_forward_endp.
Diffstat (limited to 'isisd/isis_tlv.c')
| -rw-r--r-- | isisd/isis_tlv.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/isisd/isis_tlv.c b/isisd/isis_tlv.c index 84f36c93..bc653632 100644 --- a/isisd/isis_tlv.c +++ b/isisd/isis_tlv.c @@ -751,7 +751,7 @@ int add_tlv (u_char tag, u_char len, u_char * value, struct stream *stream) { - if (STREAM_SIZE (stream) - stream_get_putp (stream) < (unsigned) len + 2) + if (STREAM_SIZE (stream) - stream_get_endp (stream) < (unsigned) len + 2) { zlog_warn ("No room for TLV of type %d", tag); return ISIS_WARNING; @@ -1065,7 +1065,6 @@ tlv_add_ipv6_reachs (struct list *ipv6_reachs, struct stream *stream) int tlv_add_padding (struct stream *stream) { - unsigned long putp, endp; int fullpads, i, left; /* @@ -1078,15 +1077,10 @@ tlv_add_padding (struct stream *stream) goto err; if (!stream_putc (stream, (u_char) 255)) /* LENGHT */ goto err; - endp = stream_get_endp (stream); - putp = stream_get_putp (stream); - if (putp != endp) - zlog_warn ("tvl_add_padding endp %ld while putp %ld", endp, putp); - stream_set_putp (stream, putp + 255); /* VALUE */ - stream->endp = stream->putp; + stream_forward_endp (stream, 255); /* VALUE */ } - left = STREAM_SIZE (stream) - stream_get_putp (stream); + left = STREAM_SIZE (stream) - stream_get_endp (stream); if (left < 2) return ISIS_OK; @@ -1100,8 +1094,7 @@ tlv_add_padding (struct stream *stream) stream_putc (stream, PADDING); stream_putc (stream, left - 2); - stream_set_putp (stream, stream_get_putp (stream) + left - 2); - stream->endp = stream->putp; + stream_forward_endp (stream, left - 2); return ISIS_OK; |