summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ospfd/ChangeLog5
-rw-r--r--ospfd/ospf_packet.c13
2 files changed, 6 insertions, 12 deletions
diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog
index 9737854a..97684781 100644
--- a/ospfd/ChangeLog
+++ b/ospfd/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-19 Paul Jakma <paul.jakma@sun.com>
+
+ * ospf_packet.c: (ospf_stream_copy) remove
+ (ospf_packet_dup) use stream_copy instead of ospf_stream_copy
+
2005-02-17 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_packet.c: (ospf_recv_packet) If there is somehow a runt
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 038fd657..6b7a796d 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -214,17 +214,6 @@ ospf_packet_delete (struct ospf_interface *oi)
ospf_packet_free (op);
}
-struct stream *
-ospf_stream_copy (struct stream *new, struct stream *s)
-{
- new->endp = s->endp;
- new->getp = s->getp;
-
- memcpy (new->data, s->data, stream_get_endp (s));
-
- return new;
-}
-
struct ospf_packet *
ospf_packet_dup (struct ospf_packet *op)
{
@@ -236,7 +225,7 @@ ospf_packet_dup (struct ospf_packet *op)
/* Reserve space for MD5 authentication that may be added later. */
new = ospf_packet_new (stream_get_endp(op->s) + OSPF_AUTH_MD5_SIZE);
- ospf_stream_copy (new->s, op->s);
+ stream_copy (new->s, op->s);
new->dst = op->dst;
new->length = op->length;