summaryrefslogtreecommitdiffstats
path: root/src/vnet/lisp-cp
diff options
context:
space:
mode:
Diffstat (limited to 'src/vnet/lisp-cp')
-rw-r--r--src/vnet/lisp-cp/packets.c65
-rw-r--r--src/vnet/lisp-cp/packets.h45
2 files changed, 5 insertions, 105 deletions
diff --git a/src/vnet/lisp-cp/packets.c b/src/vnet/lisp-cp/packets.c
index 3a4f421b02a..f24024f1500 100644
--- a/src/vnet/lisp-cp/packets.c
+++ b/src/vnet/lisp-cp/packets.c
@@ -15,7 +15,7 @@
#include <vnet/lisp-cp/packets.h>
#include <vnet/lisp-cp/lisp_cp_messages.h>
-#include <vnet/ip/udp_packet.h>
+#include <vnet/udp/udp_packet.h>
/* Returns IP ID for the packet */
/* static u16 ip_id = 0;
@@ -142,61 +142,6 @@ pkt_push_udp (vlib_main_t * vm, vlib_buffer_t * b, u16 sp, u16 dp)
}
void *
-pkt_push_ipv4 (vlib_main_t * vm, vlib_buffer_t * b, ip4_address_t * src,
- ip4_address_t * dst, int proto)
-{
- ip4_header_t *ih;
-
- /* make some room */
- ih = vlib_buffer_push_uninit (b, sizeof (ip4_header_t));
-
- ih->ip_version_and_header_length = 0x45;
- ih->tos = 0;
- ih->length = clib_host_to_net_u16 (vlib_buffer_length_in_chain (vm, b));
-
- /* iph->fragment_id = clib_host_to_net_u16(get_IP_ID ()); */
-
- /* TODO: decide if we allow fragments in case of control */
- ih->flags_and_fragment_offset = clib_host_to_net_u16 (IP_DF);
- ih->ttl = 255;
- ih->protocol = proto;
- ih->src_address.as_u32 = src->as_u32;
- ih->dst_address.as_u32 = dst->as_u32;
-
- ih->checksum = ip4_header_checksum (ih);
- return ih;
-}
-
-void *
-pkt_push_ipv6 (vlib_main_t * vm, vlib_buffer_t * b, ip6_address_t * src,
- ip6_address_t * dst, int proto)
-{
- ip6_header_t *ip6h;
- u16 payload_length;
-
- /* make some room */
- ip6h = vlib_buffer_push_uninit (b, sizeof (ip6_header_t));
-
- ip6h->ip_version_traffic_class_and_flow_label =
- clib_host_to_net_u32 (0x6 << 28);
-
- /* calculate ip6 payload length */
- payload_length = vlib_buffer_length_in_chain (vm, b);
- payload_length -= sizeof (*ip6h);
-
- ip6h->payload_length = clib_host_to_net_u16 (payload_length);
-
- ip6h->hop_limit = 0xff;
- ip6h->protocol = proto;
- clib_memcpy (ip6h->src_address.as_u8, src->as_u8,
- sizeof (ip6h->src_address));
- clib_memcpy (ip6h->dst_address.as_u8, dst->as_u8,
- sizeof (ip6h->src_address));
-
- return ip6h;
-}
-
-void *
pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
ip_address_t * dst, u32 proto)
{
@@ -210,12 +155,12 @@ pkt_push_ip (vlib_main_t * vm, vlib_buffer_t * b, ip_address_t * src,
switch (ip_addr_version (src))
{
case IP4:
- return pkt_push_ipv4 (vm, b, &ip_addr_v4 (src), &ip_addr_v4 (dst),
- proto);
+ return vlib_buffer_push_ip4 (vm, b, &ip_addr_v4 (src),
+ &ip_addr_v4 (dst), proto);
break;
case IP6:
- return pkt_push_ipv6 (vm, b, &ip_addr_v6 (src), &ip_addr_v6 (dst),
- proto);
+ return vlib_buffer_push_ip6 (vm, b, &ip_addr_v6 (src),
+ &ip_addr_v6 (dst), proto);
break;
}
diff --git a/src/vnet/lisp-cp/packets.h b/src/vnet/lisp-cp/packets.h
index 212a1d78163..f6da3bf4b87 100644
--- a/src/vnet/lisp-cp/packets.h
+++ b/src/vnet/lisp-cp/packets.h
@@ -26,51 +26,6 @@ void *pkt_push_udp_and_ip (vlib_main_t * vm, vlib_buffer_t * b, u16 sp,
void *pkt_push_ecm_hdr (vlib_buffer_t * b);
-always_inline u8 *
-vlib_buffer_get_tail (vlib_buffer_t * b)
-{
- return b->data + b->current_data + b->current_length;
-}
-
-always_inline void *
-vlib_buffer_put_uninit (vlib_buffer_t * b, u8 size)
-{
- /* XXX should make sure there's enough space! */
- void *p = vlib_buffer_get_tail (b);
- b->current_length += size;
- return p;
-}
-
-always_inline void *
-vlib_buffer_push_uninit (vlib_buffer_t * b, u8 size)
-{
- /* XXX should make sure there's enough space! */
- ASSERT (b->current_data >= size);
- b->current_data -= size;
- b->current_length += size;
-
- return vlib_buffer_get_current (b);
-}
-
-always_inline void *
-vlib_buffer_make_headroom (vlib_buffer_t * b, u8 size)
-{
- /* XXX should make sure there's enough space! */
- b->current_data += size;
- return vlib_buffer_get_current (b);
-}
-
-always_inline void *
-vlib_buffer_pull (vlib_buffer_t * b, u8 size)
-{
- if (b->current_length < size)
- return 0;
-
- void *data = vlib_buffer_get_current (b);
- vlib_buffer_advance (b, size);
- return data;
-}
-
/* *INDENT-ON* */
/*