From 9985f83ce7102f64b15f744b60320f8d14a8a5ff Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 9 Feb 2005 15:51:56 +0000 Subject: 2005-02-09 Paul Jakma * (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. --- zebra/irdp_packet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'zebra/irdp_packet.c') diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c index 77e559cc..2f448eca 100644 --- a/zebra/irdp_packet.c +++ b/zebra/irdp_packet.c @@ -305,11 +305,11 @@ send_packet(struct interface *ifp, icmp = (struct icmphdr *) (buf + sizeof (struct ip)); /* Merge IP header with icmp packet */ - - stream_get(icmp, s, s->putp); + assert (stream_get_endp(s) < (sizeof (buf) - sizeof (struct ip))); + stream_get(icmp, s, stream_get_endp(s)); /* icmp->checksum is already calculated */ - ip->ip_len = sizeof(struct ip) + s->putp; + ip->ip_len = sizeof(struct ip) + stream_get_endp(s); stream_free(s); on = 1; -- cgit v1.2.1