X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fpackets.c;h=46a44bdb38a410f7457bba8cc95dad68176274ae;hb=4ce07c787650c63abd50da8aeb04045c01c4b8cd;hp=8791a3ce09a244b20719a484a23d30eeaa191d21;hpb=8834f25e9983910258cd0cd1e400a14d9a664479;p=sliver-openvswitch.git diff --git a/lib/packets.c b/lib/packets.c index 8791a3ce0..46a44bdb3 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ #include "packets.h" #include #include +#include #include #include #include "byte-order.h" @@ -66,30 +67,84 @@ void compose_benign_packet(struct ofpbuf *b, const char *tag, uint16_t snap_type, const uint8_t eth_src[ETH_ADDR_LEN]) { - struct eth_header *eth; - struct llc_snap_header *llc_snap; + size_t tag_size = strlen(tag) + 1; + char *payload; - /* Compose basic packet structure. (We need the payload size to stick into - * the 802.2 header.) */ - ofpbuf_clear(b); - eth = ofpbuf_put_zeros(b, ETH_HEADER_LEN); - llc_snap = ofpbuf_put_zeros(b, LLC_SNAP_HEADER_LEN); - ofpbuf_put(b, tag, strlen(tag) + 1); /* Includes null byte. */ - ofpbuf_put(b, eth_src, ETH_ADDR_LEN); + payload = snap_compose(b, eth_addr_broadcast, eth_src, 0x002320, snap_type, + tag_size + ETH_ADDR_LEN); + memcpy(payload, tag, tag_size); + memcpy(payload + tag_size, eth_src, ETH_ADDR_LEN); +} - /* Compose 802.2 header. */ - memcpy(eth->eth_dst, eth_addr_broadcast, ETH_ADDR_LEN); - memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN); - eth->eth_type = htons(b->size - ETH_HEADER_LEN); +/* Insert VLAN header according to given TCI. Packet passed must be Ethernet + * packet. + * + * Also sets 'packet->l2' to point to the new Ethernet header. */ +void +eth_push_vlan(struct ofpbuf *packet, ovs_be16 tci) +{ + struct eth_header *eh = packet->data; + struct vlan_eth_header *veh; - /* Compose LLC, SNAP headers. */ - llc_snap->llc.llc_dsap = LLC_DSAP_SNAP; - llc_snap->llc.llc_ssap = LLC_SSAP_SNAP; - llc_snap->llc.llc_cntl = LLC_CNTL_SNAP; - memcpy(llc_snap->snap.snap_org, "\x00\x23\x20", 3); - llc_snap->snap.snap_type = htons(snap_type); + /* Insert new 802.1Q header. */ + struct vlan_eth_header tmp; + memcpy(tmp.veth_dst, eh->eth_dst, ETH_ADDR_LEN); + memcpy(tmp.veth_src, eh->eth_src, ETH_ADDR_LEN); + tmp.veth_type = htons(ETH_TYPE_VLAN); + tmp.veth_tci = tci; + tmp.veth_next_type = eh->eth_type; + + veh = ofpbuf_push_uninit(packet, VLAN_HEADER_LEN); + memcpy(veh, &tmp, sizeof tmp); + + packet->l2 = packet->data; +} + +/* Removes outermost VLAN header (if any is present) from 'packet'. + * + * 'packet->l2' must initially point to 'packet''s Ethernet header. */ +void +eth_pop_vlan(struct ofpbuf *packet) +{ + struct vlan_eth_header *veh = packet->l2; + if (packet->size >= sizeof *veh + && veh->veth_type == htons(ETH_TYPE_VLAN)) { + struct eth_header tmp; + + memcpy(tmp.eth_dst, veh->veth_dst, ETH_ADDR_LEN); + memcpy(tmp.eth_src, veh->veth_src, ETH_ADDR_LEN); + tmp.eth_type = veh->veth_next_type; + + ofpbuf_pull(packet, VLAN_HEADER_LEN); + packet->l2 = (char*)packet->l2 + VLAN_HEADER_LEN; + memcpy(packet->data, &tmp, sizeof tmp); + } +} + +/* Given the IP netmask 'netmask', returns the number of bits of the IP address + * that it specifies, that is, the number of 1-bits in 'netmask'. 'netmask' + * must be a CIDR netmask (see ip_is_cidr()). */ +int +ip_count_cidr_bits(ovs_be32 netmask) +{ + assert(ip_is_cidr(netmask)); + return 32 - ctz(ntohl(netmask)); } +void +ip_format_masked(ovs_be32 ip, ovs_be32 mask, struct ds *s) +{ + ds_put_format(s, IP_FMT, IP_ARGS(&ip)); + if (mask != htonl(UINT32_MAX)) { + if (ip_is_cidr(mask)) { + ds_put_format(s, "/%d", ip_count_cidr_bits(mask)); + } else { + ds_put_format(s, "/"IP_FMT, IP_ARGS(&mask)); + } + } +} + + /* Stores the string representation of the IPv6 address 'addr' into the * character array 'addr_str', which must be at least INET6_ADDRSTRLEN * bytes long. */ @@ -102,10 +157,29 @@ format_ipv6_addr(char *addr_str, const struct in6_addr *addr) void print_ipv6_addr(struct ds *string, const struct in6_addr *addr) { - char addr_str[INET6_ADDRSTRLEN]; + char *dst; + + ds_reserve(string, string->length + INET6_ADDRSTRLEN); + + dst = string->string + string->length; + format_ipv6_addr(dst, addr); + string->length += strlen(dst); +} - format_ipv6_addr(addr_str, addr); - ds_put_format(string, "%s", addr_str); +void +print_ipv6_masked(struct ds *s, const struct in6_addr *addr, + const struct in6_addr *mask) +{ + print_ipv6_addr(s, addr); + if (mask && !ipv6_mask_is_exact(mask)) { + if (ipv6_is_cidr(mask)) { + int cidr_bits = ipv6_count_cidr_bits(mask); + ds_put_format(s, "/%d", cidr_bits); + } else { + ds_put_char(s, '/'); + print_ipv6_addr(s, mask); + } + } } struct in6_addr ipv6_addr_bitand(const struct in6_addr *a, @@ -149,9 +223,9 @@ ipv6_create_mask(int mask) return netmask; } -/* Given the IPv6 netmask 'netmask', returns the number of bits of the - * IPv6 address that it wildcards. 'netmask' must be a CIDR netmask (see - * ipv6_is_cidr()). */ +/* Given the IPv6 netmask 'netmask', returns the number of bits of the IPv6 + * address that it specifies, that is, the number of 1-bits in 'netmask'. + * 'netmask' must be a CIDR netmask (see ipv6_is_cidr()). */ int ipv6_count_cidr_bits(const struct in6_addr *netmask) { @@ -178,7 +252,6 @@ ipv6_count_cidr_bits(const struct in6_addr *netmask) return count; } - /* Returns true if 'netmask' is a CIDR netmask, that is, if it consists of N * high-order 1-bits and 128-N low-order 0-bits. */ bool @@ -204,58 +277,78 @@ ipv6_is_cidr(const struct in6_addr *netmask) return true; } -/* Fills 'b' with a LACP packet whose source address is 'eth_src', LACP actor - * information is 'actor', and LACP partner information is 'partner'. */ -void -compose_lacp_packet(struct ofpbuf *b, struct lacp_info *actor, - struct lacp_info *partner, - const uint8_t eth_src[ETH_ADDR_LEN]) +/* Populates 'b' with an Ethernet II packet headed with the given 'eth_dst', + * 'eth_src' and 'eth_type' parameters. A payload of 'size' bytes is allocated + * in 'b' and returned. This payload may be populated with appropriate + * information by the caller. Sets 'b''s 'l2' and 'l3' pointers to the + * Ethernet header and payload respectively. + * + * The returned packet has enough headroom to insert an 802.1Q VLAN header if + * desired. */ +void * +eth_compose(struct ofpbuf *b, const uint8_t eth_dst[ETH_ADDR_LEN], + const uint8_t eth_src[ETH_ADDR_LEN], uint16_t eth_type, + size_t size) { + void *data; struct eth_header *eth; - struct lacp_pdu *pdu; ofpbuf_clear(b); - ofpbuf_prealloc_tailroom(b, ETH_HEADER_LEN + LACP_PDU_LEN); - eth = ofpbuf_put_zeros(b, ETH_HEADER_LEN); - pdu = ofpbuf_put_zeros(b, LACP_PDU_LEN); + ofpbuf_prealloc_tailroom(b, ETH_HEADER_LEN + VLAN_HEADER_LEN + size); + ofpbuf_reserve(b, VLAN_HEADER_LEN); + eth = ofpbuf_put_uninit(b, ETH_HEADER_LEN); + data = ofpbuf_put_uninit(b, size); - memcpy(eth->eth_dst, eth_addr_lacp, ETH_ADDR_LEN); + memcpy(eth->eth_dst, eth_dst, ETH_ADDR_LEN); memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN); - eth->eth_type = htons(ETH_TYPE_LACP); + eth->eth_type = htons(eth_type); - pdu->subtype = 1; - pdu->version = 1; + b->l2 = eth; + b->l3 = data; - pdu->actor_type = 1; - pdu->actor_len = 20; - pdu->actor = *actor; - - pdu->partner_type = 2; - pdu->partner_len = 20; - pdu->partner = *partner; - - pdu->collector_type = 3; - pdu->collector_len = 16; - pdu->collector_delay = htons(0); + return data; } -/* Parses 'b' which represents a packet containing a LACP PDU. This function - * returns NULL if 'b' is malformed, or does not represent a LACP PDU format - * supported by OVS. Otherwise, it returns a pointer to the lacp_pdu contained - * within 'b'. */ -const struct lacp_pdu * -parse_lacp_packet(const struct ofpbuf *b) +/* Populates 'b' with an Ethernet LLC+SNAP packet headed with the given + * 'eth_dst', 'eth_src', 'snap_org', and 'snap_type'. A payload of 'size' + * bytes is allocated in 'b' and returned. This payload may be populated with + * appropriate information by the caller. + * + * The returned packet has enough headroom to insert an 802.1Q VLAN header if + * desired. */ +void * +snap_compose(struct ofpbuf *b, const uint8_t eth_dst[ETH_ADDR_LEN], + const uint8_t eth_src[ETH_ADDR_LEN], + unsigned int oui, uint16_t snap_type, size_t size) { - const struct lacp_pdu *pdu; + struct eth_header *eth; + struct llc_snap_header *llc_snap; + void *payload; - pdu = ofpbuf_at(b, (uint8_t *)b->l3 - (uint8_t *)b->data, LACP_PDU_LEN); + /* Compose basic packet structure. (We need the payload size to stick into + * the 802.2 header.) */ + ofpbuf_clear(b); + ofpbuf_prealloc_tailroom(b, ETH_HEADER_LEN + VLAN_HEADER_LEN + + LLC_SNAP_HEADER_LEN + size); + ofpbuf_reserve(b, VLAN_HEADER_LEN); + eth = ofpbuf_put_zeros(b, ETH_HEADER_LEN); + llc_snap = ofpbuf_put_zeros(b, LLC_SNAP_HEADER_LEN); + payload = ofpbuf_put_uninit(b, size); - if (pdu && pdu->subtype == 1 - && pdu->actor_type == 1 && pdu->actor_len == 20 - && pdu->partner_type == 2 && pdu->partner_len == 20) { - return pdu; - } else { - return NULL; - } + /* Compose 802.2 header. */ + memcpy(eth->eth_dst, eth_dst, ETH_ADDR_LEN); + memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN); + eth->eth_type = htons(b->size - ETH_HEADER_LEN); + + /* Compose LLC, SNAP headers. */ + llc_snap->llc.llc_dsap = LLC_DSAP_SNAP; + llc_snap->llc.llc_ssap = LLC_SSAP_SNAP; + llc_snap->llc.llc_cntl = LLC_CNTL_SNAP; + llc_snap->snap.snap_org[0] = oui >> 16; + llc_snap->snap.snap_org[1] = oui >> 8; + llc_snap->snap.snap_org[2] = oui; + llc_snap->snap.snap_type = htons(snap_type); + + return payload; }