X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fpackets.c;h=16f4fe63afe254f93e2678c4771013c9b7ac3566;hb=4cceacb94cfc1d75a961d3d746d2ae369c397ae5;hp=35829fca80d69a01e52ac9e744c570c5f6a33f0c;hpb=05be4e2c6af8ce22bd262820bc951c9408a6de3d;p=openvswitch diff --git a/lib/packets.c b/lib/packets.c index 35829fca..16f4fe63 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -24,6 +24,7 @@ #include "byte-order.h" #include "csum.h" #include "flow.h" +#include "hmap.h" #include "dynamic-string.h" #include "ofpbuf.h" @@ -43,41 +44,77 @@ dpid_from_string(const char *s, uint64_t *dpidp) return *dpidp != 0; } -/* Returns true if 'ea' is a reserved multicast address, that a bridge must - * never forward, false otherwise. Includes some proprietary vendor protocols - * that shouldn't be forwarded as well. +/* Returns true if 'ea' is a reserved address, that a bridge must never + * forward, false otherwise. * * If you change this function's behavior, please update corresponding * documentation in vswitch.xml at the same time. */ bool eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN]) { - struct masked_eth_addr { - uint8_t ea[ETH_ADDR_LEN]; - uint8_t mask[ETH_ADDR_LEN]; + struct eth_addr_node { + struct hmap_node hmap_node; + uint64_t ea64; }; - static struct masked_eth_addr mea[] = { - { /* STP, IEEE pause frames, and other reserved protocols. */ - {0x01, 0x08, 0xc2, 0x00, 0x00, 0x00}, - {0xff, 0xff, 0xff, 0xff, 0xff, 0xf0}}, - - { /* Cisco Inter Switch Link. */ - {0x01, 0x00, 0x0c, 0x00, 0x00, 0x00}, - {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}, + static struct eth_addr_node nodes[] = { + /* STP, IEEE pause frames, and other reserved protocols. */ + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000000ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000001ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000002ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000003ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000004ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000005ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000006ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000007ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000008ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000009ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000aULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000bULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000cULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000dULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000eULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000fULL }, + + /* Extreme protocols. */ + { HMAP_NODE_NULL_INITIALIZER, 0x00e02b000000ULL }, /* EDP. */ + { HMAP_NODE_NULL_INITIALIZER, 0x00e02b000004ULL }, /* EAPS. */ + { HMAP_NODE_NULL_INITIALIZER, 0x00e02b000006ULL }, /* EAPS. */ + + /* Cisco protocols. */ + { HMAP_NODE_NULL_INITIALIZER, 0x01000c000000ULL }, /* ISL. */ + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccccULL }, /* PAgP, UDLD, CDP, + * DTP, VTP. */ + { HMAP_NODE_NULL_INITIALIZER, 0x01000ccccccdULL }, /* PVST+. */ + { HMAP_NODE_NULL_INITIALIZER, 0x01000ccdcdcdULL }, /* STP Uplink Fast, + * FlexLink. */ + + /* Cisco CFM. */ + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc0ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc1ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc2ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc3ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc4ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc5ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc6ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x01000cccccc7ULL }, + }; - { /* Cisco protocols plus others following the same pattern: - * - * CDP, VTP, DTP, PAgP (01-00-0c-cc-cc-cc) - * Spanning Tree PVSTP+ (01-00-0c-cc-cc-cd) - * STP Uplink Fast (01-00-0c-cd-cd-cd) */ - {0x01, 0x00, 0x0c, 0xcc, 0xcc, 0xcc}, - {0xff, 0xff, 0xff, 0xfe, 0xfe, 0xfe}}}; + static struct hmap addrs = HMAP_INITIALIZER(&addrs); + struct eth_addr_node *node; + uint64_t ea64; - size_t i; + if (hmap_is_empty(&addrs)) { + for (node = nodes; node < &nodes[ARRAY_SIZE(nodes)]; node++) { + hmap_insert(&addrs, &node->hmap_node, + hash_2words(node->ea64, node->ea64 >> 32)); + } + } - for (i = 0; i < ARRAY_SIZE(mea); i++) { - if (eth_addr_equal_except(ea, mea[i].ea, mea[i].mask)) { + ea64 = eth_addr_to_uint64(ea); + HMAP_FOR_EACH_IN_BUCKET (node, hmap_node, hash_2words(ea64, ea64 >> 32), + &addrs) { + if (node->ea64 == ea64) { return true; } } @@ -96,27 +133,37 @@ eth_addr_from_string(const char *s, uint8_t ea[ETH_ADDR_LEN]) } } -/* Fills 'b' with an 802.2 SNAP packet with Ethernet source address 'eth_src', - * the Nicira OUI as SNAP organization and 'snap_type' as SNAP type. The text - * string in 'tag' is enclosed as the packet payload. - * +/* Fills 'b' with a Reverse ARP packet with Ethernet source address 'eth_src'. * This function is used by Open vSwitch to compose packets in cases where - * context is important but content doesn't (or shouldn't) matter. For this - * purpose, 'snap_type' should be a random number and 'tag' should be an - * English phrase that explains the purpose of the packet. (The English phrase - * gives hapless admins running Wireshark the opportunity to figure out what's - * going on.) */ + * context is important but content doesn't (or shouldn't) matter. + * + * The returned packet has enough headroom to insert an 802.1Q VLAN header if + * desired. */ void -compose_benign_packet(struct ofpbuf *b, const char *tag, uint16_t snap_type, - const uint8_t eth_src[ETH_ADDR_LEN]) +compose_rarp(struct ofpbuf *b, const uint8_t eth_src[ETH_ADDR_LEN]) { - size_t tag_size = strlen(tag) + 1; - char *payload; + struct eth_header *eth; + struct arp_eth_header *arp; - 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); + ofpbuf_clear(b); + ofpbuf_prealloc_tailroom(b, ETH_HEADER_LEN + VLAN_HEADER_LEN + + ARP_ETH_HEADER_LEN); + ofpbuf_reserve(b, VLAN_HEADER_LEN); + eth = ofpbuf_put_uninit(b, sizeof *eth); + memcpy(eth->eth_dst, eth_addr_broadcast, ETH_ADDR_LEN); + memcpy(eth->eth_src, eth_src, ETH_ADDR_LEN); + eth->eth_type = htons(ETH_TYPE_RARP); + + arp = ofpbuf_put_uninit(b, sizeof *arp); + arp->ar_hrd = htons(ARP_HRD_ETHERNET); + arp->ar_pro = htons(ARP_PRO_IP); + arp->ar_hln = sizeof arp->ar_sha; + arp->ar_pln = sizeof arp->ar_spa; + arp->ar_op = htons(ARP_OP_RARP); + memcpy(arp->ar_sha, eth_src, ETH_ADDR_LEN); + arp->ar_spa = htonl(0); + memcpy(arp->ar_tha, eth_src, ETH_ADDR_LEN); + arp->ar_tpa = htonl(0); } /* Insert VLAN header according to given TCI. Packet passed must be Ethernet @@ -212,12 +259,13 @@ eth_addr_bitand(const uint8_t src[ETH_ADDR_LEN], } /* 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()). */ + * that it specifies, that is, the number of 1-bits in 'netmask'. + * + * If 'netmask' is not a CIDR netmask (see ip_is_cidr()), the return value will + * still be in the valid range but isn't otherwise meaningful. */ int ip_count_cidr_bits(ovs_be32 netmask) { - assert(ip_is_cidr(netmask)); return 32 - ctz(ntohl(netmask)); } @@ -315,7 +363,10 @@ ipv6_create_mask(int mask) /* 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()). */ + * 'netmask' must be a CIDR netmask (see ipv6_is_cidr()). + * + * If 'netmask' is not a CIDR netmask (see ipv6_is_cidr()), the return value + * will still be in the valid range but isn't otherwise meaningful. */ int ipv6_count_cidr_bits(const struct in6_addr *netmask) { @@ -323,8 +374,6 @@ ipv6_count_cidr_bits(const struct in6_addr *netmask) int count = 0; const uint8_t *netmaskp = &netmask->s6_addr[0]; - assert(ipv6_is_cidr(netmask)); - for (i=0; i<16; i++) { if (netmaskp[i] == 0xff) { count += 8; @@ -400,49 +449,6 @@ eth_compose(struct ofpbuf *b, const uint8_t eth_dst[ETH_ADDR_LEN], return data; } -/* 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) -{ - struct eth_header *eth; - struct llc_snap_header *llc_snap; - void *payload; - - /* 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); - - /* 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; -} - static void packet_set_ipv4_addr(struct ofpbuf *packet, ovs_be32 *addr, ovs_be32 new_addr) {