diff options
| author | paul <paul> | 2005-02-09 15:51:56 +0000 |
|---|---|---|
| committer | paul <paul> | 2005-02-09 15:51:56 +0000 |
| commit | 603817b4ff417aa7352950f9603f2585349181ec (patch) | |
| tree | 030f59a5ce51faeb5bdcc36f28ab75c4b0bce9c3 /zebra/irdp_packet.c | |
| parent | a5468e7f8313194f4b964db666a54b510b03ab42 (diff) | |
| download | quagga-603817b4ff417aa7352950f9603f2585349181ec.tar.bz2 quagga-603817b4ff417aa7352950f9603f2585349181ec.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 'zebra/irdp_packet.c')
| -rw-r--r-- | zebra/irdp_packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
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; |